Skip to content

Commit

Permalink
Merge pull request ESCOMP#14 from fvitt/waccm_misc
Browse files Browse the repository at this point in the history
Misc WACCM(X) updates
  • Loading branch information
fvitt authored Oct 22, 2019
2 parents 1fd79fb + 3a359cb commit d4936c5
Show file tree
Hide file tree
Showing 19 changed files with 333 additions and 27 deletions.
8 changes: 8 additions & 0 deletions bld/namelist_files/namelist_defaults_cam.xml
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@
<ncdata dyn="fv" hgrid="0.9x1.25" nlev="126" waccmx="1">atm/waccm/ic/fx2000_0.9x1.25_126lev_0002-01-01-00000_c181221.nc</ncdata>
<ncdata dyn="fv" hgrid="1.9x2.5" nlev="130" waccmx="1">atm/waccm/ic/wcmx-cam6-phys_1.9x2.5_130lev_2000_c181115.nc</ncdata>
<ncdata dyn="fv" hgrid="0.9x1.25" nlev="130" waccmx="1">atm/waccm/ic/wcmx-cam6-phys_0.9x1.25_130lev_2000_c190122.nc</ncdata>
<ncdata dyn="fv" hgrid="0.47x0.63" nlev="130" waccmx="1">atm/waccm/ic/FC6X2000_f05_spinup01.cam.i.0002-01-01-00000_c190711.nc</ncdata>
<ncdata dyn="fv" hgrid="4x5" nlev="130" waccmx="1" ic_ymd="101" aquaplanet="1">atm/waccm/ic/waccmx_mam4_aqua_4x5_L130_c180803.nc</ncdata>
<ncdata dyn="fv" hgrid="1.9x2.5" nlev="130" waccmx="1" ic_ymd="101" aquaplanet="1">atm/waccm/ic/waccmx_mam4_aqua_1.9x2.5_L130_c180803.nc</ncdata>

Expand Down Expand Up @@ -185,6 +186,7 @@

<bnd_topo hgrid="0.23x0.31" >atm/cam/topo/USGS_gtopo30_0.23x0.31_remap_c061107.nc</bnd_topo>
<bnd_topo hgrid="0.47x0.63" >atm/cam/topo/USGS_gtopo30_0.47x0.63_remap_c061106.nc</bnd_topo>
<bnd_topo hgrid="0.47x0.63" phys="cam6">atm/cam/topo/fv_0.47x0.63_nc3000_Co030_Fi001_PF_nullRR_Nsw021_20171023.nc</bnd_topo>
<bnd_topo hgrid="0.5x0.625" >atm/cam/topo/topo-from-cami_0000-10-01_0.5x0.625_L26_c031204.nc</bnd_topo>
<bnd_topo hgrid="0.9x1.25" >atm/cam/topo/fv_0.9x1.25_nc3000_Nsw042_Nrs008_Co060_Fi001_ZR_sgh30_24km_GRNL_c170103.nc</bnd_topo>
<bnd_topo hgrid="1.9x2.5" >atm/cam/topo/fv_1.9x2.5_nc3000_Nsw084_Nrs016_Co120_Fi001_ZR_GRNL_c190405.nc</bnd_topo>
Expand Down Expand Up @@ -598,6 +600,7 @@

<!-- Dry Convective Adjustment options -->
<dadadj_niter>15</dadadj_niter>
<dadadj_niter hgrid="0.47x0.63" waccmx="1">100</dadadj_niter>

<!-- Waccm-x runtime options -->
<waccmx_opt >off</waccmx_opt>
Expand All @@ -607,8 +610,10 @@
<wei05_coefs_file>atm/waccm/efld/wei05sc_c080415.nc</wei05_coefs_file>
<ionos_xport_nsplit waccmx="1">5</ionos_xport_nsplit>
<ionos_xport_nsplit hgrid="0.9x1.25" waccmx="1">30</ionos_xport_nsplit>
<ionos_xport_nsplit hgrid="0.47x0.63" waccmx="1">90</ionos_xport_nsplit>
<oplus_ring_polar_filter>.false.</oplus_ring_polar_filter>
<oplus_ring_polar_filter hgrid="0.9x1.25" waccmx="1">.true.</oplus_ring_polar_filter>
<oplus_ring_polar_filter hgrid="0.47x0.63" waccmx="1">.true.</oplus_ring_polar_filter>

