Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged global namelist #2173

Merged
merged 43 commits into from
Apr 23, 2024
Merged

Merged global namelist #2173

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
2ad9213
Merged global namelist
dpsarmie Mar 6, 2024
2e261fc
Merge branch 'ufs-community:develop' into feature/MergedNML_v3
dpsarmie Mar 14, 2024
7520e3a
Add export_tiled to allow for cleaner switching between grid spacing
dpsarmie Mar 14, 2024
87b332c
Merge branch 'feature/MergedNML_v3' of https://github.com/dpsarmie/uf…
dpsarmie Mar 14, 2024
cc0524c
Merge branch 'ufs-community:develop' into feature/MergedNML_v3
dpsarmie Mar 18, 2024
bed70c9
Added pointers to merged nml and added export_tiled feature
dpsarmie Mar 20, 2024
6547b21
Merge branch 'feature/MergedNML_v3' of https://github.com/dpsarmie/uf…
dpsarmie Mar 20, 2024
0b3f394
Add global_control.nml.IN and turn off select regression tests
dpsarmie Mar 29, 2024
43e656d
Merge branch 'develop' into feature/MergedNML_v3
dpsarmie Mar 29, 2024
9595169
Fix atmlnd RTs with global_control.nml_IN
dpsarmie Mar 30, 2024
ddd32f6
Merge branch 'feature/MergedNML_v3' of https://github.com/dpsarmie/uf…
dpsarmie Mar 30, 2024
3f15faa
Turn atmlnd RTs back on
dpsarmie Mar 30, 2024
8ff39a8
Modify errors in RTs
dpsarmie Apr 4, 2024
1c80a62
Removes extraneous pointers from global nml
dpsarmie Apr 4, 2024
924375c
Merge branch 'develop' into feature/MergedNML_v3
dpsarmie Apr 4, 2024
926f21a
Update test_changes.list
dpsarmie Apr 4, 2024
043862d
Clean up default_vars.sh
dpsarmie Apr 4, 2024
7f5c180
Clean up test and script references to P7 and P8
Apr 4, 2024
92cfd03
Delete unused regression test namelists
dpsarmie Apr 4, 2024
bc7c6bd
Turn on old tests and remove control_csawmgt
dpsarmie Apr 4, 2024
c02a859
Add export_fv3_v16 and v16 RTs back into workflow
dpsarmie Apr 5, 2024
3d46bab
Remove atmwav, c384atmwav, add mynn RTs
dpsarmie Apr 5, 2024
bd9af79
Keep d_con and consv_te as real
dpsarmie Apr 8, 2024
c0cc020
Revert unintended control_wam change
dpsarmie Apr 8, 2024
e126d2c
Revert datm defaults
dpsarmie Apr 8, 2024
bbf0ac1
Fix compatability with regional/HAFS RTs
dpsarmie Apr 11, 2024
4a48904
Merge branch 'develop' into feature/MergedNML_v3
dpsarmie Apr 11, 2024
b0c8501
Merge branch 'develop' of https://github.com/dpsarmie/ufs-weather-mod…
dpsarmie Apr 19, 2024
d47726e
Update bl_date.conf
zach1221 Apr 19, 2024
f62b0d5
Add atmaero/rad/micro to test_changes
dpsarmie Apr 22, 2024
c51ce6d
add hercules RT logs: passed
zach1221 Apr 22, 2024
4c3765c
default_vars.sh linter conflict fixes
dpsarmie Apr 22, 2024
14ab15b
Resolve default_vars.sh Linter conflict
dpsarmie Apr 22, 2024
240e1e9
add orion RT logs: passed
zach1221 Apr 22, 2024
5923cde
add hera RT log passed
FernandoAndrade-NOAA Apr 22, 2024
2678aac
add derecho RT logs: passed
zach1221 Apr 22, 2024
2bb7e75
add gaea RT log passed
FernandoAndrade-NOAA Apr 22, 2024
ac0c99f
add jet RT log passed
FernandoAndrade-NOAA Apr 22, 2024
8404d8c
add control_p8_gnu ORT logs: passed
zach1221 Apr 22, 2024
63ecdfa
add regional_control_gnu ORT logs: passed
zach1221 Apr 22, 2024
2286591
add cpld_control_gnu ORT logs: passed
zach1221 Apr 22, 2024
51c4aa4
WCOSS2 RT Log: Passed
BrianCurtis-NOAA Apr 22, 2024
803bd02
Acorn RT Log: Passed
BrianCurtis-NOAA Apr 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
303 changes: 246 additions & 57 deletions tests/default_vars.sh
View file
Open in desktop

