Skip to content

Commit

Permalink
Merge remote-tracking branch 'ESCOMP/cam_development' into history-bu…
Browse files Browse the repository at this point in the history 
…gfixes
  • Loading branch information
@peverwhee
peverwhee committed Oct 28, 2024
2 parents ba1e652 + db75458 commit b8cd5a6
Show file tree
Hide file tree
Showing 30 changed files with 750 additions and 168 deletions.
16 changes: 8 additions & 8 deletions .gitmodules
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
[submodule "atmos_phys"]
path = src/atmos_phys
url = https://github.com/ESCOMP/atmospheric_physics
fxtag = atmos_phys0_05_000
fxtag = atmos_phys0_05_001
fxrequired = AlwaysRequired
fxDONOTUSEurl = https://github.com/ESCOMP/atmospheric_physics

Expand Down Expand Up @@ -144,28 +144,28 @@ fxDONOTUSEurl = https://github.com/ESCOMP/mizuRoute
[submodule "ccs_config"]
path = ccs_config
url = https://github.com/ESMCI/ccs_config_cesm.git
fxtag = ccs_config_cesm1.0.0
fxtag = ccs_config_cesm1.0.7
fxrequired = ToplevelRequired
fxDONOTUSEurl = https://github.com/ESMCI/ccs_config_cesm.git

[submodule "cime"]
path = cime
url = https://github.com/ESMCI/cime
fxtag = cime6.1.0
fxtag = cime6.1.29
fxrequired = ToplevelRequired
fxDONOTUSEurl = https://github.com/ESMCI/cime

[submodule "cmeps"]
path = components/cmeps
url = https://github.com/ESCOMP/CMEPS.git
fxtag = cmeps1.0.2
fxtag = cmeps1.0.16
fxrequired = ToplevelRequired
fxDONOTUSEurl = https://github.com/ESCOMP/CMEPS.git

[submodule "cdeps"]
path = components/cdeps
url = https://github.com/ESCOMP/CDEPS.git
fxtag = cdeps1.0.48
fxtag = cdeps1.0.53
fxrequired = ToplevelRequired
fxDONOTUSEurl = https://github.com/ESCOMP/CDEPS.git

Expand All @@ -179,7 +179,7 @@ fxDONOTUSEurl = https://github.com/ESCOMP/CESM_share
[submodule "parallelio"]
path = libraries/parallelio
url = https://github.com/NCAR/ParallelIO
fxtag = pio2_6_2
fxtag = pio2_6_3
fxrequired = ToplevelRequired
fxDONOTUSEurl = https://github.com/NCAR/ParallelIO

Expand All @@ -193,13 +193,13 @@ fxDONOTUSEurl = https://github.com/ESCOMP/CESM_CICE
[submodule "clm"]
path = components/clm
url = https://github.com/ESCOMP/CTSM
fxtag = ctsm5.2.027
fxtag = ctsm5.3.002
fxrequired = ToplevelRequired
fxDONOTUSEurl = https://github.com/ESCOMP/CTSM

