Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 7 additions & 7 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ fxDONOTUSEurl = https://github.com/ESCOMP/mizuRoute
[submodule "ccs_config"]
path = ccs_config
url = https://github.com/jtruesdal/ccs_config_cesm.git
fxtag = ccs_config_cesm1.0.63_nh.01
fxtag = ccs_config_cesm1.0.63_nh.02
fxrequired = ToplevelRequired
fxDONOTUSEurl = https://github.com/jtruesdal/ccs_config_cesm.git

Expand All @@ -151,10 +151,10 @@ fxDONOTUSEurl = https://github.com/ESMCI/cime.git

[submodule "cmeps"]
path = components/cmeps
url = https://github.com/ESCOMP/CMEPS.git
fxtag = cmeps1.1.16
url = https://github.com/jtruesdal/CMEPS.git
fxtag = cmeps1.1.16.nh.001
fxrequired = ToplevelRequired
fxDONOTUSEurl = https://github.com/ESCOMP/CMEPS.git
fxDONOTUSEurl = https://github.com/jtruesdal/CMEPS.git

[submodule "cdeps"]
path = components/cdeps
Expand Down Expand Up @@ -186,10 +186,10 @@ fxDONOTUSEurl = https://github.com/ESCOMP/CESM_CICE

[submodule "clm"]
path = components/clm
url = https://github.com/ESCOMP/CTSM
fxtag = alpha-ctsm5.4.CMIP7.09.ctsm5.3.068
url = https://github.com/jtruesdal/ctsm.git
fxtag = alpha-ctsm5.4.CMIP7.09.ctsm5.3.068.nh.001
fxrequired = ToplevelRequired
fxDONOTUSEurl = https://github.com/ESCOMP/CTSM
fxDONOTUSEurl = https://github.com/jtruesdal/ctsm.git

[submodule "fms"]
path = libraries/FMS
Expand Down
4 changes: 3 additions & 1 deletion bld/namelist_files/namelist_defaults_cam.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
<dtime dyn="se" hgrid="ne60np4" > 900</dtime>
<dtime dyn="se" hgrid="ne120np4"> 450</dtime>
<dtime dyn="se" hgrid="ne240np4"> 225</dtime>
<dtime dyn="se" hgrid="ne1024np4"> 100</dtime>
<dtime dyn="se" hgrid="ne0np4CONUS.ne30x8">225</dtime>
<dtime dyn="se" hgrid="ne0np4.ARCTIC.ne30x4">450</dtime>
<dtime dyn="se" hgrid="ne0np4.ARCTICGRIS.ne30x8">225</dtime>
Expand Down Expand Up @@ -2029,6 +2030,7 @@
<drydep_srf_file hgrid="ne120np4" npg="2">atm/cam/chem/trop_mam/atmsrf_ne120np4.pg2_200109.nc</drydep_srf_file>
<drydep_srf_file hgrid="ne120np4" npg="3">atm/cam/chem/trop_mam/atmsrf_ne120np4.pg3_c210324.nc</drydep_srf_file>
<drydep_srf_file hgrid="ne240np4" >atm/cam/chem/trop_mam/atmsrf_ne240np4_110920.nc</drydep_srf_file>
<drydep_srf_file hgrid="ne1024np4" npg="2">atm/cam/chem/trop_mam/atmsrf_ne1024.pg2_260211.nc</drydep_srf_file>

<drydep_srf_file hgrid="ne0np4CONUS.ne30x8" >atm/cam/chem/trop_mam/atmsrf_ne0np4conus30x8_161116.nc</drydep_srf_file>
<drydep_srf_file hgrid="ne0np4.ARCTIC.ne30x4" >atm/cam/chem/trop_mam/atmsrf_ne30x4_ARCTIC_191011.nc</drydep_srf_file>
Expand Down Expand Up @@ -3462,7 +3464,7 @@
<se_tstep se_dyn_target="theta-l" hgrid="ne240np4" > 37.5 </se_tstep>
<se_tstep se_dyn_target="theta-l" hgrid="ne256np4" > 33 </se_tstep>
<se_tstep se_dyn_target="theta-l" hgrid="ne512np4" > 16 </se_tstep>
<se_tstep se_dyn_target="theta-l" hgrid="ne1024np4" > 8 </se_tstep>
<se_tstep se_dyn_target="theta-l" hgrid="ne1024np4" > 8.33333333333333 </se_tstep>
<se_tstep se_dyn_target="theta-l" hgrid="ne0np4.ARCTIC.ne30x4" > 37.5 </se_tstep>
<se_tstep se_dyn_target="theta-l" hgrid="ne0np4.ARCTICGRIS.ne30x8" > 18.75 </se_tstep>
<se_tstep se_dyn_target="preqx" > -1 </se_tstep>
Expand Down
2 changes: 1 addition & 1 deletion ccs_config
57 changes: 57 additions & 0 deletions cime_config/config_pes.xml
Original file line number Diff line number Diff line change
Expand Up @@ -424,6 +424,63 @@
</pes>
</mach>
</grid>
<grid name="a%ne1024">
<mach name="derecho">
<pes pesize="any" compset="any">
<ntasks>
<ntasks_atm>-256</ntasks_atm>
<ntasks_lnd>-256</ntasks_lnd>
<ntasks_rof>-256</ntasks_rof>
<ntasks_ice>-256</ntasks_ice>
<ntasks_ocn>-256</ntasks_ocn>
<ntasks_cpl>-256</ntasks_cpl>
</ntasks>
<nthrds>
<nthrds_atm>1</nthrds_atm>
<nthrds_lnd>1</nthrds_lnd>
<nthrds_rof>1</nthrds_rof>
<nthrds_ice>1</nthrds_ice>
<nthrds_ocn>1</nthrds_ocn>
<nthrds_cpl>1</nthrds_cpl>
</nthrds>
</pes>
</mach>
<mach name="any">
<pes pesize="any" compset="any">
<comment>none</comment>
<ntasks>
<ntasks_atm>-16</ntasks_atm>
<ntasks_lnd>-16</ntasks_lnd>
<ntasks_rof>-16</ntasks_rof>
<ntasks_ice>-16</ntasks_ice>
<ntasks_ocn>-16</ntasks_ocn>
<ntasks_glc>-16</ntasks_glc>
<ntasks_wav>-16</ntasks_wav>
<ntasks_cpl>-16</ntasks_cpl>
</ntasks>
<nthrds>
<nthrds_atm>1</nthrds_atm>
<nthrds_lnd>1</nthrds_lnd>
<nthrds_rof>1</nthrds_rof>
<nthrds_ice>1</nthrds_ice>
<nthrds_ocn>1</nthrds_ocn>
<nthrds_glc>1</nthrds_glc>
<nthrds_wav>1</nthrds_wav>
<nthrds_cpl>1</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%ne120">
<mach name="bluewaters">
<pes pesize="any" compset="any">
Expand Down
2 changes: 1 addition & 1 deletion components/clm
2 changes: 1 addition & 1 deletion components/cmeps
Loading