<!-- For scaling lightning sources of NOx -->
<lght_no_prd_factor >1.00D0</lght_no_prd_factor>
Expand Down Expand Up @@ -1857,12 +1862,15 @@
<fv_nspltvrm hgrid="0.23x0.31">2</fv_nspltvrm>
<fv_nspltvrm waccm_phys="1">2</fv_nspltvrm>
<fv_nspltvrm hgrid="0.9x1.25" waccm_phys="1">4</fv_nspltvrm>
<fv_nspltvrm hgrid="0.47x0.63" waccmx="1">16</fv_nspltvrm>

<fv_nspltrac waccm_phys="1">2</fv_nspltrac>
<fv_nspltrac hgrid="0.9x1.25" waccm_phys="1">4</fv_nspltrac>
<fv_nspltrac hgrid="0.47x0.63" waccmx="1">16</fv_nspltrac>

<fv_nsplit waccm_phys="1"> 8</fv_nsplit>
<fv_nsplit hgrid="0.9x1.25" waccm_phys="1">16</fv_nsplit>
<fv_nsplit hgrid="0.47x0.63" waccmx="1">32</fv_nsplit>

<fv_del2coef >3.e+5</fv_del2coef>

Expand Down
15 changes: 9 additions & 6 deletions bld/namelist_files/use_cases/sd_waccm_ma_cam6.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@

<namelist_defaults>

<start_ymd>20050101</start_ymd>

<!-- Solar data from NRL -->
<solar_irrad_data_file>atm/cam/solar/SolarForcingNRLSSI2_daily_s18820101_e20171231_c180702.nc</solar_irrad_data_file>

Expand All @@ -17,18 +15,23 @@
<!--Species IC -->
<ncdata dyn="fv" hgrid="0.9x1.25" chem="waccm_ma_mam4" >cesm2_init/f.e21.FWmaSD.f09_f09_mg17.cesm2.1-exp011.1978-2015.001/1980-01-01/f.e21.FWmaSD.f09_f09_mg17.cesm2.1-exp011.1978-2015.001.cam.i.1980-01-01-00000.nc</ncdata>
<ncdata dyn="fv" hgrid="0.9x1.25" chem="waccm_mad_mam4">cesm2_init/f.e21.FWmadSD.f09_f09_mg17.cesm2.1-exp011.001/2005-01-01/f.e21.FWmadSD.f09_f09_mg17.cesm2.1-exp011.001.cam.i.2005-01-01-00000.nc</ncdata>
<ncdata hgrid="1.9x2.5">atm/waccm/ic/f.e21.FWmaSD.f19_f19_mg17.HETALL.001.cam.i.1980-01-02_c190910.nc</ncdata>

<met_rlx_bot>50.</met_rlx_bot>
<met_rlx_top>60.</met_rlx_top>
<met_rlx_time>50.</met_rlx_time>
<met_fix_mass>.true.</met_fix_mass>
<met_data_file hgrid="1.9x2.5">1980/MERRA2_1.9x2.5_19800101.nc</met_data_file>
<met_data_path hgrid="1.9x2.5">atm/cam/met/MERRA2/1.9x2.5</met_data_path>
<met_filenames_list hgrid="1.9x2.5">atm/cam/met/MERRA2/1.9x2.5/filenames_list_c190911.txt</met_filenames_list>
<met_data_file dyn="fv" hgrid="0.9x1.25" chem="waccm_ma_mam4" >1980/MERRA2_0.9x1.25_19800101.nc</met_data_file>
<met_data_file dyn="fv" hgrid="0.9x1.25" chem="waccm_mad_mam4">2005/MERRA2_0.9x1.25_20050101.nc</met_data_file>
<met_data_path dyn="fv" hgrid="0.9x1.25">atm/cam/met/MERRA2/0.9x1.25</met_data_path>
<met_filenames_list dyn="fv" hgrid="0.9x1.25">atm/cam/met/MERRA2/0.9x1.25/filenames_1975-2017_c190125.txt</met_filenames_list>
<met_qflx_factor>0.84</met_qflx_factor>