Large diffs are not rendered by default.

400 changes: 400 additions & 0 deletions tests/parm/global_control.nml.IN
View file
Open in desktop

Large diffs are not rendered by default.

76 changes: 38 additions & 38 deletions tests/rt.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,21 +85,21 @@ RUN | cpld_debug_pdlib_p8 | - noaacloud

### ATM tests ###
COMPILE | atm_dyn32 | intel | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v16_flake,FV3_GFS_v17_p8,FV3_GFS_v17_p8_rrtmgp,FV3_GFS_v15_thompson_mynn_lam3km,FV3_WoFS_v0,FV3_GFS_v17_p8_mynn,FV3_GFS_v17_p8_ugwpv1 -D32BIT=ON | | fv3 |
RUN | control_flake | | baseline |
##RUN | control_flake | | baseline |
RUN | control_CubedSphereGrid | | baseline |
RUN | control_CubedSphereGrid_parallel | - noaacloud | baseline |
RUN | control_latlon | | baseline |
RUN | control_wrtGauss_netcdf_parallel | | baseline |
RUN | control_c48 | | baseline |
RUN | control_c48.v2.sfc | | baseline |
##RUN | control_c48.v2.sfc | | baseline |
RUN | control_c192 | - noaacloud | baseline |
RUN | control_c384 | | baseline |
RUN | control_c384gdas | - noaacloud | baseline |
RUN | control_stochy | | baseline |
RUN | control_stochy_restart | - noaacloud | | control_stochy
RUN | control_lndp | | baseline |
RUN | control_iovr4 | | baseline |
RUN | control_iovr5 | | baseline |
##RUN | control_c384gdas | - noaacloud | baseline |
##RUN | control_stochy | | baseline |
##RUN | control_stochy_restart | - noaacloud | | control_stochy
##RUN | control_lndp | | baseline |
##RUN | control_iovr4 | | baseline |
##RUN | control_iovr5 | | baseline |
dpsarmie marked this conversation as resolved.
Show resolved Hide resolved
RUN | control_p8 | - noaacloud | baseline |
RUN | control_p8.v2.sfc | - noaacloud | baseline |
RUN | control_p8_ugwpv1 | - noaacloud | baseline |
Expand All @@ -110,7 +110,7 @@ RUN | control_decomp_p8 | - noaacloud
RUN | control_2threads_p8 | - derecho noaacloud | |
RUN | control_p8_lndp | | baseline |
RUN | control_p8_rrtmgp | - noaacloud | baseline |
RUN | control_p8_mynn | - noaacloud | baseline |
##RUN | control_p8_mynn | - noaacloud | baseline |
RUN | merra2_thompson | - noaacloud | baseline |
RUN | regional_control | | baseline |
RUN | regional_restart | - noaacloud | | regional_control
Expand Down Expand Up @@ -143,18 +143,18 @@ RUN | rrfs_v1beta |
RUN | rrfs_v1nssl | | baseline |
RUN | rrfs_v1nssl_nohailnoccn | | baseline |

