Merge remote-tracking branch 'origin/waccm_forcings' into aeroconv_dz

ESCOMP · Aug 13, 2024 · 14efd5b · 14efd5b
2 parents 84be7fd + 2ae76b0
commit 14efd5b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/bld/namelist_files/use_cases/waccm_sc_2000_cam6.xml b/bld/namelist_files/use_cases/waccm_sc_2000_cam6.xml
@@ -21,8 +21,8 @@
 <flbc_list>'CO2','CH4','N2O','CFC11','CFC12','CFC11eq'</flbc_list>
 
 <!-- upper atmos forcings -->
-<waccm_forcing_type>FIXED</waccm_forcing_type>
-<waccm_forcing_fixed_ymd>20000101</waccm_forcing_fixed_ymd>
+<waccm_forcing_type>CYCLICAL</waccm_forcing_type>
+<waccm_forcing_cycle_yr>2000</waccm_forcing_cycle_yr>
 <waccm_forcing_file>SCWACCM_forcing_WACCM6_zm_5day_L70_1975-2014_c191121.nc</waccm_forcing_file>
 <waccm_forcing_datapath>atm/waccm/waccm_forcing</waccm_forcing_datapath>
 

diff --git a/bld/namelist_files/use_cases/waccm_sc_2010_cam6.xml b/bld/namelist_files/use_cases/waccm_sc_2010_cam6.xml
@@ -21,8 +21,8 @@
 <flbc_list>'CO2','CH4','N2O','CFC11','CFC12','CFC11eq'</flbc_list>
 
 <!-- upper atmos forcings -->
-<waccm_forcing_type>FIXED</waccm_forcing_type>
-<waccm_forcing_fixed_ymd>20100101</waccm_forcing_fixed_ymd>
+<waccm_forcing_type>CYCLICAL</waccm_forcing_type>
+<waccm_forcing_cycle_yr>2010</waccm_forcing_cycle_yr>
 <waccm_forcing_file>SCWACCM_forcing_WACCM6_zm_5day_L70_1975-2014_c191121.nc</waccm_forcing_file>
 <waccm_forcing_datapath>atm/waccm/waccm_forcing</waccm_forcing_datapath>