Skip to content

Commit 9ccd342

Browse files
fvittfvitt
authored
Merge pull request #1317 from fvitt/waccmx_highres
cam6_4_103: Support for high-resolution WACCM-X
2 parents d7685f8 + 1f737d3 commit 9ccd342

18 files changed

Lines changed: 245 additions & 15 deletions

File tree

‎bld/build-namelist‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3194,7 +3194,11 @@ if ($waccmx) {
31943194
add_default($nl,'ionos_xport_nsplit');
31953195
add_default($nl,'steady_state_ion_elec_temp', 'val'=>'.false.');
31963196
add_default($nl,'oplus_ring_polar_filter');
3197+
add_default($nl,'oplus_shapiro_const');
31973198
add_default($nl,'rxn_rate_sums');
3199+
if ($cfg->get('hgrid') =~ /ne120/) {
3200+
add_default($nl,'se_min_temperature', 'val'=>'105.D0');
3201+
}
31983202
}
31993203

32003204
# Chemistry options

‎bld/configure‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1227,7 +1227,9 @@ if ($phys_pkg eq 'cam7') {
12271227
}
12281228
}
12291229
elsif ($waccmx) {
1230-
if ($phys_pkg eq 'cam6') {
1230+
if ($hgrid =~ /ne120/) {
1231+
$nlev = 273;
1232+
} elsif ($phys_pkg eq 'cam6') {
12311233
$nlev = 130;
12321234
} else {
12331235
$nlev = 126;

‎bld/namelist_files/namelist_defaults_cam.xml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,7 @@
212212
<ncdata hgrid="ne120np4" nlev="30" aquaplanet="1" >atm/cam/inic/se/ape_cam5_ne120np4_L30_c170419.nc</ncdata>
213213
<ncdata hgrid="ne120np4" nlev="32" >atm/cam/inic/se/F2000climo_ne120pg3_mt13_01-01-00000_c200420.nc</ncdata>
214214
<ncdata hgrid="ne120np4" nlev="32" aquaplanet="1" >atm/cam/inic/se/ape_cam6_ne120np4_L32_c170908.nc</ncdata>
215+
<ncdata hgrid="ne120np4" nlev="273" waccmx="1" >atm/waccm/ic/fx2000_ne120pg3L273.001.cam.i.0002-01-01-00000.noBRCL_c250522.nc</ncdata>
215216

216217
<ncdata hgrid="ne240np4" nlev="26" >atm/cam/inic/homme/cami_1850-01-01_ne240np4_L26_c110314.nc</ncdata>
217218
<ncdata hgrid="ne240np4" nlev="26" ic_ymd="901" >atm/cam/inic/homme/cami_0000-09-01_ne240np4_L26_c061106.nc</ncdata>
@@ -882,19 +883,24 @@
882883
<ionos_xport_nsplit hgrid="0.9x1.25" waccmx="1">30</ionos_xport_nsplit>
883884
<ionos_xport_nsplit hgrid="ne30np4" waccmx="1">30</ionos_xport_nsplit>
884885
<ionos_xport_nsplit hgrid="0.47x0.63" waccmx="1">90</ionos_xport_nsplit>
886+
<ionos_xport_nsplit hgrid="ne120np4" waccmx="1">180</ionos_xport_nsplit>
885887
<oplus_ring_polar_filter>.true.</oplus_ring_polar_filter>
888+
<oplus_shapiro_const >3.d-2</oplus_shapiro_const>
889+
<oplus_shapiro_const hgrid="ne120np4">6.d-3</oplus_shapiro_const>
886890

887891
<!-- Oplus transport grid configuration -->
888892
<oplus_grid> 144,96 </oplus_grid>
889893
<oplus_grid hgrid="ne16np4"> 144,96 </oplus_grid>
890894
<oplus_grid hgrid="ne30np4"> 288,192 </oplus_grid>
891895
<oplus_grid hgrid="0.9x1.25"> 288,192 </oplus_grid>
892896
<oplus_grid hgrid="0.47x0.63"> 576,384 </oplus_grid>
897+
<oplus_grid hgrid="ne120np4"> 576,384 </oplus_grid>
893898
<!-- Magnetic grid resolution -->
894899
<edyn_grid>80x97</edyn_grid>
895900
<edyn_grid hgrid="0.9x1.25">160x193</edyn_grid>
896901
<edyn_grid hgrid="ne30np4" >160x193</edyn_grid>
897902
<edyn_grid hgrid="0.47x0.63">320x385</edyn_grid>
903+
<edyn_grid hgrid="ne120np4" >320x385</edyn_grid>
898904

899905
<!-- ESMF mesh files for physics decomposition -->
900906
<cam_physics_mesh hgrid="0.47x0.63">atm/cam/coords/fv0.47x0.63_esmf_c210305.nc</cam_physics_mesh>
@@ -907,6 +913,7 @@
907913
<cam_physics_mesh hgrid="ne16np4" npg="3">share/meshes/ne16pg3_ESMFmesh_cdf5_c20211018.nc</cam_physics_mesh>
908914
<cam_physics_mesh hgrid="ne30np4">atm/cam/coords/ne30np4_esmf_c210305.nc</cam_physics_mesh>
909915
<cam_physics_mesh hgrid="ne30np4" npg="3">atm/cam/coords/ne30pg3_esmf_20200428.nc</cam_physics_mesh>
916+
<cam_physics_mesh hgrid="ne120np4" npg="3">share/meshes/ne120pg3_ESMFmesh_cdf5_c20211018.nc</cam_physics_mesh>
910917

911918
<!-- For scaling lightning sources of NOx -->
912919
<lght_no_prd_factor >1.00D0</lght_no_prd_factor>
@@ -1980,6 +1987,7 @@
19801987
<drydep_srf_file hgrid="ne60np4" >atm/cam/chem/trop_mam/atmsrf_ne60np4_110920.nc</drydep_srf_file>
19811988
<drydep_srf_file hgrid="ne120np4" >atm/cam/chem/trop_mam/atmsrf_ne120np4_110920.nc</drydep_srf_file>
19821989
<drydep_srf_file hgrid="ne120np4" npg="2">atm/cam/chem/trop_mam/atmsrf_ne120np4.pg2_200109.nc</drydep_srf_file>
1990+
<drydep_srf_file hgrid="ne120np4" npg="3">atm/cam/chem/trop_mam/atmsrf_ne120np4.pg3_c210324.nc</drydep_srf_file>
19831991
<drydep_srf_file hgrid="ne240np4" >atm/cam/chem/trop_mam/atmsrf_ne240np4_110920.nc</drydep_srf_file>
19841992

19851993
<drydep_srf_file hgrid="ne0np4CONUS.ne30x8" >atm/cam/chem/trop_mam/atmsrf_ne0np4conus30x8_161116.nc</drydep_srf_file>
@@ -3167,6 +3175,7 @@
31673175
<se_hypervis_subcycle hgrid="ne16np4" model_top="xt" > 18</se_hypervis_subcycle>
31683176
<se_hypervis_subcycle hgrid="ne30np4" model_top="ht" > 18</se_hypervis_subcycle>
31693177
<se_hypervis_subcycle hgrid="ne30np4" model_top="xt" > 18</se_hypervis_subcycle>
3178+
<se_hypervis_subcycle waccmx="1" hgrid="ne120np4" nlev="273" > 30</se_hypervis_subcycle>
31703179

31713180
<se_hypervis_subcycle_sponge > 1 </se_hypervis_subcycle_sponge>
31723181
<se_hypervis_subcycle_sponge hgrid="ne30np4" model_top="mt" > 3 </se_hypervis_subcycle_sponge>
@@ -3180,6 +3189,7 @@
31803189
<se_hypervis_subcycle_sponge hgrid="ne16np4" model_top="ht" > 2 </se_hypervis_subcycle_sponge>
31813190
<se_hypervis_subcycle_sponge hgrid="ne30np4" model_top="ht" > 4 </se_hypervis_subcycle_sponge>
31823191
<se_hypervis_subcycle_sponge hgrid="ne30np4" model_top="xt" > 40 </se_hypervis_subcycle_sponge>
3192+
<se_hypervis_subcycle_sponge waccmx="1" hgrid="ne120np4" nlev="273" > 180</se_hypervis_subcycle_sponge>
31833193

31843194
<se_hypervis_subcycle_q>1 </se_hypervis_subcycle_q>
31853195
<se_hypervis_subcycle_q hgrid="ne16np4">2 </se_hypervis_subcycle_q>
@@ -3214,13 +3224,16 @@
32143224
<se_molecular_diff waccmx="1" > 1.0 </se_molecular_diff>
32153225

32163226
<se_sponge_del4_nu_fac > -1 </se_sponge_del4_nu_fac>
3227+
<se_sponge_del4_nu_fac hgrid="ne120np4" nlev="273" waccmx="1"> 3.0 </se_sponge_del4_nu_fac>
32173228
<se_sponge_del4_nu_div_fac> -1 </se_sponge_del4_nu_div_fac>
32183229
<se_sponge_del4_nu_div_fac hgrid="ne16np4" waccm_phys="1" waccmx="0"> 7.5 </se_sponge_del4_nu_div_fac>
32193230
<se_sponge_del4_nu_div_fac model_top="ht" > 7.5 </se_sponge_del4_nu_div_fac>
3231+
<se_sponge_del4_nu_div_fac hgrid="ne120np4" nlev="273" waccmx="1" > 5.0 </se_sponge_del4_nu_div_fac>
32203232
<se_sponge_del4_lev > -1 </se_sponge_del4_lev>
32213233
<se_sponge_del4_lev waccm_phys="1"> 30 </se_sponge_del4_lev>
32223234
<se_sponge_del4_lev model_top="ht"> 30 </se_sponge_del4_lev>
32233235
<se_sponge_del4_lev model_top="xt"> 30 </se_sponge_del4_lev>
3236+
<se_sponge_del4_lev waccmx="1" hgrid="ne120np4" nlev="273"> 100 </se_sponge_del4_lev>
32243237

32253238
<se_qsplit > 1 </se_qsplit>
32263239
<se_qsplit hgrid="ne30np4" waccm_phys="1" waccmx="1" model_top="none"> 2 </se_qsplit>
@@ -3247,13 +3260,15 @@
32473260
<se_nsplit hgrid="ne0np4CONUS.ne30x8" waccm_phys="1" > 10 </se_nsplit>
32483261

32493262
<se_nsplit hgrid="ne0np4TESTONLY.ne5x4"> 7 </se_nsplit>
3263+
<se_nsplit waccmx="1" hgrid="ne120np4" nlev="273" > 10 </se_nsplit>
32503264

32513265
<se_rsplit > 3 </se_rsplit>
32523266
<se_rsplit waccm_phys="1" waccmx="0" > 2 </se_rsplit>
32533267
<se_rsplit model_top="ht" > 2 </se_rsplit>
32543268
<se_rsplit waccmx="1" > 4 </se_rsplit>
32553269
<se_rsplit hgrid="ne16np4" waccmx="1" model_top="none"> 2 </se_rsplit>
32563270
<se_rsplit hgrid="ne0np4CONUS.ne30x8" waccm_phys="1"> 3 </se_rsplit>
3271+
<se_rsplit waccmx="1" hgrid="ne120np4" nlev="273" > 5 </se_rsplit>
32573272

32583273
<se_fvm_supercycling>-1</se_fvm_supercycling>
32593274
<se_fvm_supercycling_jet>-1</se_fvm_supercycling_jet>

‎bld/namelist_files/namelist_definition.xml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8198,6 +8198,14 @@ multiplied by a factor of se_molecular_diff.
81988198
Default: 0.
81998199
</entry>
82008200

8201+
<entry id="se_min_temperature" type="real" category="se"
8202+
group="dyn_se_inparm" valid_values="" >
8203+
Used by spectral element dynamical core to apply floor to temperature.
8204+
If set to a value greater than zero the floor is applied.
8205+
Otherwise, no floor is applied.
8206+
Default: 0.
8207+
</entry>
8208+
82018209
<entry id="se_hypervis_subcycle_q" type="integer" category="se"
82028210
group="dyn_se_inparm" valid_values="" >
82038211
Number of hyperviscosity subcycles done in tracer advection code.

‎cime‎

‎cime_config/config_pes.xml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -368,6 +368,26 @@
368368
</grid>
369369

370370
<grid name="a%ne120">
371+
<mach name="derecho">
372+
<pes pesize="any" compset="_CAM\d0%WX">
373+
<ntasks>
374+
<ntasks_atm>-100</ntasks_atm>
375+
<ntasks_lnd>-100</ntasks_lnd>
376+
<ntasks_rof>-100</ntasks_rof>
377+
<ntasks_ice>-100</ntasks_ice>
378+
<ntasks_ocn>-100</ntasks_ocn>
379+
<ntasks_cpl>-100</ntasks_cpl>
380+
</ntasks>
381+
<nthrds>
382+
<nthrds_atm>1</nthrds_atm>
383+
<nthrds_lnd>1</nthrds_lnd>
384+
<nthrds_rof>1</nthrds_rof>
385+
<nthrds_ice>1</nthrds_ice>
386+
<nthrds_ocn>1</nthrds_ocn>
387+
<nthrds_cpl>1</nthrds_cpl>
388+
</nthrds>
389+
</pes>
390+
</mach>
371391
<mach name="any">
372392
<pes pesize="any" compset="any">
373393
<comment>none</comment>

‎cime_config/testdefs/testlist_cam.xml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2290,6 +2290,15 @@
22902290
<option name="wallclock">00:20:00</option>
22912291
</options>
22922292
</test>
2293+
<test compset="FXHIST" grid="ne120pg3_ne120pg3_mg17" name="SMS_Lh1" testmods="cam/outfrq1h_wcmxhires">
2294+
<machines>
2295+
<machine name="derecho" compiler="intel" category="waccmx"/>
2296+
</machines>
2297+
<options>
2298+
<option name="wallclock">01:00:00</option>
2299+
<option name="comment">High-resolution WACCMX</option>
2300+
</options>
2301+
</test>
22932302
<test compset="FWmaHIST" grid="f09_f09_mg17" name="SMS_D_Ln9" testmods="cam/outfrq9s">
22942303
<machines>
22952304
<machine name="derecho" compiler="intel" category="waccm"/>

‎cime_config/testdefs/testmods_dirs/cam/outfrq1h_wcmxhires/shell_commands‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
./xmlchange ROF_NCPL=\$ATM_NCPL

‎cime_config/testdefs/testmods_dirs/cam/outfrq1h_wcmxhires/user_nl_cam‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
mfilt=1,1,1,1,1,1
2+
ndens=1,1,1,1,1,1
3+
nhtfrq=-1,-1,-1,-1,-1,-1
4+
write_nstep0 = .true.
5+
6+
avgflag_pertape= 'I', 'I', 'A', 'I', 'I'
7+
8+
empty_htapes=.true.
9+
fincl1= 'Z3GM', 'T', 'U', 'V', 'OMEGA', 'ElecColDens', 'PS', 'O', 'O2', 'H',
10+
'QRS_TOT', 'QRL_TOT', 'KVM', 'EKGW', 'TTGW', 'UTGW_TOTAL', 'VTGW_TOTAL'
11+
fincl2= 'Z3GM', 'T', 'U', 'V', 'OMEGA', 'UI', 'VI', 'WI', 'EDens', 'PS', 'O', 'O2', 'H',
12+
'OH', 'NO', 'O3', 'SIGMAHAL', 'SIGMAPED'
13+
fincl3 ='T_24_COS', 'T_24_SIN', 'T_12_COS', 'T_12_SIN',
14+
'U_24_COS', 'U_24_SIN', 'U_12_COS', 'U_12_SIN',
15+
'V_24_COS', 'V_24_SIN', 'V_12_COS', 'V_12_SIN',
16+
'QRS_TOT_12_SIN', 'QRS_TOT_12_COS'
17+
fincl4 = 'ED1', 'ED2', 'PHIM2D', 'PHIHM', 'HALL_CONDUCTANCE', 'PED_CONDUCTANCE'
18+
fincl5 = 'ElecColDens', 'PSL'
19+
fincl6 = ' '
20+
fincl7 = ' '
21+
fincl8 = ' '
22+
fincl9 = ' '
23+
fincl10= ' '
24+
25+
ionos_npes = 3200

‎cime_config/testdefs/testmods_dirs/cam/outfrq1h_wcmxhires/user_nl_clm‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
!----------------------------------------------------------------------------------
2+
! Users should add all user specific namelist changes below in the form of
3+
! namelist_var = new_namelist_value
4+
!
5+
! Include namelist variables for drv_flds_in ONLY if -megan and/or -drydep options
6+
! are set in the CLM_NAMELIST_OPTS env variable.
7+
!
8+
! EXCEPTIONS:
9+
! Set use_cndv by the compset you use and the CLM_BLDNML_OPTS -dynamic_vegetation setting
10+
! Set use_vichydro by the compset you use and the CLM_BLDNML_OPTS -vichydro setting
11+
! Set use_cn by the compset you use and CLM_BLDNML_OPTS -bgc setting
12+
! Set use_crop by the compset you use and CLM_BLDNML_OPTS -crop setting
13+
! Set spinup_state by the CLM_BLDNML_OPTS -bgc_spinup setting
14+
! Set irrigate by the CLM_BLDNML_OPTS -irrig setting
15+
! Set dtime with L_NCPL option
16+
! Set fatmlndfrc with LND_DOMAIN_PATH/LND_DOMAIN_FILE options
17+
! Set finidat with RUN_REFCASE/RUN_REFDATE/RUN_REFTOD options for hybrid or branch cases
18+
! (includes $inst_string for multi-ensemble cases)
19+
! Set glc_grid with CISM_GRID option
20+
! Set glc_smb with GLC_SMB option
21+
! Set maxpatch_glcmec with GLC_NEC option
22+
! Set glc_do_dynglacier with GLC_TWO_WAY_COUPLING env variable
23+
!----------------------------------------------------------------------------------
24+
hist_nhtfrq = -1
25+
hist_mfilt = 1
26+
hist_ndens = 1
27+
28+
flanduse_timeseries = ' '

0 commit comments

Comments
 (0)