COMPILE | csawmg | intel | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_csawmg,FV3_GFS_v16_ras | - noaacloud | fv3 |
RUN | control_csawmg | - noaacloud | baseline |
RUN | control_csawmgt | - noaacloud | baseline |
RUN | control_ras | - noaacloud acorn | baseline |
##COMPILE | csawmg | intel | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_csawmg,FV3_GFS_v16_ras | - noaacloud | fv3 |
##RUN | control_csawmg | - noaacloud | baseline |
##RUN | control_csawmgt | - noaacloud | baseline |
##RUN | control_ras | - noaacloud acorn | baseline |

COMPILE | csawmg | gnu | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_csawmg,FV3_GFS_v16_ras | + hera hercules | fv3 |
RUN | control_csawmg | + hera hercules | baseline |
RUN | control_csawmgt | + hera hercules | baseline |
##COMPILE | csawmg | gnu | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_csawmg,FV3_GFS_v16_ras | + hera hercules | fv3 |
##RUN | control_csawmg | + hera hercules | baseline |
##RUN | control_csawmgt | + hera hercules | baseline |

# Run WAM test in REPRO mode to avoid numerical instability in the deep atmosphere
COMPILE | wam | intel | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_fv3wam -D32BIT=ON -DMULTI_GASES=ON | - noaacloud | fv3 |
RUN | control_wam | - noaacloud | baseline |
##COMPILE | wam | intel | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_fv3wam -D32BIT=ON -DMULTI_GASES=ON | - noaacloud | fv3 |
##RUN | control_wam | - noaacloud | baseline |

COMPILE | atm_faster_dyn32 | intel | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v17_p8,FV3_GFS_v15_thompson_mynn_lam3km -D32BIT=ON -DFASTER=ON | | fv3 |
RUN | control_p8_faster | - noaacloud | baseline |
Expand All @@ -164,11 +164,11 @@ RUN | regional_control_faster |
COMPILE | atm_debug_dyn32 | intel | -DAPP=ATM -DDEBUG=ON -D32BIT=ON -DCCPP_SUITES=FV3_HRRR,FV3_GFS_v16,FV3_GFS_v16_csawmg,FV3_GFS_v16_ras,FV3_GFS_v17_p8,FV3_GFS_v15_thompson_mynn_lam3km,FV3_RAP,FV3_RAP_unified_ugwp,FV3_RAP_cires_ugwp,FV3_RAP_flake,FV3_RAP_clm_lake,FV3_RAP_noah,FV3_RAP_sfcdiff,FV3_RAP_noah_sfcdiff_cires_ugwp,FV3_RRFS_v1beta,FV3_HRRR_c3,FV3_HRRR_gf,FV3_global_nest_v1 | - noaacloud | fv3 |
RUN | control_CubedSphereGrid_debug | - noaacloud | baseline |
RUN | control_wrtGauss_netcdf_parallel_debug | - noaacloud | baseline |
RUN | control_stochy_debug | - noaacloud | baseline |
RUN | control_lndp_debug | - noaacloud | baseline |
RUN | control_csawmg_debug | - noaacloud | baseline |
RUN | control_csawmgt_debug | - noaacloud | baseline |
RUN | control_ras_debug | - noaacloud | baseline |
##RUN | control_stochy_debug | - noaacloud | baseline |
##RUN | control_lndp_debug | - noaacloud | baseline |
##RUN | control_csawmg_debug | - noaacloud | baseline |
##RUN | control_csawmgt_debug | - noaacloud | baseline |
##RUN | control_ras_debug | - noaacloud | baseline |
RUN | control_diag_debug | - noaacloud | baseline |
RUN | control_debug_p8 | - noaacloud | baseline |
RUN | regional_debug | - noaacloud | baseline |
Expand All @@ -190,13 +190,13 @@ RUN | rap_clm_lake_debug | - noaacloud
RUN | rap_flake_debug | - noaacloud | baseline |
RUN | gnv1_c96_no_nest_debug | - noaacloud | baseline |
### DEBUG ATM tests ###
COMPILE | atm_debug_dyn32 | gnu | -DAPP=ATM -DDEBUG=ON -D32BIT=ON -DCCPP_SUITES=FV3_HRRR,FV3_GFS_v16,FV3_GFS_v16_csawmg,FV3_GFS_v16_ras,FV3_GFS_v17_p8,FV3_GFS_v15_thompson_mynn_lam3km,FV3_RAP,FV3_RAP_unified_ugwp,FV3_RAP_cires_ugwp,FV3_RAP_flake,FV3_RAP_clm_lake,FV3_RAP_noah,FV3_RAP_sfcdiff,FV3_RAP_noah_sfcdiff_cires_ugwp,FV3_RRFS_v1beta,FV3_HRRR_c3,FV3_HRRR_gf,FV3_global_nest_v1 | + hera hercules | fv3 |
RUN | control_csawmg_debug | + hera hercules | baseline |
RUN | control_csawmgt_debug | + hera hercules | baseline |
##COMPILE | atm_debug_dyn32 | gnu | -DAPP=ATM -DDEBUG=ON -D32BIT=ON -DCCPP_SUITES=FV3_HRRR,FV3_GFS_v16,FV3_GFS_v16_csawmg,FV3_GFS_v16_ras,FV3_GFS_v17_p8,FV3_GFS_v15_thompson_mynn_lam3km,FV3_RAP,FV3_RAP_unified_ugwp,FV3_RAP_cires_ugwp,FV3_RAP_flake,FV3_RAP_clm_lake,FV3_RAP_noah,FV3_RAP_sfcdiff,FV3_RAP_noah_sfcdiff_cires_ugwp,FV3_RRFS_v1beta,FV3_HRRR_c3,FV3_HRRR_gf,FV3_global_nest_v1 | + hera hercules | fv3 |
##RUN | control_csawmg_debug | + hera hercules | baseline |
##RUN | control_csawmgt_debug | + hera hercules | baseline |


