From 2385f03a9ebc45f58310073ff314e1d34e71b66d Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Fri, 7 Feb 2025 09:24:56 -0700 Subject: [PATCH] Make CRUJRA2024 the default datm input for clm6 --- datm/cime_config/config_component.xml | 27 ++++- datm/cime_config/namelist_definition_datm.xml | 3 + datm/cime_config/stream_definition_datm.xml | 109 ++++++++++++++++++ datm/cime_config/testdefs/testlist_datm.xml | 17 ++- doc/source/datm.rst | 8 +- 5 files changed, 156 insertions(+), 8 deletions(-) diff --git a/datm/cime_config/config_component.xml b/datm/cime_config/config_component.xml index 107929616..3e50d237e 100644 --- a/datm/cime_config/config_component.xml +++ b/datm/cime_config/config_component.xml @@ -10,9 +10,10 @@ This file may have atm desc entries. --> - Data driven ATM + Data driven ATM QIAN data set QIAN with water isotopes + CRUJRA 2024 data set CRUNCEP data set CLM CRU NCEP v7 data set GSWP3v1 data set @@ -42,13 +43,13 @@ 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_2023,ERA5,SIMPLE + CORE2_NYF,CORE2_IAF,CLM_QIAN,CLM_QIAN_WISO,1PT,CLMCRUJRA2024,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 Mode for data atmosphere component. CORE2_NYF (CORE2 normal year forcing) are modes used in forcing prognostic ocean/sea-ice components. - CLMCRUNCEPv7, CLMGSWP3v1, CLMNLDAS2 and 1PT are modes using observational data for forcing prognostic land components. + CLMCRUJRA2024, CLMCRUNCEPv7, CLMGSWP3v1, CLMNLDAS2 and 1PT are modes using observational data for forcing prognostic land components. WARNING for CLMNLDAS2: This is a regional forcing dataset over the U.S. (25-53N, 235-293E). Garbage data will be produced for runs extending beyond this regional domain. CORE2_NYF @@ -58,6 +59,7 @@ CORE_IAF_JRA_1p5_2023 CLM_QIAN CLM_QIAN_WISO + CLMCRUJRA2024 CLMCRUNCEPv7 CLMGSWP3v1 CLMNLDAS2 @@ -217,13 +219,16 @@ $DATM_YR_START 1 + 1 1 1 1895 + 1901 1901 1901 $DATM_YR_START 1895 + 1901 1901 1901 $DATM_YR_START @@ -263,24 +268,32 @@ 1992 1 1948 + 1901 1901 1901 0 2000 1972 1948 + 1901 1901 1901 0 1948 + 1901 1901 1901 0 1948 1995 + 2001 2001 2001 2002 + 1901 + 1991 + 2002 + 2005 1901 1991 2002 @@ -317,24 +330,32 @@ 1992 2 1972 + 1920 1920 1920 -1 2004 2004 1972 + 1920 1920 1920 -1 1972 + 1920 1920 1920 -1 2004 2004 + 2023 2016 2014 2003 + 1920 + 2010 + 2003 + 2014 1920 2010 2003 diff --git a/datm/cime_config/namelist_definition_datm.xml b/datm/cime_config/namelist_definition_datm.xml index 17be1c1f8..ffa69bbb1 100644 --- a/datm/cime_config/namelist_definition_datm.xml +++ b/datm/cime_config/namelist_definition_datm.xml @@ -19,6 +19,9 @@ CLM_QIAN_WISO.Solar,CLM_QIAN_WISO.Precip,CLM_QIAN_WISO.TPQW + + CLMCRUJRA2024.Solar,CLMCRUJRA2024.Precip,CLMCRUJRA2024.TPQW + CLMCRUNCEPv7.Solar,CLMCRUNCEPv7.Precip,CLMCRUNCEPv7.TPQW diff --git a/datm/cime_config/stream_definition_datm.xml b/datm/cime_config/stream_definition_datm.xml index 07be39a6d..cace07623 100644 --- a/datm/cime_config/stream_definition_datm.xml +++ b/datm/cime_config/stream_definition_datm.xml @@ -29,6 +29,7 @@ Currently the following data modes are supported: CLM_QIAN = Run with the CLM Qian dataset valid from 1948 to 2004 (force CLM) CLM_QIAN_WISO = Run with the CLM Qian dataset with isotopes valid from 2000 to 2004 (force CLM) + CLMCRUJRA2024 = Run with the CLM CRUJRA 2024 forcing valid from 1901 to 2023 (force CLM) CLMCRUNCEPv7 = Run with the CLM CRU NCEP V7 forcing valid from 1900 to 2010 (force CLM) 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) @@ -68,6 +69,13 @@ CLMGSWP3v1.Precip CLMGSWP3v1.TPQW + ======================== + datm_mode CLMCRUJRA2024: (DATM%CRUJRA2024 in env_run.xml) + ======================== + CLMCRUJRA2024.Solar + CLMCRUJRA2024.Precip + CLMCRUJRA2024.TPQW + ======================== datm_mode CLMCRUNCEPv7: (DATM%CRUv7 in env_run.xml) ======================== @@ -489,6 +497,107 @@ single + + + + + + + $DIN_LOC_ROOT/atm/datm7/atm_forcing.datm7.CRUJRA.0.5d.c2024/TRENDY2024/inputs/three_stream/mesh_cdf5.nc + + + $DIN_LOC_ROOT_CLMFORC/atm_forcing.datm7.CRUJRA.0.5d.c2024/TRENDY2024/inputs/three_stream/clmforc.CRUJRAv2.5_0.5x0.5.Solr.%y.nc + + + FSDS Faxa_swdn + + null + + bilinear + + null + $DATM_YR_ALIGN + $DATM_YR_START + $DATM_YR_END + 0 + + coszen + + + cycle + + + 1.5 + + single + + + + + $DIN_LOC_ROOT/atm/datm7/atm_forcing.datm7.CRUJRA.0.5d.c2024/TRENDY2024/inputs/three_stream/mesh_cdf5.nc + + + $DIN_LOC_ROOT_CLMFORC/atm_forcing.datm7.CRUJRA.0.5d.c2024/TRENDY2024/inputs/three_stream/clmforc.CRUJRAv2.5_0.5x0.5.Prec.%y.nc + + + PRECTmms Faxa_precn + + null + + bilinear + + null + $DATM_YR_ALIGN + $DATM_YR_START + $DATM_YR_END + 0 + + nearest + + + cycle + + + 1.5 + + single + + + + + $DIN_LOC_ROOT/atm/datm7/atm_forcing.datm7.CRUJRA.0.5d.c2024/TRENDY2024/inputs/three_stream/mesh_cdf5.nc + + + $DIN_LOC_ROOT_CLMFORC/atm_forcing.datm7.CRUJRA.0.5d.c2024/TRENDY2024/inputs/three_stream/clmforc.CRUJRAv2.5_0.5x0.5.TPQWL.%y.nc + + + TBOT Sa_tbot + WIND Sa_wind + QBOT Sa_shum + PSRF Sa_pbot + FLDS Faxa_lwdn + + null + + bilinear + + null + $DATM_YR_ALIGN + $DATM_YR_START + $DATM_YR_END + 0 + + linear + + + cycle + + + 1.5 + + single + + diff --git a/datm/cime_config/testdefs/testlist_datm.xml b/datm/cime_config/testdefs/testlist_datm.xml index 34bbe3fcf..6425e08eb 100644 --- a/datm/cime_config/testdefs/testlist_datm.xml +++ b/datm/cime_config/testdefs/testlist_datm.xml @@ -25,7 +25,7 @@ - + @@ -34,7 +34,7 @@ - + @@ -43,7 +43,7 @@ - + @@ -52,7 +52,16 @@ - + + + + + + + + + + diff --git a/doc/source/datm.rst b/doc/source/datm.rst index d731bc689..cb31a98e8 100644 --- a/doc/source/datm.rst +++ b/doc/source/datm.rst @@ -11,7 +11,7 @@ referred to as its mode. In the case of CESM, the active model components would be: CTSM, POP2, MOM6, POP2, CICE5-6, WW3 and MOSART. As examples, CORE2_NYF (CORE2 normal year forcing) is the DATM mode used in driving -POP2 and MOM6. On the other hand CLM_QIAN, CLMCRUNCEP, CLMGSWP3 +POP2 and MOM6. On the other hand CLM_QIAN, CLMCRUJRA2024, CLMCRUNCEP, CLMGSWP3 and CLM1PT are DATM modes using observational data for forcing CTSM. .. _datm-datamodes: @@ -123,6 +123,12 @@ DATM%CLM_QIAN - streams: CLM_QIAN.Solar,CLM_QIAN.Precip,CLM_QIAN.TPQW - datamode: CLMNCEP +DATM%CLMCRUJRA2024 + - CRUJRA atm input data (CESM I compsets) + - datm_mode: CLMCRUJRA2024 + - streams: CLMCRUJRA2024.Solar,CLMCRUJRA2024.Precip,CLMCRUJRA2024.TPQW + - datamode: CLMCRUJRA2024 + DATM%CLMCRUNCEPv7 - CRUNCEP atm input data (CESM I compsets) - datm_mode: CLMNCEP