From cda4168966eb7e482413cfcf7cfe0a905d30a76e Mon Sep 17 00:00:00 2001 From: Teagan King Date: Fri, 8 Mar 2024 13:57:33 -0700 Subject: [PATCH 01/24] preliminary cdeps updatesls --- cime_config/stream_cdeps.py | 7 ++++ datm/cime_config/buildnml | 2 ++ datm/cime_config/stream_definition_datm.xml | 37 +++++++++++++++++++++ 3 files changed, 46 insertions(+) diff --git a/cime_config/stream_cdeps.py b/cime_config/stream_cdeps.py index 1f702a13..bf3e6e78 100644 --- a/cime_config/stream_cdeps.py +++ b/cime_config/stream_cdeps.py @@ -187,6 +187,12 @@ def create_stream_xml( {"name": "NEON.NEON_PRECIP.$NEONSITE"}, err_msg="No stream_entry {} found".format(stream_name), ) + elif stream_name.startswith("PLUMBER"): + self.stream_nodes = super(StreamCDEPS, self).get_child( + "stream_entry", + {"name": "PLUMBER.$PLUMBER2SITE"}, + err_msg="No stream_entry {} found".format(stream_name), + ) elif stream_name.startswith("CLM_USRDAT."): self.stream_nodes = super(StreamCDEPS, self).get_child( "stream_entry", @@ -239,6 +245,7 @@ def create_stream_xml( and ("PRISM" not in stream_name) ): rundir = case.get_value("RUNDIR") + #TODO: may need to add a similar PLUMBER line for neon in available_neon_data: stream_datafiles += ( os.path.join(rundir, "inputdata", "atm", neon) diff --git a/datm/cime_config/buildnml b/datm/cime_config/buildnml index afee5034..1fd77c64 100755 --- a/datm/cime_config/buildnml +++ b/datm/cime_config/buildnml @@ -194,6 +194,8 @@ def _create_namelists(case, confdir, inst_string, infile, nmlgen, data_list_path streamlist.append(clm_usrdat_name+"_PRECIP."+neonsite) if clm_usrdat_name == 'NEON': streamlist.append(clm_usrdat_name+".NEON_PRECIP."+neonsite) + if clm_usrdat_name == 'PLUMBER': + streamlist.append(clm_usrdat_name+plumber2site) bias_correct = nmlgen.get_value("bias_correct") if bias_correct is not None: diff --git a/datm/cime_config/stream_definition_datm.xml b/datm/cime_config/stream_definition_datm.xml index 310c5097..4936eb0a 100644 --- a/datm/cime_config/stream_definition_datm.xml +++ b/datm/cime_config/stream_definition_datm.xml @@ -341,6 +341,43 @@ single + + + + + + + + none + + + $DIN_LOC_ROOT/atm/cdeps/PLUMBER2/${NEONSITE}_%y.nc + + + PRECIP Faxa_precn # this will probably need updating + + null + + none + + null + $DATM_YR_ALIGN + $DATM_YR_START + $DATM_YR_END + 0 + + linear + + + cycle + limit + + + 1.5 + + single + + From b7840047af885357ab219d2ac1f6fe7d0cf574e7 Mon Sep 17 00:00:00 2001 From: Teagan King Date: Fri, 8 Mar 2024 13:58:23 -0700 Subject: [PATCH 02/24] namelist def datm update --- datm/cime_config/namelist_definition_datm.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/datm/cime_config/namelist_definition_datm.xml b/datm/cime_config/namelist_definition_datm.xml index 491b6f6d..4fa62593 100644 --- a/datm/cime_config/namelist_definition_datm.xml +++ b/datm/cime_config/namelist_definition_datm.xml @@ -40,6 +40,9 @@ NEON.$NEONSITE + + PLUMBER.$PLUMBER2SITE + CLM_USRDAT.$CLM_USRDAT_NAME From 47a0d2ba27c529f8d0a011afe25ff1225b3438d8 Mon Sep 17 00:00:00 2001 From: Teagan King Date: Wed, 8 May 2024 10:44:33 -0600 Subject: [PATCH 03/24] updates to PLUMBER stream --- cime_config/stream_cdeps.py | 9 ++++++++- datm/cime_config/stream_definition_datm.xml | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/cime_config/stream_cdeps.py b/cime_config/stream_cdeps.py index bf3e6e78..7c6118f7 100644 --- a/cime_config/stream_cdeps.py +++ b/cime_config/stream_cdeps.py @@ -76,6 +76,7 @@ def create_stream_xml( data_list_file, user_mods_file, available_neon_data=None, + available_plumber_data=None ): """ Create the stream xml file and append the required stream input data to the input data list file @@ -245,12 +246,18 @@ def create_stream_xml( and ("PRISM" not in stream_name) ): rundir = case.get_value("RUNDIR") - #TODO: may need to add a similar PLUMBER line for neon in available_neon_data: stream_datafiles += ( os.path.join(rundir, "inputdata", "atm", neon) + "\n" ) + elif available_plumber_data and stream_name.startswith("PLUMBER"): + rundir = case.get_value("RUNDIR") + for plumber in available_plumber_data: + stream_datafiles += ( + os.path.join(rundir, "inputdata", "atm", plumber) + + "\n" + ) else: stream_datafiles = child.xml_element.text stream_datafiles = self._resolve_values( diff --git a/datm/cime_config/stream_definition_datm.xml b/datm/cime_config/stream_definition_datm.xml index 4936eb0a..ffb7ec71 100644 --- a/datm/cime_config/stream_definition_datm.xml +++ b/datm/cime_config/stream_definition_datm.xml @@ -351,7 +351,7 @@ none - $DIN_LOC_ROOT/atm/cdeps/PLUMBER2/${NEONSITE}_%y.nc + $DIN_LOC_ROOT/atm/cdeps/PLUMBER2/${PLUMBER2SITE}_%y.nc PRECIP Faxa_precn # this will probably need updating From c2ac6765b8ad56a81c778f16affc0828759a636a Mon Sep 17 00:00:00 2001 From: Teagan King Date: Thu, 9 May 2024 13:34:30 -0600 Subject: [PATCH 04/24] include correct variables in stream --- datm/cime_config/stream_definition_datm.xml | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/datm/cime_config/stream_definition_datm.xml b/datm/cime_config/stream_definition_datm.xml index ffb7ec71..764ea762 100644 --- a/datm/cime_config/stream_definition_datm.xml +++ b/datm/cime_config/stream_definition_datm.xml @@ -350,11 +350,18 @@ none - + #TODO: also include data files form here? https://github.com/ESCOMP/CTSM/pull/2155/files#diff-1f787dc228c6e41e2e3e2a82101d6ea4980ee2535ecbcb06e5d6e5d6bda8f167 $DIN_LOC_ROOT/atm/cdeps/PLUMBER2/${PLUMBER2SITE}_%y.nc - PRECIP Faxa_precn # this will probably need updating + ZBOT Sa_z + TBOT Sa_tbot + QBOT Sa_shum + WIND Sa_wind + PRECTmms Faxa_precn + FSDS Faxa_swdn + PSRF Sa_pbot + FLDS Faxa_lwdn null @@ -363,7 +370,7 @@ null $DATM_YR_ALIGN $DATM_YR_START - $DATM_YR_END + $DATM_YR_END # TODO: not sure if we need month info, etc here? 0 linear From 13f4594c00088645c49b79fe9cba43494868b6f3 Mon Sep 17 00:00:00 2001 From: Teagan King Date: Thu, 9 May 2024 14:58:41 -0600 Subject: [PATCH 05/24] temporary plumber change for dtlimit --- datm/cime_config/stream_definition_datm.xml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/datm/cime_config/stream_definition_datm.xml b/datm/cime_config/stream_definition_datm.xml index 764ea762..e274c4c8 100644 --- a/datm/cime_config/stream_definition_datm.xml +++ b/datm/cime_config/stream_definition_datm.xml @@ -350,7 +350,7 @@ none - #TODO: also include data files form here? https://github.com/ESCOMP/CTSM/pull/2155/files#diff-1f787dc228c6e41e2e3e2a82101d6ea4980ee2535ecbcb06e5d6e5d6bda8f167 + $DIN_LOC_ROOT/atm/cdeps/PLUMBER2/${PLUMBER2SITE}_%y.nc @@ -370,7 +370,7 @@ null $DATM_YR_ALIGN $DATM_YR_START - $DATM_YR_END # TODO: not sure if we need month info, etc here? + $DATM_YR_END 0 linear @@ -4080,6 +4080,7 @@ 1.5 + CLM_USRDAT_NAME=="PLUMBER" 30 single @@ -4619,6 +4620,7 @@ 1.5 + CLM_USRDAT_NAME="PLUMBER" 30 single From d0016108eb709a4c55b099e8e5b27e9f35289c4e Mon Sep 17 00:00:00 2001 From: Teagan King <98482480+TeaganKing@users.noreply.github.com> Date: Wed, 15 May 2024 11:52:22 -0600 Subject: [PATCH 06/24] Update if statements for dtlimit in stream_definition_datm.xml --- datm/cime_config/stream_definition_datm.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/datm/cime_config/stream_definition_datm.xml b/datm/cime_config/stream_definition_datm.xml index e274c4c8..71883a10 100644 --- a/datm/cime_config/stream_definition_datm.xml +++ b/datm/cime_config/stream_definition_datm.xml @@ -4080,7 +4080,7 @@ 1.5 - CLM_USRDAT_NAME=="PLUMBER" 30 + 30 single @@ -4620,7 +4620,7 @@ 1.5 - CLM_USRDAT_NAME="PLUMBER" 30 + 30 single From 6d4ce9ead6ec92334eebf7376708f1751992b224 Mon Sep 17 00:00:00 2001 From: Teagan King <98482480+TeaganKing@users.noreply.github.com> Date: Wed, 26 Jun 2024 14:17:45 -0600 Subject: [PATCH 07/24] Update stream_definition_datm.xml: PLUMBER to PLUMBER2 --- datm/cime_config/stream_definition_datm.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/datm/cime_config/stream_definition_datm.xml b/datm/cime_config/stream_definition_datm.xml index e3058642..c9fd0004 100644 --- a/datm/cime_config/stream_definition_datm.xml +++ b/datm/cime_config/stream_definition_datm.xml @@ -4080,7 +4080,7 @@ 1.5 - 30 + 30 single @@ -4620,7 +4620,7 @@ 1.5 - 30 + 30 single From b9c2964de34dadcb35959f8820faf1c0c17fd3bd Mon Sep 17 00:00:00 2001 From: Teagan King <98482480+TeaganKing@users.noreply.github.com> Date: Tue, 30 Jul 2024 14:11:15 -0600 Subject: [PATCH 08/24] Update buildnml PLUMBER --> PLUMBER2 --- datm/cime_config/buildnml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/datm/cime_config/buildnml b/datm/cime_config/buildnml index 1fd77c64..6843b87c 100755 --- a/datm/cime_config/buildnml +++ b/datm/cime_config/buildnml @@ -194,7 +194,7 @@ def _create_namelists(case, confdir, inst_string, infile, nmlgen, data_list_path streamlist.append(clm_usrdat_name+"_PRECIP."+neonsite) if clm_usrdat_name == 'NEON': streamlist.append(clm_usrdat_name+".NEON_PRECIP."+neonsite) - if clm_usrdat_name == 'PLUMBER': + if clm_usrdat_name == 'PLUMBER2': streamlist.append(clm_usrdat_name+plumber2site) bias_correct = nmlgen.get_value("bias_correct") From e3fb72a76895566bb335172d3098fe3baabfbeb9 Mon Sep 17 00:00:00 2001 From: Teagan King <98482480+TeaganKing@users.noreply.github.com> Date: Tue, 30 Jul 2024 14:13:25 -0600 Subject: [PATCH 09/24] Update namelist_definition_datm.xml PLUMBER --> PLUMBER2 --- datm/cime_config/namelist_definition_datm.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/datm/cime_config/namelist_definition_datm.xml b/datm/cime_config/namelist_definition_datm.xml index 4fa62593..3c2be399 100644 --- a/datm/cime_config/namelist_definition_datm.xml +++ b/datm/cime_config/namelist_definition_datm.xml @@ -41,7 +41,7 @@ NEON.$NEONSITE - PLUMBER.$PLUMBER2SITE + PLUMBER2.$PLUMBER2SITE CLM_USRDAT.$CLM_USRDAT_NAME From 7e687d3bd98db60582b7b204307c774d1eb5b44b Mon Sep 17 00:00:00 2001 From: Teagan King <98482480+TeaganKing@users.noreply.github.com> Date: Tue, 30 Jul 2024 14:14:55 -0600 Subject: [PATCH 10/24] Update stream_definition_datm.xml PLUMBER --> PLUMBER2 --- datm/cime_config/stream_definition_datm.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/datm/cime_config/stream_definition_datm.xml b/datm/cime_config/stream_definition_datm.xml index c9fd0004..7899e85c 100644 --- a/datm/cime_config/stream_definition_datm.xml +++ b/datm/cime_config/stream_definition_datm.xml @@ -343,10 +343,10 @@ - + - + none From fe1eece99d581610f114389bd4f3c40d58bbac93 Mon Sep 17 00:00:00 2001 From: Teagan King <98482480+TeaganKing@users.noreply.github.com> Date: Tue, 30 Jul 2024 14:18:22 -0600 Subject: [PATCH 11/24] Update stream_cdeps.py PLUMBER --> PLUMBER2 --- cime_config/stream_cdeps.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cime_config/stream_cdeps.py b/cime_config/stream_cdeps.py index 7c6118f7..7f342ce9 100644 --- a/cime_config/stream_cdeps.py +++ b/cime_config/stream_cdeps.py @@ -188,10 +188,10 @@ def create_stream_xml( {"name": "NEON.NEON_PRECIP.$NEONSITE"}, err_msg="No stream_entry {} found".format(stream_name), ) - elif stream_name.startswith("PLUMBER"): + elif stream_name.startswith("PLUMBER2"): self.stream_nodes = super(StreamCDEPS, self).get_child( "stream_entry", - {"name": "PLUMBER.$PLUMBER2SITE"}, + {"name": "PLUMBER2.$PLUMBER2SITE"}, err_msg="No stream_entry {} found".format(stream_name), ) elif stream_name.startswith("CLM_USRDAT."): @@ -251,7 +251,7 @@ def create_stream_xml( os.path.join(rundir, "inputdata", "atm", neon) + "\n" ) - elif available_plumber_data and stream_name.startswith("PLUMBER"): + elif available_plumber_data and stream_name.startswith("PLUMBER2"): rundir = case.get_value("RUNDIR") for plumber in available_plumber_data: stream_datafiles += ( From 1f4f5ca3e245c9c4df1aceaae5bef34f85257fbf Mon Sep 17 00:00:00 2001 From: Teagan King <98482480+TeaganKing@users.noreply.github.com> Date: Tue, 30 Jul 2024 14:35:52 -0600 Subject: [PATCH 12/24] Update stream_definition_datm.xml documentation --- datm/cime_config/stream_definition_datm.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/datm/cime_config/stream_definition_datm.xml b/datm/cime_config/stream_definition_datm.xml index 7899e85c..c3d36014 100644 --- a/datm/cime_config/stream_definition_datm.xml +++ b/datm/cime_config/stream_definition_datm.xml @@ -41,6 +41,8 @@ CORE_RYF9091_JRA = JRA55 repeat year forcing, v1.3, 1990-1991 (for forcing POP and CICE) CORE_RYF0304_JRA = JRA55 repeat year forcing, v1.3, 2003-2004 (for forcing POP and CICE) ERA5 = ERA5 intra-annual year forcing + NEON = Run with forcing from NEON tower data + PLUMBER2 = Run with forcing from PLUMBER2 tower data SIMPLE = Namelist-configurable, constant datm forcing for simple experiments CPLHIST = Streams for lnd or ocn/ice forcing used for spinup From e98991f2e3e1794a896fb2da0df26040ecb6d2f1 Mon Sep 17 00:00:00 2001 From: Teagan King <98482480+TeaganKing@users.noreply.github.com> Date: Thu, 1 Aug 2024 10:58:43 -0600 Subject: [PATCH 13/24] Update buildnml to include fix for PLUMBER2.PLUMBER2SITE (with period) --- datm/cime_config/buildnml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/datm/cime_config/buildnml b/datm/cime_config/buildnml index 6843b87c..ce4a852d 100755 --- a/datm/cime_config/buildnml +++ b/datm/cime_config/buildnml @@ -195,7 +195,7 @@ def _create_namelists(case, confdir, inst_string, infile, nmlgen, data_list_path if clm_usrdat_name == 'NEON': streamlist.append(clm_usrdat_name+".NEON_PRECIP."+neonsite) if clm_usrdat_name == 'PLUMBER2': - streamlist.append(clm_usrdat_name+plumber2site) + streamlist.append(clm_usrdat_name+"."+plumber2site) bias_correct = nmlgen.get_value("bias_correct") if bias_correct is not None: From d564ec9f355ff808bac54e18c398e9042e995f64 Mon Sep 17 00:00:00 2001 From: Teagan King <98482480+TeaganKing@users.noreply.github.com> Date: Thu, 1 Aug 2024 11:02:08 -0600 Subject: [PATCH 14/24] Update buildnml to separate plumber/neon cases --- datm/cime_config/buildnml | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/datm/cime_config/buildnml b/datm/cime_config/buildnml index ce4a852d..4d988ce1 100755 --- a/datm/cime_config/buildnml +++ b/datm/cime_config/buildnml @@ -141,11 +141,17 @@ def _create_namelists(case, confdir, inst_string, infile, nmlgen, data_list_path available_neon_data = None if 'CLM_USRDAT' in model_grid: config['model_grid'] = 'CLM_USRDAT' - neonsite = case.get_value("NEONSITE") - if neonsite: - config['neon'] = "True" - # download and use the listing.csv file to determine data availablity - available_neon_data = _get_neon_data_availability(case, neonsite) + if 'NEON' in clm_usrdat_name: + neonsite = case.get_value("NEONSITE") + if neonsite: + config['neon'] = "True" + # download and use the listing.csv file to determine data availablity + available_neon_data = _get_neon_data_availability(case, neonsite) + if 'PLUMBER' in clm_usrdat_name: + # TODO: not recognizing PLUBMER2SITE var in buildnml + plumber2site = case.get_value("PLUMBER2SITE") + if plumber2site: + config['plumber'] = "True" else: config['model_grid'] = model_grid From b5395f433c74ecd6f43770aac7d7836401a32aad Mon Sep 17 00:00:00 2001 From: Teagan King <98482480+TeaganKing@users.noreply.github.com> Date: Thu, 1 Aug 2024 15:34:21 -0600 Subject: [PATCH 15/24] Update buildnml to use caseroot to get plumber2 information because plumber2site var not recognized at time of buildnml --- datm/cime_config/buildnml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/datm/cime_config/buildnml b/datm/cime_config/buildnml index 4d988ce1..026a14ef 100755 --- a/datm/cime_config/buildnml +++ b/datm/cime_config/buildnml @@ -147,9 +147,8 @@ def _create_namelists(case, confdir, inst_string, infile, nmlgen, data_list_path config['neon'] = "True" # download and use the listing.csv file to determine data availablity available_neon_data = _get_neon_data_availability(case, neonsite) - if 'PLUMBER' in clm_usrdat_name: - # TODO: not recognizing PLUBMER2SITE var in buildnml - plumber2site = case.get_value("PLUMBER2SITE") + if 'PLUMBER2' in clm_usrdat_name: + plumber2site = case.get_value('CASEROOT').split('/')[-1] if plumber2site: config['plumber'] = "True" else: From c9b6e57dd4a52a47f5253d662db2550f43c2c513 Mon Sep 17 00:00:00 2001 From: Teagan King <98482480+TeaganKing@users.noreply.github.com> Date: Fri, 2 Aug 2024 13:33:59 -0600 Subject: [PATCH 16/24] Update buildnml now that PLUMBER2SITE xmlchange is working --- datm/cime_config/buildnml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/datm/cime_config/buildnml b/datm/cime_config/buildnml index 026a14ef..28e341c0 100755 --- a/datm/cime_config/buildnml +++ b/datm/cime_config/buildnml @@ -148,7 +148,7 @@ def _create_namelists(case, confdir, inst_string, infile, nmlgen, data_list_path # download and use the listing.csv file to determine data availablity available_neon_data = _get_neon_data_availability(case, neonsite) if 'PLUMBER2' in clm_usrdat_name: - plumber2site = case.get_value('CASEROOT').split('/')[-1] + plumber2site = case.get_value('PLUMBER2SITE') if plumber2site: config['plumber'] = "True" else: From 734d38a8f6ef8987d8be839bc24bfd1e380466d3 Mon Sep 17 00:00:00 2001 From: Teagan King <98482480+TeaganKing@users.noreply.github.com> Date: Fri, 2 Aug 2024 14:53:29 -0600 Subject: [PATCH 17/24] example hard coded start year in stream_definition_datm.xml --- datm/cime_config/stream_definition_datm.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/datm/cime_config/stream_definition_datm.xml b/datm/cime_config/stream_definition_datm.xml index c3d36014..0a018c89 100644 --- a/datm/cime_config/stream_definition_datm.xml +++ b/datm/cime_config/stream_definition_datm.xml @@ -353,7 +353,7 @@ none - $DIN_LOC_ROOT/atm/cdeps/PLUMBER2/${PLUMBER2SITE}_%y.nc + $DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/${PLUMBER2SITE}/CLM1PT_data/CTSM_DATM_${PLUMBER2SITE}_2010-${DATM_YR_END}.nc ZBOT Sa_z From 57256a273fab637fd29f15dd56a0c26c388800d2 Mon Sep 17 00:00:00 2001 From: Teagan King <98482480+TeaganKing@users.noreply.github.com> Date: Thu, 8 Aug 2024 11:50:08 -0600 Subject: [PATCH 18/24] Update stream_cdeps.py to avoid CLM_USRDAT.PLUMBER2 stream --- cime_config/stream_cdeps.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cime_config/stream_cdeps.py b/cime_config/stream_cdeps.py index 7f342ce9..a291250d 100644 --- a/cime_config/stream_cdeps.py +++ b/cime_config/stream_cdeps.py @@ -195,6 +195,8 @@ def create_stream_xml( err_msg="No stream_entry {} found".format(stream_name), ) elif stream_name.startswith("CLM_USRDAT."): + if 'PLUMBER2' in stream_name: + continue self.stream_nodes = super(StreamCDEPS, self).get_child( "stream_entry", {"name": "CLM_USRDAT.$CLM_USRDAT_NAME"}, From c6d01f62245915f104d875d670800513e2cf094f Mon Sep 17 00:00:00 2001 From: Teagan King Date: Thu, 8 Aug 2024 11:54:55 -0600 Subject: [PATCH 19/24] include xml var for yr_start in filename for plumber2 --- datm/cime_config/config_component.xml | 9 +++++++++ doc/source/datm.rst | 3 +++ 2 files changed, 12 insertions(+) diff --git a/datm/cime_config/config_component.xml b/datm/cime_config/config_component.xml index e0a04797..70a9e79f 100644 --- a/datm/cime_config/config_component.xml +++ b/datm/cime_config/config_component.xml @@ -296,6 +296,15 @@ starting year to loop data over + + integer + + UNSET + run_component_datm + env_run.xml + Start year listed in PLUMBER2 filenames. Leave unset for other cases. + + integer diff --git a/doc/source/datm.rst b/doc/source/datm.rst index e70c703d..d731bc68 100644 --- a/doc/source/datm.rst +++ b/doc/source/datm.rst @@ -176,6 +176,9 @@ DATM_CPLHIST_CASE DATM_YR_START - Starting year to loop data over +DATM_YR_START_FILENAME + - Start year listed in PLUMBER2 filename + DATM_YR_END - Ending year to loop data over From e35cb72c74b5f007a80bb7995d5ba4a55c9dde4a Mon Sep 17 00:00:00 2001 From: Teagan King Date: Tue, 13 Aug 2024 11:39:59 -0600 Subject: [PATCH 20/24] implement xml var DATM_YR_START_FILENAME --- datm/cime_config/stream_definition_datm.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/datm/cime_config/stream_definition_datm.xml b/datm/cime_config/stream_definition_datm.xml index 0a018c89..6ab079ed 100644 --- a/datm/cime_config/stream_definition_datm.xml +++ b/datm/cime_config/stream_definition_datm.xml @@ -353,7 +353,7 @@ none - $DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/${PLUMBER2SITE}/CLM1PT_data/CTSM_DATM_${PLUMBER2SITE}_2010-${DATM_YR_END}.nc + $DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/${PLUMBER2SITE}/CLM1PT_data/CTSM_DATM_${PLUMBER2SITE}_${DATM_YR_START_FILENAME}-${DATM_YR_END}.nc ZBOT Sa_z From 0a4386197be646391c7eb667e83f43c984ff132d Mon Sep 17 00:00:00 2001 From: Teagan King Date: Fri, 16 Aug 2024 10:36:40 -0600 Subject: [PATCH 21/24] updates for aux-cdeps tests now passing --- cime_config/stream_definition_v2.0.xsd | 3 ++- datm/cime_config/config_component.xml | 4 ++-- datm/cime_config/stream_definition_datm.xml | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/cime_config/stream_definition_v2.0.xsd b/cime_config/stream_definition_v2.0.xsd index de3189e3..d6ec7476 100644 --- a/cime_config/stream_definition_v2.0.xsd +++ b/cime_config/stream_definition_v2.0.xsd @@ -93,7 +93,8 @@ - + + diff --git a/datm/cime_config/config_component.xml b/datm/cime_config/config_component.xml index 70a9e79f..e6cfc015 100644 --- a/datm/cime_config/config_component.xml +++ b/datm/cime_config/config_component.xml @@ -299,10 +299,10 @@ integer - UNSET + 9999 run_component_datm env_run.xml - Start year listed in PLUMBER2 filenames. Leave unset for other cases. + Start year listed in PLUMBER2 filenames. Leave as 9999 for other cases. diff --git a/datm/cime_config/stream_definition_datm.xml b/datm/cime_config/stream_definition_datm.xml index 6ab079ed..bfe6fc4a 100644 --- a/datm/cime_config/stream_definition_datm.xml +++ b/datm/cime_config/stream_definition_datm.xml @@ -4082,7 +4082,7 @@ 1.5 - 30 + 30 single @@ -4622,7 +4622,7 @@ 1.5 - 30 + 30 single From 1797342543e53bbb764529dac0efc76358107d79 Mon Sep 17 00:00:00 2001 From: Teagan King <98482480+TeaganKing@users.noreply.github.com> Date: Fri, 16 Aug 2024 11:20:40 -0600 Subject: [PATCH 22/24] Update config_component.xml to address Erik's comment --- datm/cime_config/config_component.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/datm/cime_config/config_component.xml b/datm/cime_config/config_component.xml index e6cfc015..4f8c010b 100644 --- a/datm/cime_config/config_component.xml +++ b/datm/cime_config/config_component.xml @@ -299,10 +299,10 @@ integer - 9999 + -9999 run_component_datm env_run.xml - Start year listed in PLUMBER2 filenames. Leave as 9999 for other cases. + Start year listed in PLUMBER2 filenames. Only used in PLUMBER2; leave as -9999 for other cases. From ffd4077919a17a987cb830f5a50a1072b9896ae7 Mon Sep 17 00:00:00 2001 From: Teagan King <98482480+TeaganKing@users.noreply.github.com> Date: Fri, 16 Aug 2024 11:33:32 -0600 Subject: [PATCH 23/24] Update config_component.xml to use positive 9999 --- datm/cime_config/config_component.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/datm/cime_config/config_component.xml b/datm/cime_config/config_component.xml index 4f8c010b..f2698e9d 100644 --- a/datm/cime_config/config_component.xml +++ b/datm/cime_config/config_component.xml @@ -299,10 +299,10 @@ integer - -9999 + 9999 run_component_datm env_run.xml - Start year listed in PLUMBER2 filenames. Only used in PLUMBER2; leave as -9999 for other cases. + Start year listed in PLUMBER2 filenames for certain datm_modes. Currently only used in PLUMBER2; leave as the default value (9999) for other cases. From 7e363e7ca1975ba40ce33ec82c23325b6eca63aa Mon Sep 17 00:00:00 2001 From: Teagan King <98482480+TeaganKing@users.noreply.github.com> Date: Fri, 16 Aug 2024 11:51:20 -0600 Subject: [PATCH 24/24] Add comment to stream_cdeps.py --- cime_config/stream_cdeps.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cime_config/stream_cdeps.py b/cime_config/stream_cdeps.py index a291250d..b7af2f28 100644 --- a/cime_config/stream_cdeps.py +++ b/cime_config/stream_cdeps.py @@ -196,6 +196,8 @@ def create_stream_xml( ) elif stream_name.startswith("CLM_USRDAT."): if 'PLUMBER2' in stream_name: + # if PLUMBER2 is in the stream name + # we want to use PLUMBER2.PLUMBER2SITE instead of CLM_USRDAT.PLUMBER2 continue self.stream_nodes = super(StreamCDEPS, self).get_child( "stream_entry",