COMPILE | wam_debug | intel | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_fv3wam -D32BIT=ON -DMULTI_GASES=ON -DDEBUG=ON | - noaacloud | fv3 |
RUN | control_wam_debug | - noaacloud hercules | baseline |
##COMPILE | wam_debug | intel | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_fv3wam -D32BIT=ON -DMULTI_GASES=ON -DDEBUG=ON | - noaacloud | fv3 |
##RUN | control_wam_debug | - noaacloud hercules | baseline |

### 32-bit physics tests ###
COMPILE | rrfs_dyn32_phy32 | intel | -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_HRRR -D32BIT=ON -DCCPP_32BIT=ON | - noaacloud | fv3 |
Expand Down Expand Up @@ -298,10 +298,10 @@ RUN | datm_cdeps_lnd_era5 | - wcoss2 | b
RUN | datm_cdeps_lnd_era5_rst | - wcoss2 noaacloud | | datm_cdeps_lnd_era5

### ATM-LND tests ###
COMPILE | atml | intel | -DAPP=ATML -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v16_flake,FV3_GFS_v17_p8,FV3_GFS_v17_p8_rrtmgp,FV3_GFS_v15_thompson_mynn_lam3km,FV3_WoFS_v0,FV3_GFS_v17_p8_mynn -D32BIT=ON | | fv3 |
RUN | control_p8_atmlnd_sbs | - noaacloud | baseline |
RUN | control_p8_atmlnd | - noaacloud | baseline |
RUN | control_restart_p8_atmlnd | - noaacloud | | control_p8_atmlnd
##COMPILE | atml | intel | -DAPP=ATML -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v16_flake,FV3_GFS_v17_p8,FV3_GFS_v17_p8_rrtmgp,FV3_GFS_v15_thompson_mynn_lam3km,FV3_WoFS_v0,FV3_GFS_v17_p8_mynn -D32BIT=ON | | fv3 |
##RUN | control_p8_atmlnd_sbs | - noaacloud | baseline |
##RUN | control_p8_atmlnd | - noaacloud | baseline |
##RUN | control_restart_p8_atmlnd | - noaacloud | | control_p8_atmlnd
dpsarmie marked this conversation as resolved.
Show resolved Hide resolved