<bnd_topo hgrid="0.9x1.25">atm/cam/met/MERRA2/0.9x1.25/fv_0.9x1.25_nc3000_Nsw042_Nrs008_Co060_Fi001_ZR_sgh30_24km_GRNL_MERRA2_c171218.nc</bnd_topo>
<bnd_topo hgrid="1.9x2.5">atm/cam/met/MERRA2/fv_1.9x2.5_nc3000_Nsw084_Nrs016_Co120_Fi001_ZR_MERRA2_PHIS_c180925.nc</bnd_topo>

<!-- LBC, UBC Files -->
<flbc_type>SERIAL</flbc_type>
Expand All @@ -43,13 +46,13 @@
<tgcm_ubc_data_type>'INTERP_MISSING_MONTHS'</tgcm_ubc_data_type>

<!-- QBO settings -->
<qbo_use_forcing >.true.</qbo_use_forcing>
<qbo_use_forcing hgrid="0.9x1.25">.false.</qbo_use_forcing>
<qbo_cyclic>.true.</qbo_cyclic>
<qbo_forcing_file>atm/waccm/qbo/qbocyclic28months.nc</qbo_forcing_file>
<qbo_use_forcing>.false.</qbo_use_forcing>

<!-- emissions -->

<dust_emis_fact hgrid="1.9x2.5">0.7D0</dust_emis_fact>
<lght_no_prd_factor hgrid="1.9x2.5">6.0D0</lght_no_prd_factor>

<!-- External forcing -->
<ext_frc_type>INTERP_MISSING_MONTHS</ext_frc_type>

Expand Down
8 changes: 8 additions & 0 deletions bld/namelist_files/use_cases/sd_waccmx_ma_cam6.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,25 @@

<!--Species IC -->
<ncdata dyn="fv" hgrid="0.9x1.25">atm/waccm/ic/f.c61016.FC6XSD.f09_f09_mg17.test01.cam.i.2000-01-21-00000_c190325.nc</ncdata>
<ncdata dyn="fv" hgrid="1.9x2.5" >atm/waccm/ic/FC6XSD_f19_f19_mg17_L145_1981-01-01-00000_c190617.nc</ncdata>

<met_rlx_bot>50.</met_rlx_bot>
<met_rlx_top>60.</met_rlx_top>
<met_rlx_time>50.</met_rlx_time>
<met_fix_mass>.true.</met_fix_mass>

<met_data_file dyn="fv" hgrid="0.9x1.25">1980/MERRA2_0.9x1.25_19800101.nc</met_data_file>
<met_data_path dyn="fv" hgrid="0.9x1.25">atm/cam/met/MERRA2/0.9x1.25</met_data_path>
<met_filenames_list dyn="fv" hgrid="0.9x1.25">atm/cam/met/MERRA2/0.9x1.25/filenames_1975-2017_c190125.txt</met_filenames_list>

<met_data_file dyn="fv" hgrid="1.9x2.5">1980/MERRA2_1.9x2.5_19800101.nc</met_data_file>
<met_data_path dyn="fv" hgrid="1.9x2.5">atm/cam/met/MERRA2/1.9x2.5</met_data_path>
<met_filenames_list dyn="fv" hgrid="1.9x2.5">atm/cam/met/MERRA2/1.9x2.5/filenames_list_c180824</met_filenames_list>

<met_qflx_factor>0.84</met_qflx_factor>

<bnd_topo hgrid="0.9x1.25">atm/cam/met/MERRA2/0.9x1.25/fv_0.9x1.25_nc3000_Nsw042_Nrs008_Co060_Fi001_ZR_sgh30_24km_GRNL_MERRA2_c171218.nc</bnd_topo>
<bnd_topo hgrid="1.9x2.5">atm/cam/met/MERRA2/1.9x2.5/fv_1.9x2.5_nc3000_Nsw084_Nrs016_Co120_Fi001_ZR_GRNL_MERRA2_c190617.nc</bnd_topo>

