From c9f7fb2319f25e2654df8f1922d3d985f71d55e4 Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Thu, 1 Nov 2018 11:54:09 -0600 Subject: [PATCH 1/8] Add new IC files for clm*_cam6.0 tuning New IC files for when coupled to CAM, both 1850 and 2000/2010. Also add in 2010 sim_year and 2010_control. Be explicit about the tuning mode for 2000 cases and use the old 2000 period file. When use_init_interp is NOT set in the namelist, let the default be selected from the default file. This allows it to be turned on when there are files that match close enough that you can with use_init_interp=T. Update documentation on ssp-rcp option. --- bld/CLMBuildNamelist.pm | 4 +- .../namelist_defaults_clm4_5.xml | 111 ++++++++++++++++-- .../namelist_definition_clm4_5.xml | 8 +- bld/namelist_files/use_cases/2010_control.xml | 36 ++++++ bld/unit_testers/build-namelist_test.pl | 1 + cime_config/config_component.xml | 1 + cime_config/config_compsets.xml | 5 + cime_config/testdefs/testlist_clm.xml | 8 ++ 8 files changed, 161 insertions(+), 13 deletions(-) create mode 100644 bld/namelist_files/use_cases/2010_control.xml diff --git a/bld/CLMBuildNamelist.pm b/bld/CLMBuildNamelist.pm index 2a4f7d499c..2c22c787ab 100755 --- a/bld/CLMBuildNamelist.pm +++ b/bld/CLMBuildNamelist.pm @@ -75,7 +75,7 @@ REQUIRED OPTIONS "-res list" to list valid resolutions. (default: 0.9x1.25) -sim_year "year" Year to simulate for input datasets - (i.e. 1850, 2000, 1850-2000, 1850-2100) + (i.e. 1850, 2000, 2010, 1850-2000, 1850-2100) "-sim_year list" to list valid simulation years (default 2000) OPTIONS @@ -2403,7 +2403,7 @@ sub setup_logic_initial_conditions { my $done = 2; my $use_init_interp_default = $nl->get_value($useinitvar); if ( string_is_undef_or_empty( $use_init_interp_default ) ) { - $use_init_interp_default = ".false."; + $use_init_interp_default = $defaults->get_value($useinitvar, \%settings); } $settings{$useinitvar} = $use_init_interp_default; do { diff --git a/bld/namelist_files/namelist_defaults_clm4_5.xml b/bld/namelist_files/namelist_defaults_clm4_5.xml index 4301e9c4fb..385081b63a 100644 --- a/bld/namelist_files/namelist_defaults_clm4_5.xml +++ b/bld/namelist_files/namelist_defaults_clm4_5.xml @@ -25,6 +25,7 @@ attributes from the config_cache.xml file (with keys converted to upper-case). 379.0 379.0 +388.8 284.7 @@ -454,11 +455,12 @@ attributes from the config_cache.xml file (with keys converted to upper-case). 75 -1850,2000 +1850,2000,2010 .true. .true. +.true. .false. @@ -498,13 +500,47 @@ attributes from the config_cache.xml file (with keys converted to upper-case). hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_nitrif_denitrif=.true. use_vertsoilc=.true. use_crop=.true. irrigate=.false. glc_nec=10 +>hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_nitrif_denitrif=.true. use_vertsoilc=.true. use_crop=.true. irrigate=.true. glc_nec=10 - +hgrid=1.9x2.5 maxpft=79 mask=gx1v7 use_cn=.true. use_nitrif_denitrif=.true. use_vertsoilc=.true. use_crop=.true. irrigate=.true. glc_nec=10 +hgrid=1.9x2.5 maxpft=79 mask=gx1v7 use_cn=.true. use_nitrif_denitrif=.true. use_vertsoilc=.true. use_crop=.true. irrigate=.true. glc_nec=10 + + +hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_nitrif_denitrif=.true. use_vertsoilc=.true. use_crop=.true. irrigate=.true. glc_nec=10 + + +hgrid=1.9x2.5 maxpft=79 mask=gx1v7 use_cn=.true. use_nitrif_denitrif=.true. use_vertsoilc=.true. use_crop=.true. irrigate=.true. glc_nec=10 + + +hgrid=1.9x2.5 maxpft=79 mask=gx1v7 use_cn=.true. use_nitrif_denitrif=.true. use_vertsoilc=.true. use_crop=.true. irrigate=.true. glc_nec=10 + + +hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_nitrif_denitrif=.true. use_vertsoilc=.true. use_crop=.true. irrigate=.true. glc_nec=10 + + + + +hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_nitrif_denitrif=.true. use_vertsoilc=.true. use_crop=.true. irrigate=.true. glc_nec=10 + + + +hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_nitrif_denitrif=.true. use_vertsoilc=.true. use_crop=.true. irrigate=.true. glc_nec=10 + + + + +lnd/clm2/initdata_map/clmi.BHIST.2000-01-01.0.9x1.25_gx1v7_simyr2000_c181015.nc + + +lnd/clm2/initdata_map/clmi.BHIST.2010-01-01.0.9x1.25_gx1v7_simyr2010_c181015.nc + + +lnd/clm2/initdata_map/clmi.BHIST.2000-01-01.0.9x1.25_gx1v7_simyr2000_c181015.nc + + +lnd/clm2/initdata_map/clmi.BHIST.2010-01-01.0.9x1.25_gx1v7_simyr2010_c181015.nc + + + + lnd/clm2/snicardata/snicar_drdt_bst_fit_60_c070416.nc +2010 +2010 + 2000 2000 @@ -1057,6 +1149,9 @@ lnd/clm2/surfdata_map/surfdata_ne120np4_78pfts_CMIP6_simyr1850_c170824.ncnn +2010 +2010 + 2000 2000 diff --git a/bld/namelist_files/namelist_definition_clm4_5.xml b/bld/namelist_files/namelist_definition_clm4_5.xml index 9054510ba8..09af1a1756 100644 --- a/bld/namelist_files/namelist_definition_clm4_5.xml +++ b/bld/namelist_files/namelist_definition_clm4_5.xml @@ -1771,11 +1771,13 @@ Representative concentration pathway for future scenarios [radiative forcing at -999.9 means do NOT use a future scenario, just use historical data. - -Shared Socioeconomic Pathway and Representative Concentration Pathway combination for future scenarios +Shared Socioeconomic Pathway (SSP) and Representative Concentration Pathway (RCP) combination for future scenarios The form is SSPn-m.m Where n is the SSP number and m.m is RCP radiative forcing at peak or 2100 in W/m^2 +n is just the whole number of the specific SSP scenario. The lower numbers have higher mitigation +- the higher numbers less mitigation, more than one SSP can result in the same RCP forcing hist means do NOT use a future scenario, just use historical data. @@ -1801,7 +1803,7 @@ If 1, turn on the MEGAN model for BVOC's (Biogenic Volitile Organic Compounds) +"1000,850,1100,1350,1600,1850,1855,1865,1875,1885,1895,1905,1915,1925,1935,1945,1955,1965,1975,1980,1985,1995,2000,2005,2010,2015,2025,2035,2045,2055,2065,2075,2085,2095,2105"> Year to simulate and to provide datasets for (such as surface datasets, initial conditions, aerosol-deposition, Nitrogen deposition rates etc.) A sim_year of 1000 corresponds to data used for testing only, NOT corresponding to any real datasets. A sim_year greater than 2005 corresponds to rcp scenario data diff --git a/bld/namelist_files/use_cases/2010_control.xml b/bld/namelist_files/use_cases/2010_control.xml new file mode 100644 index 0000000000..e61ac4dd4b --- /dev/null +++ b/bld/namelist_files/use_cases/2010_control.xml @@ -0,0 +1,36 @@ + + + + +Conditions to simulate 2010 land-use + +2000 + +constant + +.true. +.false. +.false. + +2010 +2010 + +2010 +2010 + +2010 +2010 + +2010 +2010 + +2010 +2010 + +2010 +2010 + +2010 +2010 + + diff --git a/bld/unit_testers/build-namelist_test.pl b/bld/unit_testers/build-namelist_test.pl index 6e20256764..aa48d37059 100755 --- a/bld/unit_testers/build-namelist_test.pl +++ b/bld/unit_testers/build-namelist_test.pl @@ -1215,6 +1215,7 @@ sub make_env_run { "1850-2100_rcp8.5_transient", "1850_control", "2000_control", + "2010_control", "20thC_transient", ); foreach my $res ( @glc_res ) { diff --git a/cime_config/config_component.xml b/cime_config/config_component.xml index edfa521d2e..90173fea2c 100644 --- a/cime_config/config_component.xml +++ b/cime_config/config_component.xml @@ -102,6 +102,7 @@ UNSET + 2010_control 2000_control 1850_control 20thC_transient diff --git a/cime_config/config_compsets.xml b/cime_config/config_compsets.xml index 4b820c1ffa..bd1180b5e7 100644 --- a/cime_config/config_compsets.xml +++ b/cime_config/config_compsets.xml @@ -53,6 +53,11 @@ 2000_DATM%GSWP3v1_CLM50%SP_SICE_SOCN_MOSART_CISM2%NOEVOLVE_SWAV + + I2010Clm50Sp + 2010_DATM%GSWP3v1_CLM50%SP_SICE_SOCN_MOSART_CISM2%NOEVOLVE_SWAV + + I2000Clm50BgcCru 2000_DATM%CRUv7_CLM50%BGC_SICE_SOCN_MOSART_CISM2%NOEVOLVE_SWAV diff --git a/cime_config/testdefs/testlist_clm.xml b/cime_config/testdefs/testlist_clm.xml index ae27810ec1..5764577f2e 100644 --- a/cime_config/testdefs/testlist_clm.xml +++ b/cime_config/testdefs/testlist_clm.xml @@ -1145,6 +1145,14 @@ + + + + + + + + From 737793fa59723c9765c1e2a0fdc92fe15b271d69 Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Thu, 1 Nov 2018 12:01:12 -0600 Subject: [PATCH 2/8] Add testmod for clm5_0_cam6.0 LND_TUNING_MODE --- .../clm/clm50cam6LndTuningMode/include_user_mods | 1 + .../testmods_dirs/clm/clm50cam6LndTuningMode/shell_commands | 4 ++++ 2 files changed, 5 insertions(+) create mode 100644 cime_config/testdefs/testmods_dirs/clm/clm50cam6LndTuningMode/include_user_mods create mode 100644 cime_config/testdefs/testmods_dirs/clm/clm50cam6LndTuningMode/shell_commands diff --git a/cime_config/testdefs/testmods_dirs/clm/clm50cam6LndTuningMode/include_user_mods b/cime_config/testdefs/testmods_dirs/clm/clm50cam6LndTuningMode/include_user_mods new file mode 100644 index 0000000000..fe0e18cf88 --- /dev/null +++ b/cime_config/testdefs/testmods_dirs/clm/clm50cam6LndTuningMode/include_user_mods @@ -0,0 +1 @@ +../default diff --git a/cime_config/testdefs/testmods_dirs/clm/clm50cam6LndTuningMode/shell_commands b/cime_config/testdefs/testmods_dirs/clm/clm50cam6LndTuningMode/shell_commands new file mode 100644 index 0000000000..19326795bb --- /dev/null +++ b/cime_config/testdefs/testmods_dirs/clm/clm50cam6LndTuningMode/shell_commands @@ -0,0 +1,4 @@ +#!/bin/bash + +./xmlchange LND_TUNING_MODE="clm5_0_cam6.0" + From 9c4045e9722f610ecd189d832fb8fa6165e67b55 Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Thu, 1 Nov 2018 12:49:07 -0600 Subject: [PATCH 3/8] Correct typos in new test --- cime_config/testdefs/testlist_clm.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cime_config/testdefs/testlist_clm.xml b/cime_config/testdefs/testlist_clm.xml index 5764577f2e..3df14bbf25 100644 --- a/cime_config/testdefs/testlist_clm.xml +++ b/cime_config/testdefs/testlist_clm.xml @@ -1145,7 +1145,7 @@ - + From 9994574eba914a605a89dd803355f71a8dc89380 Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Fri, 2 Nov 2018 09:39:46 -0600 Subject: [PATCH 4/8] If defaults allow interp. use it for finidat If defaults allow use_init_interp to be true, then pick a finidat file. When picking the file take the sim_year that is within range, but also closest to the desired year. Ran namelist unit tester, 106 tests differ, because of new IC files Rerunning failed aux_clm tests aux_clm testing is showing identical results --- bld/CLMBuildNamelist.pm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/bld/CLMBuildNamelist.pm b/bld/CLMBuildNamelist.pm index 2c22c787ab..46840cdaf7 100755 --- a/bld/CLMBuildNamelist.pm +++ b/bld/CLMBuildNamelist.pm @@ -2402,10 +2402,11 @@ sub setup_logic_initial_conditions { my $try = 0; my $done = 2; my $use_init_interp_default = $nl->get_value($useinitvar); + $settings{$useinitvar} = $use_init_interp_default; if ( string_is_undef_or_empty( $use_init_interp_default ) ) { $use_init_interp_default = $defaults->get_value($useinitvar, \%settings); + $settings{$useinitvar} = ".false."; } - $settings{$useinitvar} = $use_init_interp_default; do { $try++; add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, $var, %settings ); @@ -2420,8 +2421,11 @@ sub setup_logic_initial_conditions { #} add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, "init_interp_sim_years" ); add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, "init_interp_how_close" ); + my $close = $nl->get_value("init_interp_how_close"); foreach my $sim_yr ( split( /,/, $nl->get_value("init_interp_sim_years") )) { - if ( abs($st_year - $sim_yr) < $nl->get_value("init_interp_how_close") ) { + my $how_close = abs($st_year - $sim_yr); + if ( ($how_close < $nl->get_value("init_interp_how_close")) && ($how_close < $close) ) { + $close = $how_close; $settings{'sim_year'} = $sim_yr; } } From 6d699f9c70895c10f7da1f2dab842811ce1388b4 Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Fri, 2 Nov 2018 10:46:25 -0600 Subject: [PATCH 5/8] Update changelogs --- doc/ChangeSum | 1 + doc/release-clm5.0.ChangeLog | 97 ++++++++++++++++++++++++++++++++++++ 2 files changed, 98 insertions(+) diff --git a/doc/ChangeSum b/doc/ChangeSum index 375b392d65..7df80572ba 100644 --- a/doc/ChangeSum +++ b/doc/ChangeSum @@ -1,5 +1,6 @@ Tag Who Date Summary ============================================================================================================================ +release-clm5.0.12 erik 11/02/2018 New IC files for clm45/clm50 coupled cases, add 2010 compset release-clm5.0.11 erik 10/30/2018 Bring fix for transient Bgc/Sp to release branch (from ctsm1.0.dev013) release-clm5.0.10 sacks 10/29/2018 Bring in CMIP6 compset modifiers, output usermods and bit-for-bit fixes from dev014 and dev015 ctsm1.0.dev015 sacks 10/28/2018 CMIP6 compset modifiers, usermods for typical output, and other output enhancements diff --git a/doc/release-clm5.0.ChangeLog b/doc/release-clm5.0.ChangeLog index a9df73b30f..bee5d8b9df 100644 --- a/doc/release-clm5.0.ChangeLog +++ b/doc/release-clm5.0.ChangeLog @@ -1,4 +1,101 @@ =============================================================== +Tag name: release-clm5.0.12 +Originator(s): erik (Erik Kluzek) +Date: Fri Nov 2 10:46:16 MDT 2018 +One-line Summary: New IC files for clm45/clm50 coupled cases, add 2010 compset + +Purpose of this version: +------------------------ + +Improve logic for picking initial condition files (finidat). Add new finidat files +for when coupled to CAM (LND_TUNING_MODE=clm*_cam6.0) for both 1850 (from CMIP6 B1850 case) +and 2000/2010 (from CMIP6 BHIST case). + +Logic for picking finidat files now will pick a finidat file that it interpolates from +provided the default settings allow use_init_interp to be true. This makes it more likely +to pick a file to startup from if at all possible, rather than dying with an error that +a finidat couldn't be found (which the user could override to get the new behavior by adding +use_init_interp=T to their user_nl_clm). + +In namelist settings for finding finidat files for sim_yr=2000, be explict on which tuning mode +is being matched and duplicate the clm4_5/clm5_0 GSWP3v1/CRUv7 matches. This gets it to match +the correct ones and allows them to be distinquished in the future. + +Added CLM_NML_USE_CASE=2010_control, and settings for sim_yr=2010, which is needed for some new CAM compsets. + +CTSM Master Tag This Corresponds To: ctsm1.0.dev015 (with changes) + +Summary of changes: +------------------- + +Issues fixed (include CTSM Issue #): #544 + #544 Transient cases coupled to CAM are matching the wrong IC file (2000 instead of 1850) + +Science changes since: release-clm5.0.11 + * None + +Software changes since: release-clm5.0.11 + * Improve logic for finding initial conditions, don't abort if can find a file to interpolate from and interpolation is allowed + +Changes to User Interface since: release-clm5.0.11 + * Added 2010_control to CLM_NML_USE_CASE + * Added -sim_yr 2010 to CLM_BLDNML_OPTS + +Testing: +-------- + + [PASS means all tests PASS and OK means tests PASS other than expected fails.] + + build-namelist tests: + + cheyenne - OK (106 tests differ from baseline because of new IC files) + + unit-tests (components/clm/src): + + cheyenne - PASS + hobart ---PASS + + regular tests (aux_clm): + + cheyenne_intel ---- OK + cheyenne_gnu ------ OK + hobart_nag -------- OK + hobart_pgi -------- OK + hobart_intel ------ OK + +Summary of Answer changes: +------------------------- + +Baseline version for comparison: release-clm5.0.11 + +Changes answers relative to baseline: No not for aux_clm tests! Will change answers when coupled to CAM with new IC files + + Summarize any changes to answers, i.e., + - what code configurations: LND_TUNING_MODE=clm#_#_cam6.0 + - what platforms/compilers: All + - nature of change: Updated initial conditions that use CMIP6 BHIST and B1850 + +Detailed list of changes: +------------------------ + +Externals being used: + + cism: release-cesm2.0.04 + rtm: release-cesm2.0.00 + mosart: release-cesm2.0.00 + cime: cime_cesm2_0_rel_05 + FATES: fates_s1.8.1_a3.0.0 + PTCLM: PTCLM2_180611 + +CTSM Tag versions pulled over from master development branch: None + +Pull Requests that document the changes (include PR ids): #555 +(https://github.com/ESCOMP/ctsm/pull) + + #555 -- New initial conditions when coupled to CAM + +=============================================================== +=============================================================== Tag name: release-clm5.0.11 Originator(s): erik (Erik Kluzek) Date: Tue Oct 30 10:50:49 MDT 2018 From 71a43efb6ffaefcc3a2c3325c1138f95f950e119 Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Fri, 2 Nov 2018 14:53:58 -0600 Subject: [PATCH 6/8] Add a comment about using the same file, but for a different tuning mode --- bld/namelist_files/namelist_defaults_clm4_5.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/bld/namelist_files/namelist_defaults_clm4_5.xml b/bld/namelist_files/namelist_defaults_clm4_5.xml index 385081b63a..eb4b247809 100644 --- a/bld/namelist_files/namelist_defaults_clm4_5.xml +++ b/bld/namelist_files/namelist_defaults_clm4_5.xml @@ -620,6 +620,7 @@ attributes from the config_cache.xml file (with keys converted to upper-case). >lnd/clm2/initdata_map/clmi.I2000Clm50BgcCrop.2011-01-01.1.9x2.5_gx1v7_gl4_simyr2000_c180715.nc + lnd/clm2/initdata_map/clmi.I2000Clm50BgcCrop.2011-01-01.1.9x2.5_gx1v7_gl4_simyr2000_c180715.nc + lnd/clm2/initdata_map/clmi.I2000Clm50BgcCrop.2011-01-01.1.9x2.5_gx1v7_gl4_simyr2000_c180715.nc + lnd/clm2/initdata_map/clmi.BHIST.2000-01-01.0.9x1.25_gx1v7_simyr2000_c181015.nc + lnd/clm2/initdata_map/clmi.BHIST.2010-01-01.0.9x1.25_gx1v7_simyr2010_c181015.nc + lnd/clm2/initdata_map/clmi.BHIST.2000-01-01.0.9x1.25_gx1v7_simyr2000_c181015.nc + Date: Sat, 3 Nov 2018 20:59:16 -0600 Subject: [PATCH 7/8] Get the waccmx_offline test working Get the waccmx_offline test working, by using a different IC file. Also because of ROF it can't only do 9 steps, but needs to do a few days. So do a five day test with it. Add it to the test list and remove the fail from expected list. Change the aux_cime_baseline test from to the IHistClm50BgcCro ciso_DecStart to SMS_Ld5_D.f09_g1.I1850Clm50BgcCropCmip6.clm-basic Run and PASS: ERS_D_Ld5_P480x3.f19_g16.I2000Clm50SpGs.cheyenne_intel.clm-waccmx_offline --- cime_config/testdefs/ExpectedTestFails.xml | 1 - cime_config/testdefs/testlist_clm.xml | 4 ++-- .../testdefs/testmods_dirs/clm/waccmx_offline/user_nl_clm | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/cime_config/testdefs/ExpectedTestFails.xml b/cime_config/testdefs/ExpectedTestFails.xml index 5a33dec0ab..7dec74253b 100644 --- a/cime_config/testdefs/ExpectedTestFails.xml +++ b/cime_config/testdefs/ExpectedTestFails.xml @@ -8,7 +8,6 @@ FAIL ERP_D_Ld5.f09_g17.I2000Clm50Vic.cheyenne_intel.clm-vrtlay RUN FAIL SMS.f10_f10_musgs.I2000Clm50BgcCrop.hobart_pgi.clm-crop RUN FAIL SMS_D.f10_f10_musgs.I2000Clm50BgcCrop.hobart_pgi.clm-crop RUN - FAIL ERS_D_Ln9_P480x3.f19_g16.I2000Clm50SpGs.cheyenne_intel.clm-waccmx_offline COMPARE_base_rest FAIL ERS_Ld60.f45_f45_mg37.I2000Clm45Fates.hobart_nag.clm-Fates COMPARE_base_rest diff --git a/cime_config/testdefs/testlist_clm.xml b/cime_config/testdefs/testlist_clm.xml index 3df14bbf25..8793793be0 100644 --- a/cime_config/testdefs/testlist_clm.xml +++ b/cime_config/testdefs/testlist_clm.xml @@ -107,7 +107,7 @@ - + @@ -341,7 +341,6 @@ - @@ -1503,6 +1502,7 @@ + diff --git a/cime_config/testdefs/testmods_dirs/clm/waccmx_offline/user_nl_clm b/cime_config/testdefs/testmods_dirs/clm/waccmx_offline/user_nl_clm index 2822111c11..841e8b2a4c 100644 --- a/cime_config/testdefs/testmods_dirs/clm/waccmx_offline/user_nl_clm +++ b/cime_config/testdefs/testmods_dirs/clm/waccmx_offline/user_nl_clm @@ -1,5 +1,5 @@ ! Add in an initial condition file that isn't in equilibrium and will need to be brought into equilibrium. ! We purposely want to add a shock to ensure the model can properly respond to it, skipping balance checks ! at the beginning and then coming into balance after enough time. - finidat = '$DIN_LOC_ROOT/lnd/clm2/initdata_map/clmi.I1850Clm45BgcGs.0901-01-01.0.9x1.25_gx1v6_simyr1850_c180204.nc' + finidat = '$DIN_LOC_ROOT/lnd/clm2/initdata_map/clmi.IG1850CLM45SP.1850-01-01.1.9x2.5_gx1v7_gl4_simyr1850_c170608.nc' use_init_interp = .true. From 598c3f1c4702e0d42a4ed875308ea572775a9fbe Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Sat, 3 Nov 2018 21:20:06 -0600 Subject: [PATCH 8/8] Update changelog --- doc/ChangeSum | 2 +- doc/release-clm5.0.ChangeLog | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/doc/ChangeSum b/doc/ChangeSum index 7df80572ba..8c9f73e6ed 100644 --- a/doc/ChangeSum +++ b/doc/ChangeSum @@ -1,6 +1,6 @@ Tag Who Date Summary ============================================================================================================================ -release-clm5.0.12 erik 11/02/2018 New IC files for clm45/clm50 coupled cases, add 2010 compset +release-clm5.0.12 erik 11/03/2018 New IC files for clm45/clm50 coupled cases, add 2010 compset release-clm5.0.11 erik 10/30/2018 Bring fix for transient Bgc/Sp to release branch (from ctsm1.0.dev013) release-clm5.0.10 sacks 10/29/2018 Bring in CMIP6 compset modifiers, output usermods and bit-for-bit fixes from dev014 and dev015 ctsm1.0.dev015 sacks 10/28/2018 CMIP6 compset modifiers, usermods for typical output, and other output enhancements diff --git a/doc/release-clm5.0.ChangeLog b/doc/release-clm5.0.ChangeLog index bee5d8b9df..a5d3a25631 100644 --- a/doc/release-clm5.0.ChangeLog +++ b/doc/release-clm5.0.ChangeLog @@ -1,7 +1,7 @@ =============================================================== Tag name: release-clm5.0.12 Originator(s): erik (Erik Kluzek) -Date: Fri Nov 2 10:46:16 MDT 2018 +Date: Sat Nov 3 21:19:25 MDT 2018 One-line Summary: New IC files for clm45/clm50 coupled cases, add 2010 compset Purpose of this version: @@ -28,8 +28,10 @@ CTSM Master Tag This Corresponds To: ctsm1.0.dev015 (with changes) Summary of changes: ------------------- -Issues fixed (include CTSM Issue #): #544 +Issues fixed (include CTSM Issue #): #558 #544 $504 + #558 Replace a failing test in aux_cime_baselines #544 Transient cases coupled to CAM are matching the wrong IC file (2000 instead of 1850) + $504 Add a 2010 use_case Science changes since: release-clm5.0.11 * None