### ATM-WAV tests ###
#mediator (cmeps)
Expand All @@ -310,7 +310,7 @@ RUN | atmwav_control_noaero_p8 | - wcoss2

#connectors (wmesmf)
COMPILE | atmwm | intel | -DAPP=ATMWM -DCCPP_SUITES=FV3_GFS_v16 -D32BIT=ON | - wcoss2 | fv3 |
RUN | control_atmwav | - wcoss2 | baseline |
##RUN | control_atmwav | - wcoss2 | baseline |
#RUN | control_c384gdas_wav | - jet derecho wcoss2 noaacloud | baseline |

### ATM-GOCART tests ###
Expand All @@ -330,11 +330,11 @@ RUN | regional_atmaq_debug | - jet s4 noaacloud
### CCPP PROD tests ###
COMPILE | atm | gnu | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v16_flake,FV3_GFS_v16_ras,FV3_GFS_v17_p8,FV3_GFS_v17_p8_ugwpv1 | + hera hercules | fv3 |
RUN | control_c48 | + hera hercules | baseline |
RUN | control_stochy | + hera hercules | baseline |
RUN | control_ras | + hera hercules | baseline |
##RUN | control_stochy | + hera hercules | baseline |
##RUN | control_ras | + hera hercules | baseline |
RUN | control_p8 | + hera hercules | baseline |
RUN | control_p8_ugwpv1 | + hera hercules | baseline |
RUN | control_flake | + hera hercules | baseline |
##RUN | control_flake | + hera hercules | baseline |

COMPILE | rrfs | gnu | -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_RAP_sfcdiff,FV3_HRRR,FV3_RRFS_v1beta -D32BIT=ON | + hera hercules | fv3 |
RUN | rap_control | + hera hercules | baseline |
Expand Down Expand Up @@ -373,8 +373,8 @@ RUN | rap_clm_lake_debug | + hera hercules
RUN | gnv1_c96_no_nest_debug | + hera hercules | baseline |


COMPILE | wam_debug | gnu | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_fv3wam -D32BIT=ON -DMULTI_GASES=ON -DDEBUG=ON | + hera hercules | fv3 |
RUN | control_wam_debug | + hercules | baseline |
##COMPILE | wam_debug | gnu | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_fv3wam -D32BIT=ON -DMULTI_GASES=ON -DDEBUG=ON | + hera hercules | fv3 |
##RUN | control_wam_debug | + hera | baseline |


### 32-bit physics tests ###
Expand Down
20 changes: 20 additions & 0 deletions tests/test_changes.list
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@

control_CubedSphereGrid intel
control_CubedSphereGrid_parallel intel
control_latlon intel
control_wrtGauss_netcdf_parallel intel
control_c192 intel
control_c384 intel
merra2_thompson intel
control_CubedSphere_debug intel
control_diag_debug intel
atmaero_control_p8_rad_micro intel
control_c48 gnu
control_debug_p8 gnu
control_diag_debug gnu
control_p8 gnu
control_p8_ugwpvl gnu
cpld_control_nowave_noaero_p8 gnu
DeniseWorthen marked this conversation as resolved.
Show resolved Hide resolved
cpld_control_p8 gnu
cpld_control_pdlib_p8 gnu
cpld_debug_pdlib_p8 gnu
3 changes: 2 additions & 1 deletion tests/tests/atmaero_control_p8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ export LIST_FILES="sfcf000.nc \
RESTART/20210323.060000.sfc_data.tile6.nc"

export_fv3
export_tiled
export NPZ=127
export NPZP=128
export DT_ATMOS=720
Expand Down Expand Up @@ -176,7 +177,7 @@ export CCPP_SUITE=FV3_GFS_v17_p8
export FIELD_TABLE=field_table_thompson_noaero_tke_GOCART
export DIAG_TABLE=diag_table_cpld.IN
# use same namelist for standalone,coupled P7
export INPUT_NML=cpld_control.nml.IN
export INPUT_NML=global_control.nml.IN

