From 7950c19ff2413b1af9bb483c86c1983306f31d88 Mon Sep 17 00:00:00 2001 From: kdraeder Date: Mon, 17 Nov 2025 16:08:47 -0700 Subject: [PATCH 1/3] Made ERI F1850C test work with gregorian calendar. Several more changes are needed in cime, which will have a commit with the same title. This was tested using ERI_D_C3_CG_Ld8.ne30pg3_g17.F1850C_LTso.derecho_intel.cam-outfrq9s_leapday bld/namelist_files/use_cases/1850_cam_lt.xml Change year of some forcing files to 1852 so that leap day is handled. cime_config/testdefs/testmods_dirs/cam/outfrq9s_leapday/shell_commands Change start year to 2008, so that adding 4 (cime) yields a date that's within the time span of all of the forcing files. --- bld/namelist_files/use_cases/1850_cam_lt.xml | 8 ++++---- .../testmods_dirs/cam/outfrq9s_leapday/shell_commands | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bld/namelist_files/use_cases/1850_cam_lt.xml b/bld/namelist_files/use_cases/1850_cam_lt.xml index 410c31e500..5d3a2fc671 100644 --- a/bld/namelist_files/use_cases/1850_cam_lt.xml +++ b/bld/namelist_files/use_cases/1850_cam_lt.xml @@ -8,7 +8,7 @@ atm/waccm/lb/LBC_17500116-20150116_CMIP6_0p5degLat_c180905.nc -1850 +1852 'CYCLICAL' 'CO2','CH4','N2O','CFC11','CFC12','CFC11eq' @@ -16,7 +16,7 @@ 'Q:H2O->UBC_FILE' atm/cam/chem/ubc/b.e21.BWHIST.f09_g17.CMIP6-historical-WACCM.ensAvg123.cam.h0zm.H2O.1849-2014_c240604.nc CYCLICAL -1850 +1852 'atm/cam/ozone_strataero' @@ -93,9 +93,9 @@ CYCLICAL -1850 +1852 -1850 +1852 diff --git a/cime_config/testdefs/testmods_dirs/cam/outfrq9s_leapday/shell_commands b/cime_config/testdefs/testmods_dirs/cam/outfrq9s_leapday/shell_commands index 2805059fe3..5d2ba4457f 100644 --- a/cime_config/testdefs/testmods_dirs/cam/outfrq9s_leapday/shell_commands +++ b/cime_config/testdefs/testmods_dirs/cam/outfrq9s_leapday/shell_commands @@ -3,4 +3,4 @@ if [ "$driver" = "nuopc" ]; then ./xmlchange ROF_NCPL=\$ATM_NCPL ./xmlchange GLC_NCPL=\$ATM_NCPL fi -./xmlchange RUN_STARTDATE=2012-02-29 +./xmlchange RUN_STARTDATE=2008-02-29 From fc28fce1ff3f2a33840536e7128cb1eb8337b277 Mon Sep 17 00:00:00 2001 From: kdraeder Date: Tue, 18 Nov 2025 13:45:47 -0700 Subject: [PATCH 2/3] Restored 1850_cam_lt.xml. Added leapyears_cam_lt.xml. The F1850 test of the gregorian calender in ERI requires that some forcing files provide data from 1852, while others can only provide 1850. --- bld/namelist_files/use_cases/1850_cam_lt.xml | 8 +- .../use_cases/leapyears_cam_lt.xml | 101 ++++++++++++++++++ 2 files changed, 105 insertions(+), 4 deletions(-) create mode 100644 bld/namelist_files/use_cases/leapyears_cam_lt.xml diff --git a/bld/namelist_files/use_cases/1850_cam_lt.xml b/bld/namelist_files/use_cases/1850_cam_lt.xml index 5d3a2fc671..410c31e500 100644 --- a/bld/namelist_files/use_cases/1850_cam_lt.xml +++ b/bld/namelist_files/use_cases/1850_cam_lt.xml @@ -8,7 +8,7 @@ atm/waccm/lb/LBC_17500116-20150116_CMIP6_0p5degLat_c180905.nc -1852 +1850 'CYCLICAL' 'CO2','CH4','N2O','CFC11','CFC12','CFC11eq' @@ -16,7 +16,7 @@ 'Q:H2O->UBC_FILE' atm/cam/chem/ubc/b.e21.BWHIST.f09_g17.CMIP6-historical-WACCM.ensAvg123.cam.h0zm.H2O.1849-2014_c240604.nc CYCLICAL -1852 +1850 'atm/cam/ozone_strataero' @@ -93,9 +93,9 @@ CYCLICAL -1852 +1850 -1852 +1850 diff --git a/bld/namelist_files/use_cases/leapyears_cam_lt.xml b/bld/namelist_files/use_cases/leapyears_cam_lt.xml new file mode 100644 index 0000000000..5d3a2fc671 --- /dev/null +++ b/bld/namelist_files/use_cases/leapyears_cam_lt.xml @@ -0,0 +1,101 @@ + + + + +atm/cam/solar/SolarForcingCMIP7piControl_c20250103.nc + 18500101 + FIXED + + +atm/waccm/lb/LBC_17500116-20150116_CMIP6_0p5degLat_c180905.nc +1852 +'CYCLICAL' +'CO2','CH4','N2O','CFC11','CFC12','CFC11eq' + + +'Q:H2O->UBC_FILE' +atm/cam/chem/ubc/b.e21.BWHIST.f09_g17.CMIP6-historical-WACCM.ensAvg123.cam.h0zm.H2O.1849-2014_c240604.nc +CYCLICAL +1852 + + + 'atm/cam/ozone_strataero' + 'ozone_strataero_cyclical_WACCM6_L70_CMIP6-piControl.001_y21-50avg_zm_5day_c180802.nc' + 'O3' + CYCLICAL + 1850 + + + 1850 + 'atm/cam/ozone_strataero' + 'ozone_strataero_cyclical_WACCM6_L70_CMIP6-piControl.001_y21-50avg_zm_5day_c180802.nc' + .true. + 'CYCLICAL' + + + + 1850 + 'atm/cam/tracer_cnst' + 'tracer_cnst_WACCM6_halons_3DmonthlyL70_1850climoCMIP6piControl001_y21-50avg_c180802.nc' + 'O3','OH','NO3','HO2','HALONS' + 'CYCLICAL' + '' + + + CYCLICAL + 1850 + +'bc_a4 -> $INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/bc_a4-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-CMIP-2025-04-18_gn_175001-202312.nc', +'num_a4 -> $INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/num_bc_a4-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-CMIP-2025-04-18_gn_175001-202312.nc', +'SO2 -> $INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/SO2-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-CMIP-2025-04-18_gn_175001-202312.nc', +'so4_a1 -> $INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/so4_a1_ene_vertical-em-anthro_input4MIPs_emissions_CMIP_CEDS-CMIP-2025-04-18_gn_175001-202312.nc', +'num_a1 -> $INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/num_so4_a1_ene_vertical-em-anthro_input4MIPs_emissions_CMIP_CEDS-CMIP-2025-04-18_gn_175001-202312.nc', +'num_a1 -> $INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/emissions-cmip6_num_a1_so4_contvolcano_vertical_850-5000_ne30pg3_c20200125.nc', +'num_a2 -> $INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/emissions-cmip6_num_a2_so4_contvolcano_vertical_850-5000_ne30pg3_c20200125.nc', +'so4_a1 -> $INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/emissions-cmip6_so4_a1_contvolcano_vertical_850-5000_ne30pg3_c20200125.nc', +'so4_a2 -> $INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/emissions-cmip6_so4_a2_contvolcano_vertical_850-5000_ne30pg3_c20200125.nc', +'SO2 -> $INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/emissions-cmip6_SO2_contvolcano_vertical_850-5000_ne30pg3_c20200125.nc' + + + + CYCLICAL + 1850 + +'bc_a4 -> $INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/bc_a4-em-anthro_input4MIPs_emissions_CMIP_CEDS-CMIP-2025-04-18_gn_175001-202312.nc', +'bc_a4 -> $INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/bc_a4_smoothed_input4MIPs_emissions_CMIP_DRES-CMIP-BB4CMIP7-2-0_gn_175001-202112.nc', +'pom_a4 -> $INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/pom_a4-em-anthro_input4MIPs_emissions_CMIP_CEDS-CMIP-2025-04-18_gn_175001-202312.nc', +'pom_a4 -> $INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/pom_a4_smoothed_input4MIPs_emissions_CMIP_DRES-CMIP-BB4CMIP7-2-0_gn_175001-202112.nc', +'num_a4 -> $INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/num_bc_a4-em-anthro_input4MIPs_emissions_CMIP_CEDS-CMIP-2025-04-18_gn_175001-202312.nc', +'num_a4 -> $INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/num_bc_a4_smoothed_input4MIPs_emissions_CMIP_DRES-CMIP-BB4CMIP7-2-0_gn_175001-202112.nc', +'num_a4 -> $INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/num_pom_a4-em-anthro_input4MIPs_emissions_CMIP_CEDS-CMIP-2025-04-18_gn_175001-202312.nc', +'num_a4 -> $INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/num_pom_a4_smoothed_input4MIPs_emissions_CMIP_DRES-CMIP-BB4CMIP7-2-0_gn_175001-202112.nc', +'num_a1-> $INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/num_so4_a1_ag-em-anthro_input4MIPs_emissions_CMIP_CEDS-CMIP-2025-04-18_gn_175001-202312.nc', +'num_a1-> $INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/num_so4_a1_ship_slv-em-anthro_input4MIPs_emissions_CMIP_CEDS-CMIP-2025-04-18_gn_175001-202312.nc', +'num_a2-> $INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/num_so4_a2_res_trs-em-anthro_input4MIPs_emissions_CMIP_CEDS-CMIP-2025-04-18_gn_175001-202312.nc', +'so4_a1-> $INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/so4_a1_ag_ship_slv-em-anthro_input4MIPs_emissions_CMIP_CEDS-CMIP-2025-04-18_gn_175001-202312.nc', +'so4_a2-> $INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/so4_a2_res_trs-em-anthro_input4MIPs_emissions_CMIP_CEDS-CMIP-2025-04-18_gn_175001-202312.nc', +'so4_a1-> $INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/SO4_smoothed_input4MIPs_emissions_CMIP_DRES-CMIP-BB4CMIP7-2-0_gn_175001-202112.nc', +'num_a1-> $INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/num_SO4_smoothed_input4MIPs_emissions_CMIP_DRES-CMIP-BB4CMIP7-2-0_gn_175001-202112.nc', +'SO2 -> $INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/SO2-em-anthro_input4MIPs_emissions_CMIP_CEDS-CMIP-2025-04-18_gn_175001-202312.nc', +'SO2 -> $INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/SO2_smoothed_input4MIPs_emissions_CMIP_DRES-CMIP-BB4CMIP7-2-0_gn_175001-202112.nc', +'SOAE -> 0.5954D0*$INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/ISOP_smoothed_input4MIPs_emissions_CMIP_DRES-CMIP-BB4CMIP7-2-0_gn_175001-202112.nc', +'SOAE -> 2.5592D0*$INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/BENZENE_smoothed_input4MIPs_emissions_CMIP_DRES-CMIP-BB4CMIP7-2-0_gn_175001-202112.nc', +'SOAE -> 2.5592D0*$INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/BENZENE-VOC-anthro_input4MIPs_emissions_CMIP_CEDS-CMIP-2025-04-18-supplemental_gn_175001-202312.nc', +'SOAE -> 8.5371D0*$INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/IVOC_smoothed_input4MIPs_emissions_CMIP_DRES-CMIP-BB4CMIP7-2-0_gn_175001-202112.nc', +'SOAE -> 8.5371D0*$INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/IVOC-em-anthro_input4MIPs_emissions_CMIP_CEDS-CMIP-2025-04-18_gn_175001-202312.nc', +'SOAE -> 16.650D0*$INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/SVOC_smoothed_input4MIPs_emissions_CMIP_DRES-CMIP-BB4CMIP7-2-0_gn_175001-202112.nc', +'SOAE -> 16.650D0*$INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/SVOC-em-anthro_input4MIPs_emissions_CMIP_CEDS-CMIP-2025-04-18_gn_175001-202312.nc', +'SOAE -> 8.2367D0*$INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/TOLUENE_smoothed_input4MIPs_emissions_CMIP_DRES-CMIP-BB4CMIP7-2-0_gn_175001-202112.nc', +'SOAE -> 8.2367D0*$INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/TOLUENE-VOC-anthro_input4MIPs_emissions_CMIP_CEDS-CMIP-2025-04-18-supplemental_gn_175001-202312.nc', +'SOAE -> 6.5013D0*$INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/XYLENES_smoothed_input4MIPs_emissions_CMIP_DRES-CMIP-BB4CMIP7-2-0_gn_175001-202112.nc', +'SOAE -> 6.5013D0*$INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/XYLENES-VOC-anthro_input4MIPs_emissions_CMIP_CEDS-CMIP-2025-04-18-supplemental_gn_175001-202312.nc', +'SOAE -> 5.1004D0*$INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/MTERP_smoothed_input4MIPs_emissions_CMIP_DRES-CMIP-BB4CMIP7-2-0_gn_175001-202112.nc' + + +CYCLICAL +1852 + + +1852 + + From c8ff6b137f982b42802ce99e9ce0c4d6766aa5d2 Mon Sep 17 00:00:00 2001 From: kdraeder Date: Tue, 2 Dec 2025 19:48:41 -0700 Subject: [PATCH 3/3] Made ERI outfrq9s_leapday test work with HIST compsets outfrq9s_leapday/user_nl_clm Prevented CLM failure due to year check outfrq9s_leapday/user_nl_cice outfrq9s_leapday/user_nl_mosart Added to make the history output daily, so that comparison files exist even when the forecasts span a month end. outfrq9s_leapday/shell_scripts Kept the change of start year from 2012 to 2008 This test also requires changes to cime Replacement of modifier _CG with _cG Test with HIST compsets, not 1850 (or other spinup) These were tested using ERI_D_C3_cG_Ld8.ne3_ne3_mg37.FHISTC_LTso.derecho_intel.cam-outfrq9s_leapday. No standard resolution or B compsets have been tested yet. --- .../use_cases/leapyears_cam_lt.xml | 101 ------------------ .../cam/outfrq9s_leapday/user_nl_cice | 8 ++ .../cam/outfrq9s_leapday/user_nl_clm | 3 +- .../cam/outfrq9s_leapday/user_nl_mosart | 8 ++ 4 files changed, 18 insertions(+), 102 deletions(-) delete mode 100644 bld/namelist_files/use_cases/leapyears_cam_lt.xml create mode 100644 cime_config/testdefs/testmods_dirs/cam/outfrq9s_leapday/user_nl_cice create mode 100644 cime_config/testdefs/testmods_dirs/cam/outfrq9s_leapday/user_nl_mosart diff --git a/bld/namelist_files/use_cases/leapyears_cam_lt.xml b/bld/namelist_files/use_cases/leapyears_cam_lt.xml deleted file mode 100644 index 5d3a2fc671..0000000000 --- a/bld/namelist_files/use_cases/leapyears_cam_lt.xml +++ /dev/null @@ -1,101 +0,0 @@ - - - - -atm/cam/solar/SolarForcingCMIP7piControl_c20250103.nc - 18500101 - FIXED - - -atm/waccm/lb/LBC_17500116-20150116_CMIP6_0p5degLat_c180905.nc -1852 -'CYCLICAL' -'CO2','CH4','N2O','CFC11','CFC12','CFC11eq' - - -'Q:H2O->UBC_FILE' -atm/cam/chem/ubc/b.e21.BWHIST.f09_g17.CMIP6-historical-WACCM.ensAvg123.cam.h0zm.H2O.1849-2014_c240604.nc -CYCLICAL -1852 - - - 'atm/cam/ozone_strataero' - 'ozone_strataero_cyclical_WACCM6_L70_CMIP6-piControl.001_y21-50avg_zm_5day_c180802.nc' - 'O3' - CYCLICAL - 1850 - - - 1850 - 'atm/cam/ozone_strataero' - 'ozone_strataero_cyclical_WACCM6_L70_CMIP6-piControl.001_y21-50avg_zm_5day_c180802.nc' - .true. - 'CYCLICAL' - - - - 1850 - 'atm/cam/tracer_cnst' - 'tracer_cnst_WACCM6_halons_3DmonthlyL70_1850climoCMIP6piControl001_y21-50avg_c180802.nc' - 'O3','OH','NO3','HO2','HALONS' - 'CYCLICAL' - '' - - - CYCLICAL - 1850 - -'bc_a4 -> $INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/bc_a4-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-CMIP-2025-04-18_gn_175001-202312.nc', -'num_a4 -> $INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/num_bc_a4-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-CMIP-2025-04-18_gn_175001-202312.nc', -'SO2 -> $INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/SO2-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-CMIP-2025-04-18_gn_175001-202312.nc', -'so4_a1 -> $INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/so4_a1_ene_vertical-em-anthro_input4MIPs_emissions_CMIP_CEDS-CMIP-2025-04-18_gn_175001-202312.nc', -'num_a1 -> $INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/num_so4_a1_ene_vertical-em-anthro_input4MIPs_emissions_CMIP_CEDS-CMIP-2025-04-18_gn_175001-202312.nc', -'num_a1 -> $INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/emissions-cmip6_num_a1_so4_contvolcano_vertical_850-5000_ne30pg3_c20200125.nc', -'num_a2 -> $INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/emissions-cmip6_num_a2_so4_contvolcano_vertical_850-5000_ne30pg3_c20200125.nc', -'so4_a1 -> $INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/emissions-cmip6_so4_a1_contvolcano_vertical_850-5000_ne30pg3_c20200125.nc', -'so4_a2 -> $INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/emissions-cmip6_so4_a2_contvolcano_vertical_850-5000_ne30pg3_c20200125.nc', -'SO2 -> $INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/emissions-cmip6_SO2_contvolcano_vertical_850-5000_ne30pg3_c20200125.nc' - - - - CYCLICAL - 1850 - -'bc_a4 -> $INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/bc_a4-em-anthro_input4MIPs_emissions_CMIP_CEDS-CMIP-2025-04-18_gn_175001-202312.nc', -'bc_a4 -> $INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/bc_a4_smoothed_input4MIPs_emissions_CMIP_DRES-CMIP-BB4CMIP7-2-0_gn_175001-202112.nc', -'pom_a4 -> $INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/pom_a4-em-anthro_input4MIPs_emissions_CMIP_CEDS-CMIP-2025-04-18_gn_175001-202312.nc', -'pom_a4 -> $INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/pom_a4_smoothed_input4MIPs_emissions_CMIP_DRES-CMIP-BB4CMIP7-2-0_gn_175001-202112.nc', -'num_a4 -> $INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/num_bc_a4-em-anthro_input4MIPs_emissions_CMIP_CEDS-CMIP-2025-04-18_gn_175001-202312.nc', -'num_a4 -> $INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/num_bc_a4_smoothed_input4MIPs_emissions_CMIP_DRES-CMIP-BB4CMIP7-2-0_gn_175001-202112.nc', -'num_a4 -> $INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/num_pom_a4-em-anthro_input4MIPs_emissions_CMIP_CEDS-CMIP-2025-04-18_gn_175001-202312.nc', -'num_a4 -> $INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/num_pom_a4_smoothed_input4MIPs_emissions_CMIP_DRES-CMIP-BB4CMIP7-2-0_gn_175001-202112.nc', -'num_a1-> $INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/num_so4_a1_ag-em-anthro_input4MIPs_emissions_CMIP_CEDS-CMIP-2025-04-18_gn_175001-202312.nc', -'num_a1-> $INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/num_so4_a1_ship_slv-em-anthro_input4MIPs_emissions_CMIP_CEDS-CMIP-2025-04-18_gn_175001-202312.nc', -'num_a2-> $INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/num_so4_a2_res_trs-em-anthro_input4MIPs_emissions_CMIP_CEDS-CMIP-2025-04-18_gn_175001-202312.nc', -'so4_a1-> $INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/so4_a1_ag_ship_slv-em-anthro_input4MIPs_emissions_CMIP_CEDS-CMIP-2025-04-18_gn_175001-202312.nc', -'so4_a2-> $INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/so4_a2_res_trs-em-anthro_input4MIPs_emissions_CMIP_CEDS-CMIP-2025-04-18_gn_175001-202312.nc', -'so4_a1-> $INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/SO4_smoothed_input4MIPs_emissions_CMIP_DRES-CMIP-BB4CMIP7-2-0_gn_175001-202112.nc', -'num_a1-> $INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/num_SO4_smoothed_input4MIPs_emissions_CMIP_DRES-CMIP-BB4CMIP7-2-0_gn_175001-202112.nc', -'SO2 -> $INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/SO2-em-anthro_input4MIPs_emissions_CMIP_CEDS-CMIP-2025-04-18_gn_175001-202312.nc', -'SO2 -> $INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/SO2_smoothed_input4MIPs_emissions_CMIP_DRES-CMIP-BB4CMIP7-2-0_gn_175001-202112.nc', -'SOAE -> 0.5954D0*$INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/ISOP_smoothed_input4MIPs_emissions_CMIP_DRES-CMIP-BB4CMIP7-2-0_gn_175001-202112.nc', -'SOAE -> 2.5592D0*$INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/BENZENE_smoothed_input4MIPs_emissions_CMIP_DRES-CMIP-BB4CMIP7-2-0_gn_175001-202112.nc', -'SOAE -> 2.5592D0*$INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/BENZENE-VOC-anthro_input4MIPs_emissions_CMIP_CEDS-CMIP-2025-04-18-supplemental_gn_175001-202312.nc', -'SOAE -> 8.5371D0*$INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/IVOC_smoothed_input4MIPs_emissions_CMIP_DRES-CMIP-BB4CMIP7-2-0_gn_175001-202112.nc', -'SOAE -> 8.5371D0*$INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/IVOC-em-anthro_input4MIPs_emissions_CMIP_CEDS-CMIP-2025-04-18_gn_175001-202312.nc', -'SOAE -> 16.650D0*$INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/SVOC_smoothed_input4MIPs_emissions_CMIP_DRES-CMIP-BB4CMIP7-2-0_gn_175001-202112.nc', -'SOAE -> 16.650D0*$INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/SVOC-em-anthro_input4MIPs_emissions_CMIP_CEDS-CMIP-2025-04-18_gn_175001-202312.nc', -'SOAE -> 8.2367D0*$INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/TOLUENE_smoothed_input4MIPs_emissions_CMIP_DRES-CMIP-BB4CMIP7-2-0_gn_175001-202112.nc', -'SOAE -> 8.2367D0*$INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/TOLUENE-VOC-anthro_input4MIPs_emissions_CMIP_CEDS-CMIP-2025-04-18-supplemental_gn_175001-202312.nc', -'SOAE -> 6.5013D0*$INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/XYLENES_smoothed_input4MIPs_emissions_CMIP_DRES-CMIP-BB4CMIP7-2-0_gn_175001-202112.nc', -'SOAE -> 6.5013D0*$INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/XYLENES-VOC-anthro_input4MIPs_emissions_CMIP_CEDS-CMIP-2025-04-18-supplemental_gn_175001-202312.nc', -'SOAE -> 5.1004D0*$INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/MTERP_smoothed_input4MIPs_emissions_CMIP_DRES-CMIP-BB4CMIP7-2-0_gn_175001-202112.nc' - - -CYCLICAL -1852 - - -1852 - - diff --git a/cime_config/testdefs/testmods_dirs/cam/outfrq9s_leapday/user_nl_cice b/cime_config/testdefs/testmods_dirs/cam/outfrq9s_leapday/user_nl_cice new file mode 100644 index 0000000000..25175d22d4 --- /dev/null +++ b/cime_config/testdefs/testmods_dirs/cam/outfrq9s_leapday/user_nl_cice @@ -0,0 +1,8 @@ +!---------------------------------------------------------------------------------- +! Users should add all user specific namelist changes below in the form of +! namelist_var = new_namelist_value +! Note - that it does not matter what namelist group the namelist_var belongs to +!---------------------------------------------------------------------------------- +histfreq = 'd' +histfreq_n = 1 + diff --git a/cime_config/testdefs/testmods_dirs/cam/outfrq9s_leapday/user_nl_clm b/cime_config/testdefs/testmods_dirs/cam/outfrq9s_leapday/user_nl_clm index 0d83b5367b..da794cc283 100644 --- a/cime_config/testdefs/testmods_dirs/cam/outfrq9s_leapday/user_nl_clm +++ b/cime_config/testdefs/testmods_dirs/cam/outfrq9s_leapday/user_nl_clm @@ -24,4 +24,5 @@ hist_nhtfrq = 9 hist_mfilt = 1 hist_ndens = 1 - +check_finidat_year_consistency = .false. +for_testing_allow_non_annual_changes = .true. diff --git a/cime_config/testdefs/testmods_dirs/cam/outfrq9s_leapday/user_nl_mosart b/cime_config/testdefs/testmods_dirs/cam/outfrq9s_leapday/user_nl_mosart new file mode 100644 index 0000000000..3f64f4bb96 --- /dev/null +++ b/cime_config/testdefs/testmods_dirs/cam/outfrq9s_leapday/user_nl_mosart @@ -0,0 +1,8 @@ +!---------------------------------------------------------------------------------- +! Users should add all user specific namelist changes below in the form of +! namelist_var = new_namelist_value +! NOTE: namelist variable delt_mosart (the time-step) CAN ONLY be changed by modifying the value +! of the xml variable ROF_NCPL in env_run.xml +!---------------------------------------------------------------------------------- +nhtfrq = -24 +