From 78f7c21ad145d3169fb6a5672d32368d24e756f8 Mon Sep 17 00:00:00 2001 From: alperaltuntas Date: Sat, 31 Aug 2024 14:50:41 -0600 Subject: [PATCH 1/4] add new JRA 1.5 streams for datm and drof --- datm/cime_config/config_component.xml | 6 +- datm/cime_config/namelist_definition_datm.xml | 3 + datm/cime_config/stream_definition_datm.xml | 267 +++++++++++++++++- drof/cime_config/config_component.xml | 6 +- drof/cime_config/namelist_definition_drof.xml | 1 + drof/cime_config/stream_definition_drof.xml | 32 +++ 6 files changed, 304 insertions(+), 11 deletions(-) diff --git a/datm/cime_config/config_component.xml b/datm/cime_config/config_component.xml index e0a04797..bf02b6c7 100644 --- a/datm/cime_config/config_component.xml +++ b/datm/cime_config/config_component.xml @@ -10,7 +10,7 @@ This file may have atm desc entries. --> - Data driven ATM + Data driven ATM QIAN data set QIAN with water isotopes CRUNCEP data set @@ -23,6 +23,7 @@ COREv2 interannual forcing interannual JRA55 forcing interannual JRA55 forcing, v1.4, through 2018 + interannual JRA55 forcing, v1.5, through 2018 JRA55 Repeat Year Forcing v1.3 1984-1985 JRA55 Repeat Year Forcing v1.3 1990-1991 JRA55 Repeat Year Forcing v1.3 2003-2004 @@ -41,7 +42,7 @@ char - CORE2_NYF,CORE2_IAF,CLM_QIAN,CLM_QIAN_WISO,1PT,CLMCRUNCEP,CLMCRUNCEPv7,CLMGSWP3v1,CLMNLDAS2,CPLHIST,CORE_IAF_JRA,CORE_IAF_JRA_1p4_2018,ERA5,SIMPLE + CORE2_NYF,CORE2_IAF,CLM_QIAN,CLM_QIAN_WISO,1PT,CLMCRUNCEP,CLMCRUNCEPv7,CLMGSWP3v1,CLMNLDAS2,CPLHIST,CORE_IAF_JRA,CORE_IAF_JRA_1p4_2018,CORE_IAF_JRA_1p5_2018,CORE_IAF_JRA_1p5_2018,ERA5,SIMPLE CORE2_NYF run_component_datm env_run.xml @@ -54,6 +55,7 @@ CORE2_IAF CORE_IAF_JRA CORE_IAF_JRA_1p4_2018 + CORE_IAF_JRA_1p5_2018 CLM_QIAN CLM_QIAN_WISO CLMCRUNCEPv7 diff --git a/datm/cime_config/namelist_definition_datm.xml b/datm/cime_config/namelist_definition_datm.xml index 491b6f6d..70ed9b0a 100644 --- a/datm/cime_config/namelist_definition_datm.xml +++ b/datm/cime_config/namelist_definition_datm.xml @@ -52,6 +52,9 @@ CORE_IAF_JRA_1p4_2018.GCGCS.PREC,CORE_IAF_JRA_1p4_2018.GISS.LWDN,CORE_IAF_JRA_1p4_2018.GISS.SWDN,CORE_IAF_JRA_1p4_2018.NCEP.Q_10,CORE_IAF_JRA_1p4_2018.NCEP.SLP_,CORE_IAF_JRA_1p4_2018.NCEP.T_10,CORE_IAF_JRA_1p4_2018.NCEP.U_10,CORE_IAF_JRA_1p4_2018.NCEP.V_10 + + CORE_IAF_JRA_1p5_2018.GCGCS.PREC,CORE_IAF_JRA_1p5_2018.GISS.LWDN,CORE_IAF_JRA_1p5_2018.GISS.SWDN,CORE_IAF_JRA_1p5_2018.NCEP.Q_10,CORE_IAF_JRA_1p5_2018.NCEP.SLP_,CORE_IAF_JRA_1p5_2018.NCEP.T_10,CORE_IAF_JRA_1p5_2018.NCEP.U_10,CORE_IAF_JRA_1p5_2018.NCEP.V_10 + CORE_RYF8485_JRA.GISS.LWDN,CORE_RYF8485_JRA.GISS.SWDN,CORE_RYF8485_JRA.GCGCS,CORE_RYF8485_JRA.NCEP diff --git a/datm/cime_config/stream_definition_datm.xml b/datm/cime_config/stream_definition_datm.xml index 7f38beda..01bc8741 100644 --- a/datm/cime_config/stream_definition_datm.xml +++ b/datm/cime_config/stream_definition_datm.xml @@ -33,13 +33,14 @@ CLMGSWP3v1 = Run with the CLM GSWP3 V1 forcing (force CLM) CLMNLDAS2 = Run with the CLM NLDAS2 regional forcing valid from 1980 to 2018 (force CLM) 1PT = Run with supplied single point data (force CLM) - CORE2_NYF = CORE2 normal year forcing (for forcing POP and CICE) - CORE2_IAF = CORE2 intra-annual year forcing (for forcing POP and CICE) - CORE_IAF_JRA = JRA55 intra-annual year forcing (for forcing POP and CICE) - CORE_IAF_JRA_1p4_2018 = JRA55 intra-annual year forcing, v1.4, through 2018 (for forcing POP and CICE) - CORE_RYF8485_JRA = JRA55 repeat year forcing, v1.3, 1984-1985 (for forcing POP and CICE) - 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) + CORE2_NYF = CORE2 normal year forcing (for forcing MOM6 and CICE) + CORE2_IAF = CORE2 intra-annual year forcing (for forcing MOM6 and CICE) + CORE_IAF_JRA = JRA55 intra-annual year forcing (for forcing MOM6 and CICE) + CORE_IAF_JRA_1p4_2018 = JRA55 intra-annual year forcing, v1.4, through 2018 (for forcing MOM6 and CICE) + CORE_IAF_JRA_1p5_2018 = JRA55 intra-annual year forcing, v1.5, through 2018 (for forcing MOM6 and CICE + CORE_RYF8485_JRA = JRA55 repeat year forcing, v1.3, 1984-1985 (for forcing MOM6 and CICE) + CORE_RYF9091_JRA = JRA55 repeat year forcing, v1.3, 1990-1991 (for forcing MOM6 and CICE) + CORE_RYF0304_JRA = JRA55 repeat year forcing, v1.3, 2003-2004 (for forcing MOM6 and CICE) ERA5 = ERA5 intra-annual year forcing SIMPLE = Namelist-configurable, constant datm forcing for simple experiments CPLHIST = Streams for lnd or ocn/ice forcing used for spinup @@ -2416,6 +2417,258 @@ single + + + + + + + $DIN_LOC_ROOT/share/meshes/TL319_151007_ESMFmesh.nc + + + $DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.prec.TL319.%y.210504.nc + + + prec Faxa_prec + + null + + bilinear + + null + 1 + 1958 + 2018 + 0 + + linear + + + cycle + + + 1.5 + + single + + + + + $DIN_LOC_ROOT/share/meshes/TL319_151007_ESMFmesh.nc + + + $DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.lwdn.TL319.%y.210504.nc + + + lwdn Faxa_lwdn + + null + + bilinear + + null + 1 + 1958 + 2018 + 0 + + linear + + + cycle + + + 1.5 + + single + + + + + $DIN_LOC_ROOT/share/meshes/TL319_151007_ESMFmesh.nc + + + $DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.swdn.TL319.%y.210504.nc + + + swdn Faxa_swdn + + null + + bilinear + + null + 1 + 1958 + 2018 + -5400 + + coszen + + + cycle + + + 1.5 + + single + + + + + $DIN_LOC_ROOT/share/meshes/TL319_151007_ESMFmesh.nc + + + $DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.q_10.TL319.%y.210504.nc + + + q_10 Sa_shum + + null + + bilinear + + null + 1 + 1958 + 2018 + 0 + + linear + + + cycle + + + 1.5 + + single + + + + + $DIN_LOC_ROOT/share/meshes/TL319_151007_ESMFmesh.nc + + + $DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.slp.TL319.%y.210504.nc + + + slp Sa_pslv + + null + + bilinear + + null + 1 + 1958 + 2018 + 0 + + linear + + + cycle + + + 1.5 + + single + + + + + $DIN_LOC_ROOT/share/meshes/TL319_151007_ESMFmesh.nc + + + $DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.t_10.TL319.%y.210504.nc + + + t_10 Sa_tbot + + null + + bilinear + + null + 1 + 1958 + 2018 + 0 + + linear + + + cycle + + + 1.5 + + single + + + + + $DIN_LOC_ROOT/share/meshes/TL319_151007_ESMFmesh.nc + + + $DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.u_10.TL319.%y.210504.nc + + + u_10 Sa_u + + null + + bilinear + + null + 1 + 1958 + 2018 + 0 + + linear + + + cycle + + + 1.5 + + single + + + + + $DIN_LOC_ROOT/share/meshes/TL319_151007_ESMFmesh.nc + + + $DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.v_10.TL319.%y.210504.nc + + + v_10 Sa_v + + null + + bilinear + + null + 1 + 1958 + 2018 + 0 + + linear + + + cycle + + + 1.5 + + single + + diff --git a/drof/cime_config/config_component.xml b/drof/cime_config/config_component.xml index c87e1f1c..c37e71e7 100644 --- a/drof/cime_config/config_component.xml +++ b/drof/cime_config/config_component.xml @@ -13,7 +13,7 @@ --> - Data runoff model + Data runoff model NULL mode COREv2 normal year forcing: COREv2 interannual year forcing: @@ -25,6 +25,7 @@ JRA55 interannual forcing, v1.4, through 2018, no rofi around AIS JRA55 interannual forcing, v1.4, through 2018, no rofl around AIS JRA55 interannual forcing, v1.4, through 2018, no rofi or rofl around AIS + JRA55 interannual forcing, v1.5, through 2018 JRA55 interannual forcing JRA55 Repeat Year Forcing v1.3 1984-1985 JRA55 Repeat Year Forcing v1.3 1990-1991 @@ -42,7 +43,7 @@ char - CPLHIST,DIATREN_ANN_RX1,DIATREN_IAF_RX1,DIATREN_IAF_AIS00_RX1,DIATREN_IAF_AIS45_RX1,DIATREN_IAF_AIS55_RX1,IAF_JRA,IAF_JRA_1p4_2018,IAF_JRA_1p4_2018_AIS0ICE,IAF_JRA_1p4_2018_AIS0LIQ,IAF_JRA_1p4_2018_AIS0ROF,RYF8485_JRA,RYF9091_JRA,RYF0304_JRA,NULL + CPLHIST,DIATREN_ANN_RX1,DIATREN_IAF_RX1,DIATREN_IAF_AIS00_RX1,DIATREN_IAF_AIS45_RX1,DIATREN_IAF_AIS55_RX1,IAF_JRA,IAF_JRA_1p4_2018,IAF_JRA_1p4_2018_AIS0ICE,IAF_JRA_1p4_2018_AIS0LIQ,IAF_JRA_1p4_2018_AIS0ROF,IAF_JRA_1p5_2018,RYF8485_JRA,RYF9091_JRA,RYF0304_JRA,NULL DIATREN_ANN_RX1 NULL @@ -60,6 +61,7 @@ IAF_JRA_1p4_2018_AIS0ICE IAF_JRA_1p4_2018_AIS0LIQ IAF_JRA_1p4_2018_AIS0ROF + IAF_JRA_1p5_2018 RYF8485_JRA RYF9091_JRA RYF0304_JRA diff --git a/drof/cime_config/namelist_definition_drof.xml b/drof/cime_config/namelist_definition_drof.xml index 88a3493b..71021636 100644 --- a/drof/cime_config/namelist_definition_drof.xml +++ b/drof/cime_config/namelist_definition_drof.xml @@ -21,6 +21,7 @@ rof.diatren_iaf_ais55_rx1 rof.iaf_jra rof.iaf_jra_1p4_2018 + rof.iaf_jra_1p5_2018 rof.ryf8485_jra rof.ryf9091_jra rof.ryf0304_jra diff --git a/drof/cime_config/stream_definition_drof.xml b/drof/cime_config/stream_definition_drof.xml index d14e5cbb..9f8b20ff 100644 --- a/drof/cime_config/stream_definition_drof.xml +++ b/drof/cime_config/stream_definition_drof.xml @@ -475,6 +475,38 @@ single + + + $DIN_LOC_ROOT/lnd/dlnd7/JRA55/JRA.v1.4.runoff.1958_ESMFmesh_cdf5_20201020.nc + + + $DIN_LOC_ROOT/lnd/dlnd7/JRA55/JRA.v1.5.runoff.%y.240411.nc + + + rofl Forr_rofl + rofi Forr_rofi + + null + + bilinear + + null + 1 + 1958 + 2018 + 0 + + upper + + + cycle + + + 3.0 + + single + + $DIN_LOC_ROOT/lnd/dlnd7/JRA55/JRA.v1.4.runoff.1958_ESMFmesh_cdf5_20201020.nc From 0c377449ea919e38f683cfb48ec1a6f8d1daab20 Mon Sep 17 00:00:00 2001 From: alperaltuntas Date: Fri, 25 Oct 2024 13:44:17 -0600 Subject: [PATCH 2/4] fix input_data_list generation for when multiple stream_datafiles entries are present for a stream_entry --- cime_config/stream_cdeps.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/cime_config/stream_cdeps.py b/cime_config/stream_cdeps.py index 1f702a13..0c8ab5b5 100644 --- a/cime_config/stream_cdeps.py +++ b/cime_config/stream_cdeps.py @@ -245,10 +245,11 @@ def create_stream_xml( + "\n" ) else: - stream_datafiles = child.xml_element.text - stream_datafiles = self._resolve_values( - case, stream_datafiles + _stream_datafiles = child.xml_element.text + _stream_datafiles = self._resolve_values( + case, _stream_datafiles ) + stream_datafiles += '\n' + _stream_datafiles # endif neon if ( "first_year" in child.xml_element.attrib From 37b1a13b2228f7c5c25d9a82570a368f59466494 Mon Sep 17 00:00:00 2001 From: alperaltuntas Date: Fri, 25 Oct 2024 14:01:07 -0600 Subject: [PATCH 3/4] extend jra v1.5 to 2023 --- datm/cime_config/config_component.xml | 8 +- datm/cime_config/namelist_definition_datm.xml | 4 +- datm/cime_config/stream_definition_datm.xml | 76 ++++++++++++------- drof/cime_config/config_component.xml | 8 +- drof/cime_config/namelist_definition_drof.xml | 4 +- drof/cime_config/stream_definition_drof.xml | 6 +- 6 files changed, 65 insertions(+), 41 deletions(-) diff --git a/datm/cime_config/config_component.xml b/datm/cime_config/config_component.xml index bf02b6c7..5eb54d9f 100644 --- a/datm/cime_config/config_component.xml +++ b/datm/cime_config/config_component.xml @@ -10,7 +10,7 @@ This file may have atm desc entries. --> - Data driven ATM + Data driven ATM QIAN data set QIAN with water isotopes CRUNCEP data set @@ -23,7 +23,7 @@ COREv2 interannual forcing interannual JRA55 forcing interannual JRA55 forcing, v1.4, through 2018 - interannual JRA55 forcing, v1.5, through 2018 + interannual JRA55 forcing, v1.5, through 2023 JRA55 Repeat Year Forcing v1.3 1984-1985 JRA55 Repeat Year Forcing v1.3 1990-1991 JRA55 Repeat Year Forcing v1.3 2003-2004 @@ -42,7 +42,7 @@ char - CORE2_NYF,CORE2_IAF,CLM_QIAN,CLM_QIAN_WISO,1PT,CLMCRUNCEP,CLMCRUNCEPv7,CLMGSWP3v1,CLMNLDAS2,CPLHIST,CORE_IAF_JRA,CORE_IAF_JRA_1p4_2018,CORE_IAF_JRA_1p5_2018,CORE_IAF_JRA_1p5_2018,ERA5,SIMPLE + CORE2_NYF,CORE2_IAF,CLM_QIAN,CLM_QIAN_WISO,1PT,CLMCRUNCEP,CLMCRUNCEPv7,CLMGSWP3v1,CLMNLDAS2,CPLHIST,CORE_IAF_JRA,CORE_IAF_JRA_1p4_2018,CORE_IAF_JRA_1p5_2023,ERA5,SIMPLE CORE2_NYF run_component_datm env_run.xml @@ -55,7 +55,7 @@ CORE2_IAF CORE_IAF_JRA CORE_IAF_JRA_1p4_2018 - CORE_IAF_JRA_1p5_2018 + CORE_IAF_JRA_1p5_2023 CLM_QIAN CLM_QIAN_WISO CLMCRUNCEPv7 diff --git a/datm/cime_config/namelist_definition_datm.xml b/datm/cime_config/namelist_definition_datm.xml index 70ed9b0a..3fc7941e 100644 --- a/datm/cime_config/namelist_definition_datm.xml +++ b/datm/cime_config/namelist_definition_datm.xml @@ -52,8 +52,8 @@ CORE_IAF_JRA_1p4_2018.GCGCS.PREC,CORE_IAF_JRA_1p4_2018.GISS.LWDN,CORE_IAF_JRA_1p4_2018.GISS.SWDN,CORE_IAF_JRA_1p4_2018.NCEP.Q_10,CORE_IAF_JRA_1p4_2018.NCEP.SLP_,CORE_IAF_JRA_1p4_2018.NCEP.T_10,CORE_IAF_JRA_1p4_2018.NCEP.U_10,CORE_IAF_JRA_1p4_2018.NCEP.V_10 - - CORE_IAF_JRA_1p5_2018.GCGCS.PREC,CORE_IAF_JRA_1p5_2018.GISS.LWDN,CORE_IAF_JRA_1p5_2018.GISS.SWDN,CORE_IAF_JRA_1p5_2018.NCEP.Q_10,CORE_IAF_JRA_1p5_2018.NCEP.SLP_,CORE_IAF_JRA_1p5_2018.NCEP.T_10,CORE_IAF_JRA_1p5_2018.NCEP.U_10,CORE_IAF_JRA_1p5_2018.NCEP.V_10 + + CORE_IAF_JRA_1p5_2023.GCGCS.PREC,CORE_IAF_JRA_1p5_2023.GISS.LWDN,CORE_IAF_JRA_1p5_2023.GISS.SWDN,CORE_IAF_JRA_1p5_2023.NCEP.Q_10,CORE_IAF_JRA_1p5_2023.NCEP.SLP_,CORE_IAF_JRA_1p5_2023.NCEP.T_10,CORE_IAF_JRA_1p5_2023.NCEP.U_10,CORE_IAF_JRA_1p5_2023.NCEP.V_10 CORE_RYF8485_JRA.GISS.LWDN,CORE_RYF8485_JRA.GISS.SWDN,CORE_RYF8485_JRA.GCGCS,CORE_RYF8485_JRA.NCEP diff --git a/datm/cime_config/stream_definition_datm.xml b/datm/cime_config/stream_definition_datm.xml index 01bc8741..ead974c2 100644 --- a/datm/cime_config/stream_definition_datm.xml +++ b/datm/cime_config/stream_definition_datm.xml @@ -37,7 +37,7 @@ CORE2_IAF = CORE2 intra-annual year forcing (for forcing MOM6 and CICE) CORE_IAF_JRA = JRA55 intra-annual year forcing (for forcing MOM6 and CICE) CORE_IAF_JRA_1p4_2018 = JRA55 intra-annual year forcing, v1.4, through 2018 (for forcing MOM6 and CICE) - CORE_IAF_JRA_1p5_2018 = JRA55 intra-annual year forcing, v1.5, through 2018 (for forcing MOM6 and CICE + CORE_IAF_JRA_1p5_2023 = JRA55 intra-annual year forcing, v1.5, through 2023 (for forcing MOM6 and CICE) CORE_RYF8485_JRA = JRA55 repeat year forcing, v1.3, 1984-1985 (for forcing MOM6 and CICE) CORE_RYF9091_JRA = JRA55 repeat year forcing, v1.3, 1990-1991 (for forcing MOM6 and CICE) CORE_RYF0304_JRA = JRA55 repeat year forcing, v1.3, 2003-2004 (for forcing MOM6 and CICE) @@ -2418,15 +2418,18 @@ - + - + $DIN_LOC_ROOT/share/meshes/TL319_151007_ESMFmesh.nc - $DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.prec.TL319.%y.210504.nc + $DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.prec.TL319.%y.210504.nc + $DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.prec.TL319.%y.220505.nc + $DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.prec.TL319.%y.230718.nc + $DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.prec.TL319.%y.240531.nc prec Faxa_prec @@ -2438,7 +2441,7 @@ null 1 1958 - 2018 + 2023 0 linear @@ -2452,12 +2455,15 @@ single - + $DIN_LOC_ROOT/share/meshes/TL319_151007_ESMFmesh.nc - $DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.lwdn.TL319.%y.210504.nc + $DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.lwdn.TL319.%y.210504.nc + $DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.lwdn.TL319.%y.220505.nc + $DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.lwdn.TL319.%y.230718.nc + $DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.lwdn.TL319.%y.240531.nc lwdn Faxa_lwdn @@ -2469,7 +2475,7 @@ null 1 1958 - 2018 + 2023 0 linear @@ -2483,12 +2489,15 @@ single - + $DIN_LOC_ROOT/share/meshes/TL319_151007_ESMFmesh.nc - $DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.swdn.TL319.%y.210504.nc + $DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.swdn.TL319.%y.210504.nc + $DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.swdn.TL319.%y.220505.nc + $DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.swdn.TL319.%y.230718.nc + $DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.swdn.TL319.%y.240531.nc swdn Faxa_swdn @@ -2500,7 +2509,7 @@ null 1 1958 - 2018 + 2023 -5400 coszen @@ -2514,12 +2523,15 @@ single - + $DIN_LOC_ROOT/share/meshes/TL319_151007_ESMFmesh.nc - $DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.q_10.TL319.%y.210504.nc + $DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.q_10.TL319.%y.210504.nc + $DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.q_10.TL319.%y.220505.nc + $DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.q_10.TL319.%y.230718.nc + $DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.q_10.TL319.%y.240531.nc q_10 Sa_shum @@ -2531,7 +2543,7 @@ null 1 1958 - 2018 + 2023 0 linear @@ -2545,12 +2557,15 @@ single - + $DIN_LOC_ROOT/share/meshes/TL319_151007_ESMFmesh.nc - $DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.slp.TL319.%y.210504.nc + $DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.slp.TL319.%y.210504.nc + $DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.slp.TL319.%y.220505.nc + $DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.slp.TL319.%y.230718.nc + $DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.slp.TL319.%y.240531.nc slp Sa_pslv @@ -2562,7 +2577,7 @@ null 1 1958 - 2018 + 2023 0 linear @@ -2576,12 +2591,15 @@ single - + $DIN_LOC_ROOT/share/meshes/TL319_151007_ESMFmesh.nc - $DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.t_10.TL319.%y.210504.nc + $DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.t_10.TL319.%y.210504.nc + $DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.t_10.TL319.%y.220505.nc + $DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.t_10.TL319.%y.230718.nc + $DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.t_10.TL319.%y.240531.nc t_10 Sa_tbot @@ -2593,7 +2611,7 @@ null 1 1958 - 2018 + 2023 0 linear @@ -2607,12 +2625,15 @@ single - + $DIN_LOC_ROOT/share/meshes/TL319_151007_ESMFmesh.nc - $DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.u_10.TL319.%y.210504.nc + $DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.u_10.TL319.%y.210504.nc + $DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.u_10.TL319.%y.220505.nc + $DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.u_10.TL319.%y.230718.nc + $DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.u_10.TL319.%y.240531.nc u_10 Sa_u @@ -2624,7 +2645,7 @@ null 1 1958 - 2018 + 2023 0 linear @@ -2638,12 +2659,15 @@ single - + $DIN_LOC_ROOT/share/meshes/TL319_151007_ESMFmesh.nc - $DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.v_10.TL319.%y.210504.nc + $DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.v_10.TL319.%y.210504.nc + $DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.v_10.TL319.%y.220505.nc + $DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.v_10.TL319.%y.230718.nc + $DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.v_10.TL319.%y.240531.nc v_10 Sa_v @@ -2655,7 +2679,7 @@ null 1 1958 - 2018 + 2023 0 linear diff --git a/drof/cime_config/config_component.xml b/drof/cime_config/config_component.xml index c37e71e7..1db777be 100644 --- a/drof/cime_config/config_component.xml +++ b/drof/cime_config/config_component.xml @@ -13,7 +13,7 @@ --> - Data runoff model + Data runoff model NULL mode COREv2 normal year forcing: COREv2 interannual year forcing: @@ -25,7 +25,7 @@ JRA55 interannual forcing, v1.4, through 2018, no rofi around AIS JRA55 interannual forcing, v1.4, through 2018, no rofl around AIS JRA55 interannual forcing, v1.4, through 2018, no rofi or rofl around AIS - JRA55 interannual forcing, v1.5, through 2018 + JRA55 interannual forcing, v1.5, through 2023 JRA55 interannual forcing JRA55 Repeat Year Forcing v1.3 1984-1985 JRA55 Repeat Year Forcing v1.3 1990-1991 @@ -43,7 +43,7 @@ char - CPLHIST,DIATREN_ANN_RX1,DIATREN_IAF_RX1,DIATREN_IAF_AIS00_RX1,DIATREN_IAF_AIS45_RX1,DIATREN_IAF_AIS55_RX1,IAF_JRA,IAF_JRA_1p4_2018,IAF_JRA_1p4_2018_AIS0ICE,IAF_JRA_1p4_2018_AIS0LIQ,IAF_JRA_1p4_2018_AIS0ROF,IAF_JRA_1p5_2018,RYF8485_JRA,RYF9091_JRA,RYF0304_JRA,NULL + CPLHIST,DIATREN_ANN_RX1,DIATREN_IAF_RX1,DIATREN_IAF_AIS00_RX1,DIATREN_IAF_AIS45_RX1,DIATREN_IAF_AIS55_RX1,IAF_JRA,IAF_JRA_1p4_2018,IAF_JRA_1p4_2018_AIS0ICE,IAF_JRA_1p4_2018_AIS0LIQ,IAF_JRA_1p4_2018_AIS0ROF,IAF_JRA_1p5_2023,RYF8485_JRA,RYF9091_JRA,RYF0304_JRA,NULL DIATREN_ANN_RX1 NULL @@ -61,7 +61,7 @@ IAF_JRA_1p4_2018_AIS0ICE IAF_JRA_1p4_2018_AIS0LIQ IAF_JRA_1p4_2018_AIS0ROF - IAF_JRA_1p5_2018 + IAF_JRA_1p5_2023 RYF8485_JRA RYF9091_JRA RYF0304_JRA diff --git a/drof/cime_config/namelist_definition_drof.xml b/drof/cime_config/namelist_definition_drof.xml index 71021636..ff3d402b 100644 --- a/drof/cime_config/namelist_definition_drof.xml +++ b/drof/cime_config/namelist_definition_drof.xml @@ -19,9 +19,9 @@ rof.diatren_iaf_ais00_rx1 rof.diatren_iaf_ais45_rx1 rof.diatren_iaf_ais55_rx1 - rof.iaf_jra rof.iaf_jra_1p4_2018 - rof.iaf_jra_1p5_2018 + rof.iaf_jra_1p5_2023 + rof.iaf_jra rof.ryf8485_jra rof.ryf9091_jra rof.ryf0304_jra diff --git a/drof/cime_config/stream_definition_drof.xml b/drof/cime_config/stream_definition_drof.xml index 9f8b20ff..1c87e690 100644 --- a/drof/cime_config/stream_definition_drof.xml +++ b/drof/cime_config/stream_definition_drof.xml @@ -475,12 +475,12 @@ single - + $DIN_LOC_ROOT/lnd/dlnd7/JRA55/JRA.v1.4.runoff.1958_ESMFmesh_cdf5_20201020.nc - $DIN_LOC_ROOT/lnd/dlnd7/JRA55/JRA.v1.5.runoff.%y.240411.nc + $DIN_LOC_ROOT/ocn/jra55/v1.5_noleap/JRA.v1.5.runoff.%y.240411.nc rofl Forr_rofl @@ -493,7 +493,7 @@ null 1 1958 - 2018 + 2023 0 upper From faa59db8f09e8f550bc53e0496097f75886ac721 Mon Sep 17 00:00:00 2001 From: alperaltuntas Date: Fri, 25 Oct 2024 17:39:47 -0600 Subject: [PATCH 4/4] fix (for real) input_data_list generation for when multiple stream_datafiles entries are present for a stream_entry --- cime_config/stream_cdeps.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/cime_config/stream_cdeps.py b/cime_config/stream_cdeps.py index 5a17da94..3d653745 100644 --- a/cime_config/stream_cdeps.py +++ b/cime_config/stream_cdeps.py @@ -242,6 +242,7 @@ def create_stream_xml( elif node_name == "stream_datafiles": # Get the resolved stream data files stream_vars[node_name] = "" + stream_datafiles_list = [] # to join stream_datafiles if multiple entries are present stream_datafiles = "" for child in self.get_children(root=node): if ( @@ -263,11 +264,10 @@ def create_stream_xml( + "\n" ) else: - _stream_datafiles = child.xml_element.text - _stream_datafiles = self._resolve_values( - case, _stream_datafiles + stream_datafiles = child.xml_element.text + stream_datafiles = self._resolve_values( + case, stream_datafiles ) - stream_datafiles += '\n' + _stream_datafiles # endif neon if ( "first_year" in child.xml_element.attrib @@ -307,6 +307,8 @@ def create_stream_xml( stream_datafiles.split("\n"), "file" ) # endif + stream_datafiles_list.append(stream_datafiles) + stream_datafiles = "\n".join(stream_datafiles_list) elif node_name in xml_scalar_names: attributes["model_grid"] = case.get_value("GRID") attributes["compset"] = case.get_value("COMPSET")