# RRTMGP
export DO_RRTMGP=.false.
Expand Down
3 changes: 2 additions & 1 deletion tests/tests/atmaero_control_p8_rad
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ export LIST_FILES="sfcf000.nc \
RESTART/20210323.060000.sfc_data.tile6.nc"

export_fv3
export_tiled
export NPZ=127
export NPZP=128
export DT_ATMOS=720
Expand Down Expand Up @@ -171,7 +172,7 @@ export CCPP_SUITE=FV3_GFS_v17_p8
export FIELD_TABLE=field_table_thompson_noaero_tke_GOCART
export DIAG_TABLE=diag_table_cpld.IN
# use same namelist for standalone,coupled P7
export INPUT_NML=cpld_control.nml.IN
export INPUT_NML=global_control.nml.IN

# RRTMGP
export DO_RRTMGP=.false.
Expand Down
3 changes: 2 additions & 1 deletion tests/tests/atmaero_control_p8_rad_micro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ export LIST_FILES="sfcf000.nc \
RESTART/20210323.060000.sfc_data.tile6.nc"

export_fv3
export_tiled
export NPZ=127
export NPZP=128
export DT_ATMOS=720
Expand Down Expand Up @@ -171,7 +172,7 @@ export CCPP_SUITE=FV3_GFS_v17_p8
export FIELD_TABLE=field_table_thompson_aero_tke_GOCART
export DIAG_TABLE=diag_table_p8_gocart_micro
# use same namelist for standalone,coupled P7
export INPUT_NML=merra2_thompson.nml.IN
dpsarmie marked this conversation as resolved.
Show resolved Hide resolved
export INPUT_NML=global_control.nml.IN

# RRTMGP
export DO_RRTMGP=.false.
Expand Down
3 changes: 2 additions & 1 deletion tests/tests/atmwav_control_noaero_p8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ export LIST_FILES="sfcf000.nc \
ufs.atmw.ww3.r.2021-03-22-64800"

export_fv3
export_tiled
export NPZ=127
export NPZP=128
export DT_ATMOS=720
Expand Down Expand Up @@ -195,7 +196,7 @@ export CCPP_SUITE=FV3_GFS_v17_p8
export FIELD_TABLE=field_table_thompson_noaero_tke
export DIAG_TABLE=diag_table_cpld.IN
# use same namelist for standalone,coupled P7
export INPUT_NML=cpld_control.nml.IN
export INPUT_NML=global_control.nml.IN

# RRTMGP
export DO_RRTMGP=.false.
Expand Down
3 changes: 2 additions & 1 deletion tests/tests/control_2threads_p8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ export LIST_FILES="sfcf000.nc \
RESTART/20210323.060000.sfc_data.tile6.nc"

export_fv3
export_tiled
export NPZ=127
export NPZP=128
export DT_ATMOS=720
Expand Down Expand Up @@ -163,7 +164,7 @@ export CCPP_SUITE=FV3_GFS_v17_p8
export FIELD_TABLE=field_table_thompson_noaero_tke
export DIAG_TABLE=diag_table_cpld.IN
# use same namelist for standalone,coupled P7
export INPUT_NML=cpld_control.nml.IN
export INPUT_NML=global_control.nml.IN

# P8 RRTMGP
export DO_RRTMGP=.false.
Expand Down
5 changes: 3 additions & 2 deletions tests/tests/control_CubedSphereGrid
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ export LIST_FILES="sfcf000.tile1.nc \
atmf024.tile5.nc \
atmf024.tile6.nc"
export_fv3
export_tiled
export NPZ=127
export NPZP=128
export DT_ATMOS=720
Expand All @@ -49,5 +50,5 @@ export IOVR=3
export WRITE_DOPOST=.false.