[submodule "fms"]
path = libraries/FMS
url = https://github.com/ESCOMP/FMS_interface
fxtag = fi_240516
fxtag = fi_240828
fxrequired = ToplevelRequired
fxDONOTUSEurl = https://github.com/ESCOMP/FMS_interface
20 changes: 11 additions & 9 deletions bld/configure
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1074,9 +1074,12 @@ my $rad_pkg = 'none';
if ($phys_pkg =~ m/cam4|spcam_sam1mom/) {
$rad_pkg = 'camrt';
}
elsif ($phys_pkg =~ m/cam5|cam6|cam7|spcam_m2005/) {
elsif ($phys_pkg =~ m/cam5|cam6|spcam_m2005/) {
$rad_pkg = 'rrtmg';
}
elsif ($phys_pkg =~ m/cam7/) {
$rad_pkg = 'rrtmgp';
}
# Allow the user to override the default via the commandline.
my $use_rrtmgp_gpu = 0;
if (defined $opts{'rad'}) {
Expand Down Expand Up @@ -2191,9 +2194,9 @@ sub write_filepath

if ($simple_phys) {
print $fh "$camsrcdir/src/physics/simple\n";
print $fh "$camsrcdir/src/atmos_phys/kessler\n";
print $fh "$camsrcdir/src/atmos_phys/held_suarez\n";
print $fh "$camsrcdir/src/atmos_phys/tj2016\n";
print $fh "$camsrcdir/src/atmos_phys/schemes/kessler\n";
print $fh "$camsrcdir/src/atmos_phys/schemes/held_suarez\n";
print $fh "$camsrcdir/src/atmos_phys/schemes/tj2016\n";
}

# Weak scaling fix. This has to come before physics/cam and before dycores
Expand Down Expand Up @@ -2334,9 +2337,10 @@ sub write_filepath
print $fh "$camsrcdir/src/physics/cam\n";

#Add the CCPP'ized subdirectories
print $fh "$camsrcdir/src/atmos_phys/tropopause_find\n";
print $fh "$camsrcdir/src/atmos_phys/zhang_mcfarlane\n";
print $fh "$camsrcdir/src/atmos_phys/dry_adiabatic_adjust\n";
print $fh "$camsrcdir/src/atmos_phys/schemes/tropopause_find\n";
print $fh "$camsrcdir/src/atmos_phys/schemes/zhang_mcfarlane\n";
print $fh "$camsrcdir/src/atmos_phys/schemes/dry_adiabatic_adjust\n";
print $fh "$camsrcdir/src/atmos_phys/schemes/utilities\n";

# Dynamics package and test utilities
print $fh "$camsrcdir/src/dynamics/$dyn\n";
Expand All @@ -2362,8 +2366,6 @@ sub write_filepath
print $fh "$camsrcdir/src/control\n";
print $fh "$camsrcdir/src/utils\n";
print $fh "$camsrcdir/src/utils/cam_ccpp\n";
print $fh "$camsrcdir/src/atmos_phys/utilities\n";


$fh->close;
}
Expand Down
2 changes: 1 addition & 1 deletion bld/namelist_files/namelist_defaults_cam.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2548,7 +2548,7 @@
<seasalt_emis_scale ver="mam7" >1.62D0</seasalt_emis_scale>
<seasalt_emis_scale ver="strat" >0.90D0</seasalt_emis_scale>
<seasalt_emis_scale ver="strat" clubb_sgs="1" >1.00D0</seasalt_emis_scale>
<seasalt_emis_scale ver="strat" clubb_sgs="1" phys="cam7" >1.5D0</seasalt_emis_scale>
<seasalt_emis_scale ver="strat" clubb_sgs="1" phys="cam7" >0.75D0</seasalt_emis_scale>
<seasalt_emis_scale ver="strat" clubb_sgs="1" hgrid="1.9x2.5" phys="cam6">1.10D0</seasalt_emis_scale>
<seasalt_emis_scale ver="strat" spcam_clubb_sgs="1" >1.2D0</seasalt_emis_scale>
<seasalt_emis_scale ver="strat" clubb_sgs="1" silhs="1" >0.60D0</seasalt_emis_scale>
Expand Down
2 changes: 1 addition & 1 deletion bld/namelist_files/use_cases/1850_cam_lt.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

<!-- Low top upper boundary conditions -->
<ubc_specifier>'Q:H2O->UBC_FILE'</ubc_specifier>
<ubc_file_path>atm/cam/chem/ubc/b.e21.BWHIST.f09_g17.CMIP6-historical-WACCM.ensAvg123.cam.h0zm.H2O.185001-201412_c230509cdf5.nc</ubc_file_path>
<ubc_file_path>atm/cam/chem/ubc/b.e21.BWHIST.f09_g17.CMIP6-historical-WACCM.ensAvg123.cam.h0zm.H2O.1849-2014_c240604.nc</ubc_file_path>
<ubc_file_input_type>CYCLICAL</ubc_file_input_type>
<ubc_file_cycle_yr>1850</ubc_file_cycle_yr>

Expand Down
2 changes: 1 addition & 1 deletion ccs_config
Submodule ccs_config updated 116 files
2 changes: 1 addition & 1 deletion cime
Submodule cime updated 55 files
+3 −2 .github/workflows/testing.yml
+7 −1 CIME/BuildTools/configure.py
+26 −54 CIME/ParamGen/paramgen.py
+4 −4 CIME/Servers/__init__.py
+3 −14 CIME/SystemTests/ers.py
+2 −1 CIME/SystemTests/funit.py
+3 −4 CIME/SystemTests/hommebaseclass.py
+4 −4 CIME/SystemTests/mvk.py
+5 −5 CIME/SystemTests/pgn.py
+1 −1 CIME/SystemTests/restart_tests.py
+71 −2 CIME/SystemTests/system_tests_common.py
+4 −4 CIME/SystemTests/tsc.py
+5 −4 CIME/Tools/Makefile
+94 −60 CIME/Tools/list_e3sm_tests
+52 −9 CIME/Tools/xmlchange
+10 −0 CIME/XML/batch.py
+1 −1 CIME/XML/component.py
+22 −0 CIME/XML/compsets.py
+1 −1 CIME/XML/entry_id.py
+65 −21 CIME/XML/env_batch.py
+12 −0 CIME/XML/env_workflow.py
+47 −21 CIME/XML/grids.py
+30 −7 CIME/XML/pes.py
+8 −3 CIME/build.py
+29 −9 CIME/case/case.py
+8 −4 CIME/case/case_cmpgen_namelists.py
+6 −2 CIME/case/case_run.py
+48 −4 CIME/case/case_setup.py
+6 −5 CIME/case/case_st_archive.py
+5 −1 CIME/case/case_submit.py
+2 −1 CIME/case/case_test.py
+9 −15 CIME/code_checker.py
+2 −1 CIME/compare_test_results.py
+0 −3 CIME/data/config/config_tests.xml
+2 −0 CIME/data/config/xml_schemas/config_workflow.xsd
+77 −0 CIME/data/templates/gitignore.template
+100 −0 CIME/gitinterface.py
+66 −47 CIME/hist_utils.py
+1 −1 CIME/non_py/cprnc
+10 −0 CIME/scripts/create_test.py
+270 −365 CIME/scripts/query_config.py
+132 −0 CIME/status.py
+30 −17 CIME/test_scheduler.py
+8 −1 CIME/test_status.py
+2 −1 CIME/tests/test_sys_cime_case.py
+1 −1 CIME/tests/test_sys_create_newcase.py
+25 −3 CIME/tests/test_sys_unittest.py
+1 −1 CIME/tests/test_unit_utils.py
+164 −0 CIME/tests/test_unit_xml_grids.py
+13 −98 CIME/utils.py
+12 −50 docker/Dockerfile
+29 −0 docker/cime.yaml
+9 −0 docker/entrypoint.sh
+3 −3 tools/mapping/gen_mapping_files/runoff_to_ocn/INSTALL
+1 −1 tools/mapping/gen_mapping_files/runoff_to_ocn/tools/makdep.c
2 changes: 1 addition & 1 deletion cime_config/SystemTests/plb.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
from CIME.SystemTests.system_tests_compare_two import SystemTestsCompareTwo
from CIME.XML.standard_module_setup import *
from CIME.SystemTests.test_utils.user_nl_utils import append_to_user_nl_files
from CIME.utils import append_testlog
from CIME.status import append_testlog

logger = logging.getLogger(__name__)

Expand Down
2 changes: 1 addition & 1 deletion cime_config/SystemTests/sct.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
from CIME.XML.standard_module_setup import *
from CIME.SystemTests.test_utils.user_nl_utils import append_to_user_nl_files
from CIME.test_status import *
from CIME.utils import append_testlog
from CIME.status import append_testlog


logger = logging.getLogger(__name__)
Expand Down
2 changes: 1 addition & 1 deletion cime_config/SystemTests/sub.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
from CIME.SystemTests.system_tests_compare_two import SystemTestsCompareTwo
from CIME.XML.standard_module_setup import *
from CIME.SystemTests.test_utils.user_nl_utils import append_to_user_nl_files
from CIME.utils import append_testlog
from CIME.status import append_testlog


logger = logging.getLogger(__name__)
Expand Down
2 changes: 1 addition & 1 deletion cime_config/SystemTests/tmc.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
from CIME.XML.standard_module_setup import *
from CIME.SystemTests.system_tests_common import SystemTestsCommon
from CIME.test_status import *
from CIME.utils import append_testlog
from CIME.status import append_testlog
from CIME.baselines.performance import get_latest_cpl_logs
import glob, gzip

Expand Down
42 changes: 21 additions & 21 deletions cime_config/config_component.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
CAM
===============
-->
<desc atm="CAM70[%LT][%MT][%CCTS1][%CCTS4]" >CAM cam7 physics:</desc>
<desc atm="CAM60[%1PCT][%4xCO2][%CCTS1][%CCTS2][%CFIRE][%CVBSX][%NUDG][%PORT][%RCO2][%SCAM][%SDYN][%WCCM][%WCMD][%WCSC][%WCTS][%WXIE][%WXIED][%HEMCO][%GEOSCHEM][%SCAMARM95][%SCAMARM97][%SCAMATEX][%SCAMBOMEX][%SCAMCGILSS11][%SCAMCGILSS12][%SCAMCGILSS6][%SCAMDYCOMSRF01][%SCAMDYCOMSRF02][%SCAMGATE3][%SCAMMPACE][%SCAMRICO][%SCAMSPARTICUS][%SCAMTOGA2][%SCAMTWP06][%SCAMCAMFRC]" >CAM cam6 physics:</desc>
<desc atm="CAM50[%CCTS1][%CLB][%PORT][%RCO2][%MAM7][%SCAM][%SDYN][%WCSC][%WCTS][%SCAMARM95][%SCAMARM97][%SCAMATEX][%SCAMBOMEX][%SCAMCGILSS11][%SCAMCGILSS12][%SCAMCGILSS6][%SCAMDYCOMSRF01][%SCAMDYCOMSRF02][%SCAMGATE3][%SCAMMPACE][%SCAMRICO][%SCAMSPARTICUS][%SCAMTOGA2][%SCAMTWP06][%SCAMCAMFRC]" >CAM cam5 physics:</desc>
<desc atm="CAM40[%PORT][%RCO2][%SCAM][%SDYN][%TMOZ][%WX][%WXIE][%WXIED][%WCCM][%WCMD][%SCAMARM95][%SCAMARM97][%SCAMATEX][%SCAMBOMEX][%SCAMCGILSS11][%SCAMCGILSS12][%SCAMCGILSS6][%SCAMDYCOMSRF01][%SCAMDYCOMSRF02][%SCAMGATE3][%SCAMMPACE][%SCAMRICO][%SCAMSPARTICUS][%SCAMTOGA2][%SCAMTWP06][%SCAMCAMFRC]" >CAM cam4 physics:</desc>
<desc atm="CAM70[%LT][%MT][%CT1S][%CT4S]" >CAM cam7 physics:</desc>
<desc atm="CAM60[%1PCT][%4xCO2][%CT1S][%CT2S][%CFIRE][%CVBSX][%NUDG][%PORT][%RCO2][%SCAM][%SDYN][%WCCM][%WCMD][%WCSC][%WCTS][%WXIE][%WXIED][%HEMCO][%GEOSCHEM][%SCAMARM95][%SCAMARM97][%SCAMATEX][%SCAMBOMEX][%SCAMCGILSS11][%SCAMCGILSS12][%SCAMCGILSS6][%SCAMDYCOMSRF01][%SCAMDYCOMSRF02][%SCAMGATE3][%SCAMMPACE][%SCAMRICO][%SCAMSPARTICUS][%SCAMTOGA2][%SCAMTWP06][%SCAMCAMFRC]" >CAM cam6 physics:</desc>
<desc atm="CAM50[%CT1S][%CLB][%PORT][%RCO2][%MAM7][%SCAM][%SDYN][%WCSC][%WCTS][%SCAMARM95][%SCAMARM97][%SCAMATEX][%SCAMBOMEX][%SCAMCGILSS11][%SCAMCGILSS12][%SCAMCGILSS6][%SCAMDYCOMSRF01][%SCAMDYCOMSRF02][%SCAMGATE3][%SCAMMPACE][%SCAMRICO][%SCAMSPARTICUS][%SCAMTOGA2][%SCAMTWP06][%SCAMCAMFRC]" >CAM cam5 physics:</desc>
<desc atm="CAM40[%PORT][%RCO2][%SCAM][%SDYN][%TMOZ][%WX][%WXIE][%WXIED][%WCCM][%WCMD][%SCAMARM95][%SCAMARM97][%SCAMATEX][%SCAMBOMEX][%SCAMCGILSS11][%SCAMCGILSS12][%SCAMCGILSS6][%SCAMDYCOMSRF01][%SCAMDYCOMSRF02][%SCAMGATE3][%SCAMMPACE][%SCAMRICO][%SCAMSPARTICUS][%SCAMTOGA2][%SCAMTWP06][%SCAMCAMFRC]" >CAM cam4 physics:</desc>
<desc atm="CAM[%ADIAB][%DABIP04][%TJ16][%GRAYRAD][%HS94][%KESSLER][%RCO2][%SPCAMS][%SPCAMCLBS][%SPCAMM][%SPCAMCLBM]" >CAM simplified and non-versioned physics :</desc>

<!--
Expand All @@ -35,9 +35,9 @@
CAM Options
===============
-->
<desc option="CCTS1" >CAM-Chem troposphere/stratosphere chemistry with simplified VBS-SOA:</desc>
<desc option="CCTS2" >CAM-Chem troposphere/stratosphere chemistry with simplified VBS-SOA and expanded isoprene and terpene oxidation:</desc>
<desc option="CCTS4" >CAM-Chem troposphere/stratosphere simplified chemistry for climate simulations:</desc>
<desc option="CT1S" >CAM-Chem troposphere/stratosphere chemistry with simplified VBS-SOA:</desc>
<desc option="CT2S" >CAM-Chem troposphere/stratosphere chemistry with simplified VBS-SOA and expanded isoprene and terpene oxidation:</desc>
<desc option="CT4S" >CAM-Chem troposphere/stratosphere simplified chemistry for climate simulations:</desc>
<desc option="GEOSCHEM" >GEOS-Chem troposphere/stratosphere chemistry :</desc>
<desc option="CFIRE" >CAM-Chem troposphere/stratosphere chem with simplified volatility basis set SOA scheme and fire emissons :</desc>
<desc option="CLB" >CAM CLUBB - turned on by default in CAM60:</desc>
Expand Down Expand Up @@ -135,13 +135,13 @@
<value compset="_CAM70">-phys cam7</value>

<!-- Modifiers for CAM runs (%.* includes SCAM runs) -->
<value compset="_CAM.*(%CCTS1|%CFIRE)">-chem trop_strat_mam5_vbs</value>
<value compset="_CAM.*(%CT1S|%CFIRE)">-chem trop_strat_mam5_vbs</value>
<value compset="_CAM60.*%(GEOSCHEM)">-chem geoschem_mam4</value>

<value compset="%MAM7">-chem trop_mam7</value>
<value compset="CAM60%CVBSX">-chem trop_strat_mam5_vbsext</value>
<value compset="CAM60%CCTS2">-chem trop_strat_mam5_ts2</value>
<value compset="CAM.*%CCTS4">-chem trop_strat_mam5_ts4</value>
<value compset="CAM60%CT2S">-chem trop_strat_mam5_ts2</value>
<value compset="CAM.*%CT4S">-chem trop_strat_mam5_ts4</value>
<value compset="_CAM50%CLB">-clubb_sgs</value>
<value compset="CAM%SPCAMS">-rad camrt -chem none -spcam_nx 32 -spcam_ny 1 -spcam_dx 4000 -spcam_dt 20 -phys spcam_sam1mom </value>
<value compset="CAM%SPCAMCLBS">-rad camrt -chem none -spcam_nx 32 -spcam_ny 1 -spcam_dx 4000 -spcam_dt 20 -phys spcam_sam1mom -spcam_clubb_sgs </value>
Expand All @@ -153,7 +153,7 @@

<!-- Match against "%WC" to set defaults for all WACCM cases. -->
<!-- Later settings of "-chem" take precedence over earlier ones. -->
<value compset="_(CAM50|CAM60)%(WC|CC|CV|CF)">-age_of_air_trcs</value>
<value compset="_(CAM50|CAM60)%(WC|CT|CV|CF)">-age_of_air_trcs</value>
<value compset="_CAM40%WCCM">-chem waccm_ma</value>
<value compset="_(CAM50|CAM60)%WCCM">-chem waccm_ma_mam5</value>
<value compset="_(CAM50|CAM60)%WCMD">-chem waccm_mad_mam5</value>
Expand All @@ -169,7 +169,7 @@

<value compset="_CAM.*%SDYN">-offline_dyn</value>
<value compset="_CAM\d0%SDYN_CLM">-nlev 56</value>
<value compset="_CAM\d0%CC.*%SDYN">-nlev 56</value>
<value compset="_CAM\d0%CT.*%SDYN">-nlev 56</value>
<value compset="_CAM\d0%WC.*%SDYN">-nlev 88</value>
<value compset="_CAM\d0%WX.*%SDYN">-nlev 145</value>
<value compset="_CAM70%LT">-nlev 58 -model_top lt</value>
Expand Down Expand Up @@ -244,8 +244,8 @@
<value compset="2000_CAM60%WCTS" >waccm_tsmlt_2000_cam6</value>
<value compset="2000_CAM60%WCCM" >waccm_ma_2000_cam6</value>
<value compset="2000_CAM60%WCSC" >waccm_sc_2000_cam6</value>
<value compset="2000_CAM60%.*CCTS1" >2000_trop_strat_vbs_cam6</value>
<value compset="2000_CAM60%GEOSCHEM" >2000_geoschem</value>
<value compset="2000_CAM60%.*CT1S" >2000_trop_strat_vbs_cam6</value>
<value compset="2000_CAM60%GEOSCHEM">2000_geoschem</value>
<value compset="2000_CAM60%WXIE" >waccmx_ma_2000_cam6</value>

<value compset="2000_CAM40_SLND_SICE_DOCN%SOMAQP">aquaplanet_cam4</value>
Expand All @@ -258,7 +258,7 @@
<value compset="2000_CAM\d0%WC.*_SLND_SICE_DOCN%AQP">aquaplanet_waccm_2000</value>

<value compset="2010_CAM60" >2010_cam6</value>
<value compset="2010_CAM60%.*CCTS1" >2010_trop_strat_vbs_cam6</value>
<value compset="2010_CAM60%.*CT1S" >2010_trop_strat_vbs_cam6</value>
<value compset="2010_CAM60%WCTS" >waccm_tsmlt_2010_cam6</value>
<value compset="2010_CAM60%WCSC" >waccm_sc_2010_cam6</value>
<value compset="2010_CAM60%GEOSCHEM">2010_geoschem</value>
Expand All @@ -278,9 +278,9 @@
<value compset="HIST_CAM60%WCCM" >waccm_ma_hist_cam6</value>
<value compset="HIST_CAM60%WCMD" >waccm_ma_hist_cam6</value>
<value compset="HIST_CAM40%WCMD" >waccm_ma_hist_cam4</value>
<value compset="HIST_CAM.*CCTS1" >hist_trop_strat_vbs_cam6</value>
<value compset="HIST_CAM.*CCTS4" >hist_trop_strat_ts4_cam7</value>
<value compset="HIST_CAM60%.*CCTS[12]%NUDG">hist_trop_strat_nudged_cam6</value>
<value compset="HIST(C_|E_|_)CAM.*CT1S">hist_trop_strat_vbs_cam6</value>
<value compset="HISTC_CAM7.*CT4S" >hist_trop_strat_ts4_cam7</value>
<value compset="HIST_CAM60%.*CT[12]S%NUDG">hist_trop_strat_nudged_cam6</value>
<value compset="HIST_CAM60%CVBSX" >hist_trop_strat_vbsext_cam6</value>
<value compset="HIST_CAM60%CFIRE" >hist_trop_strat_vbsfire_cam6</value>
<value compset="HIST_CAM60%GEOSCHEM">hist_geoschem</value>
Expand Down Expand Up @@ -309,8 +309,8 @@
<value compset="_CAM60%WCCM%SDYN" >sd_waccm_ma_cam6</value>
<value compset="_CAM60%WCMD%SDYN" >sd_waccm_ma_cam6</value>
<value compset="_CAM40%WCMD%SDYN" >sd_waccm_ma_cam4</value>
<value compset="_CAM60%.*CCTS1%SDYN" >sd_trop_strat_vbs_cam6</value>
<value compset="_CAM60%.*CCTS2%SDYN" >sd_trop_strat2_cam6</value>
<value compset="_CAM60%.*CT1S%SDYN" >sd_trop_strat_vbs_cam6</value>
<value compset="_CAM60%.*CT2S%SDYN" >sd_trop_strat2_cam6</value>
<value compset="_CAM60%SDYN_CLM50" >sd_cam6</value>

<value compset="2000_CAM%DABIP04" >dabi_p2004</value>
Expand Down Expand Up @@ -437,7 +437,7 @@
<value compset="^SSP126_">$DIN_LOC_ROOT/lnd/clm2/ndepdata/fndep_clm_f09_g17.CMIP6-SSP1-2.6-WACCM_1849-2101_monthly_c191007.nc</value>
<value compset="^SSP245_">$DIN_LOC_ROOT/lnd/clm2/ndepdata/fndep_clm_f09_g17.CMIP6-SSP2-4.5-WACCM_1849-2101_monthly_c191007.nc</value>
<value compset="^SSP370_">$DIN_LOC_ROOT/lnd/clm2/ndepdata/fndep_clm_SSP370_b.e21.BWSSP370cmip6.f09_g17.CMIP6-SSP3-7.0-WACCM.002_1849-2101_monthly_0.9x1.25_c211216.nc</value>
<value compset="^HIST_" >$DIN_LOC_ROOT/lnd/clm2/ndepdata/fndep_clm_hist_b.e21.BWHIST.f09_g17.CMIP6-historical-WACCM.ensmean_1849-2015_monthly_0.9x1.25_c180926.nc</value>
<value compset="^HIST" >$DIN_LOC_ROOT/lnd/clm2/ndepdata/fndep_clm_hist_b.e21.BWHIST.f09_g17.CMIP6-historical-WACCM.ensmean_1849-2015_monthly_0.9x1.25_c180926.nc</value>
<value compset="^2000_" >$DIN_LOC_ROOT/lnd/clm2/ndepdata/fndep_clm_hist_b.e21.BWHIST.f09_g17.CMIP6-historical-WACCM.ensmean_1849-2015_monthly_0.9x1.25_c180926.nc</value>
<value compset="^2010_" >$DIN_LOC_ROOT/lnd/clm2/ndepdata/fndep_clm_hist_b.e21.BWHIST.f09_g17.CMIP6-historical-WACCM.ensmean_1849-2015_monthly_0.9x1.25_c180926.nc</value>
<value compset="^1850_" >$DIN_LOC_ROOT/lnd/clm2/ndepdata/fndep_clm_WACCM6_CMIP6piControl001_y21-50avg_1850monthly_0.95x1.25_c180802.nc</value>
Expand Down
Loading

0 comments on commit b8cd5a6

Please sign in to comment.