Merge branch 'update_dt_in_rcpext' into cesm2_1_x_rel

ESCOMP · Aug 20, 2020 · b82ff99 · b82ff99
2 parents 237ab66 + 4f599bd
commit b82ff99
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 2 deletions.
diff --git a/bld/build-namelist b/bld/build-namelist
@@ -515,7 +515,7 @@ add_default($nl, 'dt_option');
 my $time_mix_opt = $nl->get_value('time_mix_opt');
 $time_mix_opt =~ s/^\s+//;
 $time_mix_opt =~ s/\s+$//;
-add_default($nl, 'dt_count','ocn_coupling'=>"$OCN_COUPLING",'ocn_onedim'=>"$OCN_ONEDIM", 'time_mix'=>"$time_mix_opt");
+add_default($nl, 'dt_count','ocn_coupling'=>"$OCN_COUPLING",'ocn_onedim'=>"$OCN_ONEDIM", 'time_mix'=>"$time_mix_opt", 'ocn_transient'=>"$OCN_TRANSIENT");
 
 add_default($nl, 'impcor');
 add_default($nl, 'laccel');

diff --git a/bld/namelist_files/namelist_defaults_pop.xml b/bld/namelist_files/namelist_defaults_pop.xml
@@ -56,6 +56,7 @@
 <dt_count ocn_grid="gx1v6"  ocn_onedim="TRUE">46</dt_count>
 <dt_count ocn_grid="gx1v7"  > 24</dt_count>
 <dt_count ocn_grid="gx1v7"  ocn_onedim="TRUE">46</dt_count>
+<dt_count ocn_grid="gx1v7"  ocn_transient="ssp585ext">48</dt_count>
 <dt_count ocn_grid="tx1v1"  > 24</dt_count>
 <dt_count ocn_grid="tx0.1v2">300</dt_count>
 <dt_count ocn_grid="tx0.1v2" ocn_coupling="partial">500</dt_count>
@@ -1518,6 +1519,22 @@
 <ndep_shr_stream_file ocn_grid="gx1v6" ocn_transient="ssp585">ocn/pop/gx1v6/forcing/ndep_ocn_ssp585_w_nhx_emis_gx1v6_c190212.nc</ndep_shr_stream_file>
 <ndep_shr_stream_file ocn_grid="gx1v7" ocn_transient="ssp585">ocn/pop/gx1v6/forcing/ndep_ocn_ssp585_w_nhx_emis_gx1v6_c190212.nc</ndep_shr_stream_file>
 
+<ndep_data_type ocn_transient="ssp534ext">shr_stream</ndep_data_type>
+<ndep_shr_stream_year_first ocn_transient="ssp534ext">2100</ndep_shr_stream_year_first>
+<ndep_shr_stream_year_last  ocn_transient="ssp534ext">2300</ndep_shr_stream_year_last>
+<ndep_shr_stream_year_align ocn_transient="ssp534ext">2100</ndep_shr_stream_year_align>
+<ndep_shr_stream_file ocn_grid="gx3v7" ocn_transient="ssp534ext">ocn/pop/gx3v7/forcing/ndep_ocn_ssp534osext_w_nhx_emis_gx3v7_c200629.nc</ndep_shr_stream_file>
+<ndep_shr_stream_file ocn_grid="gx1v6" ocn_transient="ssp534ext">ocn/pop/gx1v6/forcing/ndep_ocn_ssp534osext_w_nhx_emis_gx1v6_c200629.nc</ndep_shr_stream_file>
+<ndep_shr_stream_file ocn_grid="gx1v7" ocn_transient="ssp534ext">ocn/pop/gx1v6/forcing/ndep_ocn_ssp534osext_w_nhx_emis_gx1v6_c200629.nc</ndep_shr_stream_file>
+
+<ndep_data_type ocn_transient="ssp585ext">shr_stream</ndep_data_type>
+<ndep_shr_stream_year_first ocn_transient="ssp585ext">2100</ndep_shr_stream_year_first>
+<ndep_shr_stream_year_last  ocn_transient="ssp585ext">2300</ndep_shr_stream_year_last>
+<ndep_shr_stream_year_align ocn_transient="ssp585ext">2100</ndep_shr_stream_year_align>
+<ndep_shr_stream_file ocn_grid="gx3v7" ocn_transient="ssp585ext">ocn/pop/gx3v7/forcing/ndep_ocn_ssp585ext_w_nhx_emis_gx3v7_c200629.nc</ndep_shr_stream_file>
+<ndep_shr_stream_file ocn_grid="gx1v6" ocn_transient="ssp585ext">ocn/pop/gx1v6/forcing/ndep_ocn_ssp585ext_w_nhx_emis_gx1v6_c200629.nc</ndep_shr_stream_file>
+<ndep_shr_stream_file ocn_grid="gx1v7" ocn_transient="ssp585ext">ocn/pop/gx1v6/forcing/ndep_ocn_ssp585ext_w_nhx_emis_gx1v6_c200629.nc</ndep_shr_stream_file>
+
 <riv_flux_shr_stream_file ocn_grid="gx3v7">ocn/pop/gx3v7/forcing/riv_nut.gnews_gnm.gx3v7_nnsm_e1000r500.20180511.nc</riv_flux_shr_stream_file>
 <riv_flux_shr_stream_file ocn_grid="gx1v6">ocn/pop/gx1v7/forcing/riv_nut.gnews_gnm.gx1v7_nnsm_e1000r300.20170425.nc</riv_flux_shr_stream_file>
 <riv_flux_shr_stream_file ocn_grid="gx1v7">ocn/pop/gx1v7/forcing/riv_nut.gnews_gnm.gx1v7_nnsm_e1000r300.20170425.nc</riv_flux_shr_stream_file>

diff --git a/cime_config/config_component.xml b/cime_config/config_component.xml
@@ -138,7 +138,7 @@
 
   <entry id="OCN_TRANSIENT">
     <type>char</type>
-    <valid_values>unset,CORE2_NYF,CORE2,CORE2_OMIP,JRA,JRA_OMIP,1850-2000,rcp4.5,rcp8.5,ssp126,ssp245,ssp370,ssp585</valid_values>
+    <valid_values>unset,CORE2_NYF,CORE2,CORE2_OMIP,JRA,JRA_OMIP,1850-2000,rcp4.5,rcp8.5,ssp126,ssp245,ssp370,ssp534ext,ssp585,ssp585ext</valid_values>
     <default_value>unset</default_value>
     <values>
       <value compset="DATM%NYF">CORE2_NYF</value>
@@ -153,7 +153,9 @@
       <value compset="^SSP126_CAM">ssp126</value>
       <value compset="^SSP245_CAM">ssp245</value>
       <value compset="^SSP370_CAM">ssp370</value>
+      <value compset="^SSP534EXT_CAM">ssp534ext</value>
       <value compset="^SSP585_CAM">ssp585</value>
+      <value compset="^SSP585EXT_CAM">ssp585ext</value>
     </values>
     <group>run_component_pop</group>
     <file>env_run.xml</file>