export FV3_RUN=control_run.IN
export CCPP_SUITE=FV3_GFS_v16
export INPUT_NML=control.nml.IN
export CCPP_SUITE=FV3_GFS_v17_p8
export INPUT_NML=global_control.nml.IN
5 changes: 3 additions & 2 deletions tests/tests/control_CubedSphereGrid_debug
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ export LIST_FILES="sfcf000.tile1.nc \
atmf001.tile6.nc"

export_fv3
export_tiled
export NPZ=127
export NPZP=128
export DT_ATMOS=720
Expand All @@ -49,5 +50,5 @@ export IOVR=3
export OUTPUT_FH="0 1"

export FV3_RUN=control_run.IN
export CCPP_SUITE=FV3_GFS_v16
export INPUT_NML=control.nml.IN
export CCPP_SUITE=FV3_GFS_v17_p8
export INPUT_NML=global_control.nml.IN
7 changes: 4 additions & 3 deletions tests/tests/control_CubedSphereGrid_parallel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ export LIST_FILES="sfcf000.nc \
GFSPRS.GrbF24"

export_fv3
export_tiled
export NPZ=127
export NPZP=128
export DT_ATMOS=720
Expand All @@ -40,6 +41,6 @@ export HISTORY_FILE_ON_NATIVE_GRID=.true.
export WRITE_DOPOST=.true.

export FV3_RUN=control_run.IN
export CCPP_SUITE=FV3_GFS_v16
export INPUT_NML=control.nml.IN
export DIAG_TABLE=diag_table_gfsv16_3d_soil
export CCPP_SUITE=FV3_GFS_v17_p8
export INPUT_NML=global_control.nml.IN
#export DIAG_TABLE=diag_table_gfsv16_3d_soil
12 changes: 5 additions & 7 deletions tests/tests/control_c192
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,10 @@ export LIST_FILES="sfcf000.nc \
GFSPRS.GrbF00 \
GFSPRS.GrbF24"

export ATMRES=C192

export_fv3
export_tiled
export INPES=4
export WRTTASK_PER_GROUP=12
export NPZ=127
Expand All @@ -39,11 +42,6 @@ export IOVR=3
export IMO=768
export JMO=384

export FNALBC="'global_snowfree_albedo.bosu.t382.768.384.rg.grb',"
export FNVETC="'global_vegtype.igbp.t382.768.384.rg.grb',"
export FNSOTC="'global_soiltype.statsgo.t382.768.384.rg.grb',"
export FNABSC="'global_mxsnoalb.uariz.t382.768.384.rg.grb',"

export FV3_RUN=control_run.IN
export CCPP_SUITE=FV3_GFS_v16
export INPUT_NML=control.nml.IN
export CCPP_SUITE=FV3_GFS_v17_p8
export INPUT_NML=global_control.nml.IN
12 changes: 5 additions & 7 deletions tests/tests/control_c384
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,10 @@ export LIST_FILES="sfcf000.nc \
GFSPRS.GrbF00 \
GFSPRS.GrbF12"

export ATMRES=C384

export_fv3
export_tiled
export atm_omp_num_threads=${THRD_c384}
export INPES=${INPES_c384}
export JNPES=${JNPES_c384}
Expand All @@ -44,14 +47,9 @@ export IMO=1536
export JMO=768
export OUTPUT_FH="6 -1"

export FNALBC="'global_snowfree_albedo.bosu.t766.1536.768.rg.grb',"
export FNVETC="'global_vegtype.igbp.t766.1536.768.rg.grb',"
export FNSOTC="'global_soiltype.statsgo.t766.1536.768.rg.grb',"
export FNABSC="'global_mxsnoalb.uariz.t766.1536.768.rg.grb',"

export FV3_RUN=control_run.IN
export CCPP_SUITE=FV3_GFS_v16
export INPUT_NML=control.nml.IN
export CCPP_SUITE=FV3_GFS_v17_p8
export INPUT_NML=global_control.nml.IN

if [[ $MACHINE_ID = jet ]]; then
TPN=18
Expand Down
Loading
Loading