<!-- LBC, UBC Files -->
<flbc_type>SERIAL</flbc_type>
Expand Down
2 changes: 1 addition & 1 deletion cime_config/config_component.xml
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@
<value compset="_(CAM50|CAM60)%WCTS">-chem waccm_tsmlt_mam4</value>
<value compset="_CAM40%WX">-waccmx</value>
<value compset="_CAM\d0%WXIE">-ionosphere wxie</value>
<value compset="_CAM40%WXIE">-chem waccm_ma</value>
<value compset="_CAM40%WXIE(_|%)">-chem waccm_ma</value>
<value compset="_CAM40%WXIED">-chem waccm_mad</value>
<value compset="_CAM40%WCMD">-chem waccm_mad</value>
<value compset="_CAM60%WX">-chem waccm_ma_mam4 -waccmx</value>
Expand Down
1 change: 1 addition & 0 deletions cime_config/config_compsets.xml
Original file line number Diff line number Diff line change
Expand Up @@ -419,6 +419,7 @@
<value compset="HIST_CAM60%WCTS_CLM50%BGC-CROP">1950-01-01</value>
<value compset="HIST_CAM40%WX">2000-01-01</value>
<value compset="HIST_CAM60%WCMD">2005-01-01</value>
<value compset="HIST_CAM60%WCMD%SDYN" grid="a%1.9x2.5">1980-01-01</value>
<value compset="HIST_CAM60%WCSC">1850-01-01</value>
<value compset="HIST_CAM60%CCTS">1995-01-01</value>
<value compset="HIST_CAM60%CVBSX">1995-01-01</value>
Expand Down
35 changes: 34 additions & 1 deletion cime_config/config_pes.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1646,7 +1646,40 @@
<rootpe_wav>0</rootpe_wav>
<rootpe_cpl>0</rootpe_cpl>
</rootpe>
</pes>
</pes>
<pes pesize="any" compset="_CAM\d0%WX">
<comment>none</comment>
<ntasks>
<ntasks_atm>576</ntasks_atm>
<ntasks_lnd>576</ntasks_lnd>
<ntasks_rof>576</ntasks_rof>
<ntasks_ice>576</ntasks_ice>
<ntasks_ocn>576</ntasks_ocn>
<ntasks_glc>576</ntasks_glc>
<ntasks_wav>576</ntasks_wav>
<ntasks_cpl>576</ntasks_cpl>
</ntasks>
<nthrds>
<nthrds_atm>3</nthrds_atm>
<nthrds_lnd>3</nthrds_lnd>
<nthrds_rof>3</nthrds_rof>
<nthrds_ice>3</nthrds_ice>
<nthrds_ocn>3</nthrds_ocn>
<nthrds_glc>3</nthrds_glc>
<nthrds_wav>3</nthrds_wav>
<nthrds_cpl>3</nthrds_cpl>
</nthrds>
<rootpe>
<rootpe_atm>0</rootpe_atm>
<rootpe_lnd>0</rootpe_lnd>
<rootpe_rof>0</rootpe_rof>
<rootpe_ice>0</rootpe_ice>
<rootpe_ocn>0</rootpe_ocn>
<rootpe_glc>0</rootpe_glc>
<rootpe_wav>0</rootpe_wav>
<rootpe_cpl>0</rootpe_cpl>
</rootpe>
</pes>
</mach>
</grid>
<grid name="a%0.47x0.63" >
Expand Down
48 changes: 45 additions & 3 deletions cime_config/testdefs/testlist_cam.xml
Original file line number Diff line number Diff line change
Expand Up @@ -642,6 +642,16 @@
<option name="wallclock">00:30:00</option>
</options>
</test>
<test compset="FC6X2000" grid="f05_f05_mg17" name="SMS_D_Ln3" testmods="cam/outfrq9s_576tsks">
<machines>
<machine name="cheyenne" compiler="intel" category="waccmx"/>
</machines>
</test>
<test compset="FC6X2000" grid="f05_f05_mg17" name="ERS_Ln9" testmods="cam/outfrq9s_576tsks">
<machines>
<machine name="cheyenne" compiler="intel" category="waccmx"/>
</machines>
</test>
<test compset="FC6X2000" grid="f19_f19_mg17" name="SMS_D_Ln9" testmods="cam/outfrq9s">
<machines>
<machine name="cheyenne" compiler="intel" category="aux_cam"/>
Expand Down Expand Up @@ -680,10 +690,27 @@
<option name="wallclock">00:30:00</option>
</options>
</test>
<test compset="FC6XHIST" grid="f09_f09_mg17" name="ERS_Lh3" testmods="cam/outfrq1d">
<test compset="FC6XHIST" grid="f09_f09_mg17" name="ERS_Lh3" testmods="cam/outfrq3h">
<machines>
<machine name="cheyenne" compiler="intel" category="waccmx"/>
</machines>
</test>
<test compset="FC6XSD" grid="f19_f19_mg17" name="SMS_D_Ln9" testmods="cam/outfrq9s">
<machines>
<machine name="cheyenne" compiler="intel" category="waccmx"/>
</machines>
<options>
<option name="wallclock">00:30:00</option>
</options>
</test>
<test compset="FC6XSD" grid="f19_f19_mg17" name="ERS_Lh12" testmods="cam/outfrq3h">
<machines>
<machine name="cheyenne" compiler="intel" category="waccmx"/>
<machine name="cheyenne" compiler="intel" category="prebeta"/>
</machines>
<options>
<option name="wallclock">00:30:00</option>
</options>
</test>
<test compset="FC6XSD" grid="f09_f09_mg17" name="SMS_D_Ln9" testmods="cam/outfrq9s">
<machines>
Expand All @@ -694,7 +721,7 @@
<option name="wallclock">00:30:00</option>
</options>
</test>
<test compset="FC6XSD" grid="f09_f09_mg17" name="ERS_Lh3" testmods="cam/outfrq1d">
<test compset="FC6XSD" grid="f09_f09_mg17" name="ERS_Lh3" testmods="cam/outfrq3h">
<machines>
<machine name="cheyenne" compiler="intel" category="waccmx"/>
</machines>
Expand Down Expand Up @@ -767,7 +794,7 @@
<option name="wallclock">00:20:00</option>
</options>
</test>
<test compset="FXmadHIST" grid="f19_f19_mg17" name="ERS_Lh12" testmods="cam/outfrq9s" supported="false">
<test compset="FXmadHIST" grid="f19_f19_mg17" name="ERS_Lh12" testmods="cam/outfrq3h" supported="false">
<machines>
<machine name="cheyenne" compiler="intel" category="prebeta"/>
<machine name="cheyenne" compiler="intel" category="waccmx"/>
Expand Down Expand Up @@ -868,6 +895,21 @@
<option name="wallclock">00:40:00</option>
</options>
</test>
<test compset="FWmaSD" grid="f19_f19_mg17" name="SMS_D_Ln9" testmods="cam/outfrq9s">
<machines>
<machine name="cheyenne" compiler="intel" category="waccm"/>
</machines>
</test>
<test compset="FWmadSD" grid="f19_f19_mg17" name="SMS_D_Ln9" testmods="cam/outfrq9s">
<machines>
<machine name="cheyenne" compiler="intel" category="waccm"/>
</machines>
</test>
<test compset="FWmaSD" grid="f19_f19_mg17" name="ERP_Ln9" testmods="cam/outfrq9s">
<machines>
<machine name="cheyenne" compiler="intel" category="waccm"/>
</machines>
</test>
<test compset="FWmadSD" grid="f09_f09_mg17" name="SMS_Ld5" testmods="cam/reduced_hist5d">
<machines>
<machine name="cheyenne" compiler="intel" category="waccm"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
./xmlchange ROF_NCPL=\$ATM_NCPL
3 changes: 3 additions & 0 deletions cime_config/testdefs/testmods_dirs/cam/outfrq3h/user_nl_cam
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
mfilt=1,1,1,1,1,1,1,1,1,1
ndens=1,1,1,1,1,1,1,1,1,1
nhtfrq=-3,-3,-3,-3,-3,-3,-3,-3,-3,-3
27 changes: 27 additions & 0 deletions cime_config/testdefs/testmods_dirs/cam/outfrq3h/user_nl_clm
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
!----------------------------------------------------------------------------------
! Users should add all user specific namelist changes below in the form of
! namelist_var = new_namelist_value
!
! Include namelist variables for drv_flds_in ONLY if -megan and/or -drydep options
! are set in the CLM_NAMELIST_OPTS env variable.
!
! EXCEPTIONS:
! Set use_cndv by the compset you use and the CLM_BLDNML_OPTS -dynamic_vegetation setting
! Set use_vichydro by the compset you use and the CLM_BLDNML_OPTS -vichydro setting
! Set use_cn by the compset you use and CLM_BLDNML_OPTS -bgc setting
! Set use_crop by the compset you use and CLM_BLDNML_OPTS -crop setting
! Set spinup_state by the CLM_BLDNML_OPTS -bgc_spinup setting
! Set irrigate by the CLM_BLDNML_OPTS -irrig setting
! Set dtime with L_NCPL option
! Set fatmlndfrc with LND_DOMAIN_PATH/LND_DOMAIN_FILE options
! Set finidat with RUN_REFCASE/RUN_REFDATE/RUN_REFTOD options for hybrid or branch cases
! (includes $inst_string for multi-ensemble cases)
! Set glc_grid with CISM_GRID option
! Set glc_smb with GLC_SMB option
! Set maxpatch_glcmec with GLC_NEC option
! Set glc_do_dynglacier with GLC_TWO_WAY_COUPLING env variable
!----------------------------------------------------------------------------------
hist_nhtfrq = -3
hist_mfilt = 1
hist_ndens = 1

Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
./xmlchange ROF_NCPL=\$ATM_NCPL
./xmlchange GLC_NCPL=\$ATM_NCPL
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
mfilt=1,1,1,1,1,1
ndens=1,1,1,1,1,1
nhtfrq=9,9,9,9,9,9
inithist='ENDOFRUN'
npr_yz = 48,12,12,48
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
!----------------------------------------------------------------------------------
! Users should add all user specific namelist changes below in the form of
! namelist_var = new_namelist_value
!
! Include namelist variables for drv_flds_in ONLY if -megan and/or -drydep options
! are set in the CLM_NAMELIST_OPTS env variable.
!
! EXCEPTIONS:
! Set use_cndv by the compset you use and the CLM_BLDNML_OPTS -dynamic_vegetation setting
! Set use_vichydro by the compset you use and the CLM_BLDNML_OPTS -vichydro setting
! Set use_cn by the compset you use and CLM_BLDNML_OPTS -bgc setting
! Set use_crop by the compset you use and CLM_BLDNML_OPTS -crop setting
! Set spinup_state by the CLM_BLDNML_OPTS -bgc_spinup setting
! Set irrigate by the CLM_BLDNML_OPTS -irrig setting
! Set dtime with L_NCPL option
! Set fatmlndfrc with LND_DOMAIN_PATH/LND_DOMAIN_FILE options
! Set finidat with RUN_REFCASE/RUN_REFDATE/RUN_REFTOD options for hybrid or branch cases
! (includes $inst_string for multi-ensemble cases)
! Set glc_grid with CISM_GRID option
! Set glc_smb with GLC_SMB option
! Set maxpatch_glcmec with GLC_NEC option
! Set glc_do_dynglacier with GLC_TWO_WAY_COUPLING env variable
!----------------------------------------------------------------------------------
hist_nhtfrq = 9
hist_mfilt = 1
hist_ndens = 1

Loading

0 comments on commit d4936c5

Please sign in to comment.