From fbfff4b954e736cd1237955b305986fabd8289f1 Mon Sep 17 00:00:00 2001 From: Cheryl Craig Date: Thu, 11 May 2023 10:49:03 -0600 Subject: [PATCH 01/10] Add 1850 MT and LT use_cases --- bld/namelist_files/use_cases/1850_cam_lt.xml | 65 ++++++++++++++++++++ bld/namelist_files/use_cases/1850_cam_mt.xml | 63 +++++++++++++++++++ cime_config/config_component.xml | 2 + 3 files changed, 130 insertions(+) create mode 100644 bld/namelist_files/use_cases/1850_cam_lt.xml create mode 100644 bld/namelist_files/use_cases/1850_cam_mt.xml diff --git a/bld/namelist_files/use_cases/1850_cam_lt.xml b/bld/namelist_files/use_cases/1850_cam_lt.xml new file mode 100644 index 0000000000..894cb1d557 --- /dev/null +++ b/bld/namelist_files/use_cases/1850_cam_lt.xml @@ -0,0 +1,65 @@ + +atm/cam/solar/SolarForcingCMIP6piControl_c160921.nc + 18500101 + FIXED + + +atm/cam/inic/se/FWsc_ne30pg3_58L_GRID_48_taperstart10km_lowtop_BL10_v3_beta1p75_Top_43km.nc + + +atm/cam/topo/se/ne30pg3_gmted2010_modis_bedmachine_nc3000_Laplace0100_20230105.nc + + +atm/waccm/lb/LBC_17500116-20150116_CMIP6_0p5degLat_c180905.nc +1850 +'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.185001-201412_c230509.nc +CYCLICAL +1850 + + + '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' + 'CYCLICAL' + '' + + + CYCLICAL + 1850 + + +< CYCLICAL + 1850 + +CYCLICAL + + + 3 + 2 + 4 + + + .false. + .false. + .false. diff --git a/bld/namelist_files/use_cases/1850_cam_mt.xml b/bld/namelist_files/use_cases/1850_cam_mt.xml new file mode 100644 index 0000000000..b49c72fd76 --- /dev/null +++ b/bld/namelist_files/use_cases/1850_cam_mt.xml @@ -0,0 +1,63 @@ + +atm/cam/solar/SolarForcingCMIP6piControl_c160921.nc + 18500101 + FIXED + + +atm/cam/inic/se/L93_ne30pg3_ne30pg3_mg17_450_short.cam.i.1979-01-07-00000.nc + + +atm/cam/topo/se/ne30pg3_gmted2010_modis_bedmachine_nc3000_Laplace0100_20230105.nc + + +atm/waccm/lb/LBC_17500116-20150116_CMIP6_0p5degLat_c180905.nc +1850 +'CYCLICAL' +'CO2','CH4','N2O','CFC11','CFC12','CFC11eq' + + + + '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' + 'CYCLICAL' + '' + + + CYCLICAL + 1850 + + +< CYCLICAL + 1850 + +CYCLICAL + + + 6 + 3 + 3 + + + .false. + .true. + .true. + + .true. + 1.E6 diff --git a/cime_config/config_component.xml b/cime_config/config_component.xml index 897e69b3b8..78645415a8 100644 --- a/cime_config/config_component.xml +++ b/cime_config/config_component.xml @@ -207,6 +207,8 @@ waccm_tsmlt_1850_cam6 waccm_ma_1850_cam6 waccm_sc_1850_cam6 + 1850_cam_lt + 1850_cam_mt 2000_cam4_trop_chem waccmxie_ma_2000_cam4 From f92e5023d49ddc7d60f864fcc345f8e40dbc2c96 Mon Sep 17 00:00:00 2001 From: Cheryl Craig Date: Thu, 11 May 2023 16:05:05 -0600 Subject: [PATCH 02/10] Correct typos - Cecile's initial run --- bld/namelist_files/use_cases/1850_cam_lt.xml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/bld/namelist_files/use_cases/1850_cam_lt.xml b/bld/namelist_files/use_cases/1850_cam_lt.xml index 894cb1d557..c15efadecc 100644 --- a/bld/namelist_files/use_cases/1850_cam_lt.xml +++ b/bld/namelist_files/use_cases/1850_cam_lt.xml @@ -1,3 +1,6 @@ + + + atm/cam/solar/SolarForcingCMIP6piControl_c160921.nc 18500101 @@ -49,10 +52,11 @@ 1850 -< CYCLICAL + CYCLICAL 1850 CYCLICAL +1850 3 @@ -63,3 +67,6 @@ .false. .false. .false. + + + From 00144d070e31746a988695e0ff812248e105ce2d Mon Sep 17 00:00:00 2001 From: Cheryl Craig Date: Thu, 11 May 2023 16:24:03 -0600 Subject: [PATCH 03/10] Fix typos in MT and update comments --- bld/namelist_files/use_cases/1850_cam_lt.xml | 8 ++++---- bld/namelist_files/use_cases/1850_cam_mt.xml | 17 ++++++++++++----- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/bld/namelist_files/use_cases/1850_cam_lt.xml b/bld/namelist_files/use_cases/1850_cam_lt.xml index c15efadecc..2064e60b23 100644 --- a/bld/namelist_files/use_cases/1850_cam_lt.xml +++ b/bld/namelist_files/use_cases/1850_cam_lt.xml @@ -12,7 +12,7 @@ atm/cam/topo/se/ne30pg3_gmted2010_modis_bedmachine_nc3000_Laplace0100_20230105.nc - + atm/waccm/lb/LBC_17500116-20150116_CMIP6_0p5degLat_c180905.nc 1850 'CYCLICAL' @@ -24,14 +24,14 @@ CYCLICAL 1850 - + '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' @@ -39,7 +39,7 @@ 'CYCLICAL' - + 1850 'atm/cam/tracer_cnst' 'tracer_cnst_WACCM6_halons_3DmonthlyL70_1850climoCMIP6piControl001_y21-50avg_c180802.nc' diff --git a/bld/namelist_files/use_cases/1850_cam_mt.xml b/bld/namelist_files/use_cases/1850_cam_mt.xml index b49c72fd76..6be7ba9f3d 100644 --- a/bld/namelist_files/use_cases/1850_cam_mt.xml +++ b/bld/namelist_files/use_cases/1850_cam_mt.xml @@ -1,3 +1,6 @@ + + + atm/cam/solar/SolarForcingCMIP6piControl_c160921.nc 18500101 @@ -9,21 +12,21 @@ atm/cam/topo/se/ne30pg3_gmted2010_modis_bedmachine_nc3000_Laplace0100_20230105.nc - + atm/waccm/lb/LBC_17500116-20150116_CMIP6_0p5degLat_c180905.nc 1850 'CYCLICAL' 'CO2','CH4','N2O','CFC11','CFC12','CFC11eq' - + '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' @@ -31,7 +34,7 @@ 'CYCLICAL' - + 1850 'atm/cam/tracer_cnst' 'tracer_cnst_WACCM6_halons_3DmonthlyL70_1850climoCMIP6piControl001_y21-50avg_c180802.nc' @@ -44,10 +47,11 @@ 1850 -< CYCLICAL + CYCLICAL 1850 CYCLICAL +1850 6 @@ -61,3 +65,6 @@ .true. 1.E6 + + + From 174294a6298602ac7c8314a482fd30e4bb1469fb Mon Sep 17 00:00:00 2001 From: Cheryl Craig Date: Fri, 12 May 2023 14:59:54 -0600 Subject: [PATCH 04/10] Update ext_frc_specifier in all LT and MT use_cases --- bld/namelist_files/use_cases/1850_cam_lt.xml | 9 +++++++++ bld/namelist_files/use_cases/1850_cam_mt.xml | 9 +++++++++ bld/namelist_files/use_cases/hist_cam_lt.xml | 9 +++++++++ bld/namelist_files/use_cases/hist_cam_mt.xml | 9 +++++++++ 4 files changed, 36 insertions(+) diff --git a/bld/namelist_files/use_cases/1850_cam_lt.xml b/bld/namelist_files/use_cases/1850_cam_lt.xml index 2064e60b23..327e77d735 100644 --- a/bld/namelist_files/use_cases/1850_cam_lt.xml +++ b/bld/namelist_files/use_cases/1850_cam_lt.xml @@ -50,6 +50,15 @@ CYCLICAL 1850 + + 'num_a1 -> $INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/emissions-cmip6_num_so4_a1_anthro-ene_vertical_mol_175001-201412_ne30pg3_c20200103.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', + 'SO2 -> $INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/emissions-cmip6_SO2_contvolcano_vertical_850-5000_ne30pg3_c20200125.nc', + 'so4_a1 -> $INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/emissions-cmip6_so4_a1_anthro-ene_vertical_mol_175001-201412_ne30pg3_c20200103.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' + CYCLICAL diff --git a/bld/namelist_files/use_cases/1850_cam_mt.xml b/bld/namelist_files/use_cases/1850_cam_mt.xml index 6be7ba9f3d..e8b8b5855c 100644 --- a/bld/namelist_files/use_cases/1850_cam_mt.xml +++ b/bld/namelist_files/use_cases/1850_cam_mt.xml @@ -45,6 +45,15 @@ CYCLICAL 1850 + + 'num_a1 -> $INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/emissions-cmip6_num_so4_a1_anthro-ene_vertical_mol_175001-201412_ne30pg3_c20200103.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', + 'SO2 -> $INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/emissions-cmip6_SO2_contvolcano_vertical_850-5000_ne30pg3_c20200125.nc', + 'so4_a1 -> $INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/emissions-cmip6_so4_a1_anthro-ene_vertical_mol_175001-201412_ne30pg3_c20200103.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' + CYCLICAL diff --git a/bld/namelist_files/use_cases/hist_cam_lt.xml b/bld/namelist_files/use_cases/hist_cam_lt.xml index 76d0f8b0a0..2a4622eb14 100644 --- a/bld/namelist_files/use_cases/hist_cam_lt.xml +++ b/bld/namelist_files/use_cases/hist_cam_lt.xml @@ -43,6 +43,15 @@ INTERP_MISSING_MONTHS + + 'num_a1 -> $INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/emissions-cmip6_num_so4_a1_anthro-ene_vertical_mol_175001-201412_ne30pg3_c20200103.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', + 'SO2 -> $INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/emissions-cmip6_SO2_contvolcano_vertical_850-5000_ne30pg3_c20200125.nc', + 'so4_a1 -> $INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/emissions-cmip6_so4_a1_anthro-ene_vertical_mol_175001-201412_ne30pg3_c20200103.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' + INTERP_MISSING_MONTHS diff --git a/bld/namelist_files/use_cases/hist_cam_mt.xml b/bld/namelist_files/use_cases/hist_cam_mt.xml index 9f8ae88ec8..f9c7704e18 100644 --- a/bld/namelist_files/use_cases/hist_cam_mt.xml +++ b/bld/namelist_files/use_cases/hist_cam_mt.xml @@ -38,6 +38,15 @@ INTERP_MISSING_MONTHS + + 'num_a1 -> $INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/emissions-cmip6_num_so4_a1_anthro-ene_vertical_mol_175001-201412_ne30pg3_c20200103.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', + 'SO2 -> $INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/emissions-cmip6_SO2_contvolcano_vertical_850-5000_ne30pg3_c20200125.nc', + 'so4_a1 -> $INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/emissions-cmip6_so4_a1_anthro-ene_vertical_mol_175001-201412_ne30pg3_c20200103.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' + INTERP_MISSING_MONTHS From 8172c51d9e178e80e747ff1b53648b4f7bf9e69e Mon Sep 17 00:00:00 2001 From: Cheryl Craig Date: Fri, 12 May 2023 16:21:02 -0600 Subject: [PATCH 05/10] Updated tracer_cnst_specifier --- bld/namelist_files/use_cases/1850_cam_lt.xml | 2 +- bld/namelist_files/use_cases/1850_cam_mt.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bld/namelist_files/use_cases/1850_cam_lt.xml b/bld/namelist_files/use_cases/1850_cam_lt.xml index 327e77d735..d0de3329c5 100644 --- a/bld/namelist_files/use_cases/1850_cam_lt.xml +++ b/bld/namelist_files/use_cases/1850_cam_lt.xml @@ -43,7 +43,7 @@ 1850 'atm/cam/tracer_cnst' 'tracer_cnst_WACCM6_halons_3DmonthlyL70_1850climoCMIP6piControl001_y21-50avg_c180802.nc' - 'O3','OH','NO3','HO2' + 'O3','OH','NO3','HO2','HALONS' 'CYCLICAL' '' diff --git a/bld/namelist_files/use_cases/1850_cam_mt.xml b/bld/namelist_files/use_cases/1850_cam_mt.xml index e8b8b5855c..a987583778 100644 --- a/bld/namelist_files/use_cases/1850_cam_mt.xml +++ b/bld/namelist_files/use_cases/1850_cam_mt.xml @@ -38,7 +38,7 @@ 1850 'atm/cam/tracer_cnst' 'tracer_cnst_WACCM6_halons_3DmonthlyL70_1850climoCMIP6piControl001_y21-50avg_c180802.nc' - 'O3','OH','NO3','HO2' + 'O3','OH','NO3','HO2','HALONS' 'CYCLICAL' '' From d8b2566f67b988a82bb533a1970f73ba9bfb2a22 Mon Sep 17 00:00:00 2001 From: Cheryl Craig Date: Fri, 12 May 2023 18:01:19 -0600 Subject: [PATCH 06/10] Use updated ubc file in correct netCDF format --- bld/namelist_files/use_cases/1850_cam_lt.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bld/namelist_files/use_cases/1850_cam_lt.xml b/bld/namelist_files/use_cases/1850_cam_lt.xml index d0de3329c5..5603382aad 100644 --- a/bld/namelist_files/use_cases/1850_cam_lt.xml +++ b/bld/namelist_files/use_cases/1850_cam_lt.xml @@ -20,7 +20,7 @@ 'Q:H2O->UBC_FILE' -atm/cam/chem/ubc/b.e21.BWHIST.f09_g17.CMIP6-historical-WACCM.ensAvg123.cam.h0zm.H2O.185001-201412_c230509.nc +atm/cam/chem/ubc/b.e21.BWHIST.f09_g17.CMIP6-historical-WACCM.ensAvg123.cam.h0zm.H2O.185001-201412_c230509cdf5.nc CYCLICAL 1850 From 006719876ffc0f54b8541c7663924a7f3ab30f48 Mon Sep 17 00:00:00 2001 From: Francis Vitt Date: Tue, 16 May 2023 10:24:50 -0600 Subject: [PATCH 07/10] changes for default namelist settings; add FMT1850 and FLT1850 compsets for testing modified: bld/build-namelist modified: bld/namelist_files/namelist_defaults_cam.xml modified: bld/namelist_files/use_cases/1850_cam_lt.xml modified: bld/namelist_files/use_cases/1850_cam_mt.xml modified: bld/namelist_files/use_cases/hist_cam_lt.xml modified: bld/namelist_files/use_cases/hist_cam_mt.xml modified: cime_config/config_compsets.xml --- bld/build-namelist | 2 +- bld/namelist_files/namelist_defaults_cam.xml | 5 +++- bld/namelist_files/use_cases/1850_cam_lt.xml | 18 ++------------ bld/namelist_files/use_cases/1850_cam_mt.xml | 17 ------------- bld/namelist_files/use_cases/hist_cam_lt.xml | 22 ----------------- bld/namelist_files/use_cases/hist_cam_mt.xml | 25 -------------------- cime_config/config_compsets.xml | 10 ++++++++ 7 files changed, 17 insertions(+), 82 deletions(-) diff --git a/bld/build-namelist b/bld/build-namelist index 2cec1b4a51..8e7ea8d2b2 100755 --- a/bld/build-namelist +++ b/bld/build-namelist @@ -2384,7 +2384,7 @@ if (($chem =~ /_mam4/ or $chem =~ /_mam5/) and ($phys =~ /cam6/ or $phys =~ /cam } # for cam6 add h2o source from methane oxidation - if ($chem =~ /trop_mam/ or $chem =~ /ghg_mam/) { + if ($chem =~ /trop_mam/) { %species = (%species, 'h2o_ch4ox_ext_file' => 'H2O'); } # for mechanisms without OCS use prescribed OCS oxidation rates for diff --git a/bld/namelist_files/namelist_defaults_cam.xml b/bld/namelist_files/namelist_defaults_cam.xml index 3444771dae..d69b278d90 100644 --- a/bld/namelist_files/namelist_defaults_cam.xml +++ b/bld/namelist_files/namelist_defaults_cam.xml @@ -741,7 +741,9 @@ .true. .true. .true. -.false. +.false. +.false. +.false. .false. .false. .false. @@ -2977,6 +2979,7 @@ 3 2 4 + 4 3 1 diff --git a/bld/namelist_files/use_cases/1850_cam_lt.xml b/bld/namelist_files/use_cases/1850_cam_lt.xml index 5603382aad..f3c043d55b 100644 --- a/bld/namelist_files/use_cases/1850_cam_lt.xml +++ b/bld/namelist_files/use_cases/1850_cam_lt.xml @@ -9,9 +9,6 @@ atm/cam/inic/se/FWsc_ne30pg3_58L_GRID_48_taperstart10km_lowtop_BL10_v3_beta1p75_Top_43km.nc - -atm/cam/topo/se/ne30pg3_gmted2010_modis_bedmachine_nc3000_Laplace0100_20230105.nc - atm/waccm/lb/LBC_17500116-20150116_CMIP6_0p5degLat_c180905.nc 1850 @@ -50,7 +47,7 @@ CYCLICAL 1850 - + 'num_a1 -> $INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/emissions-cmip6_num_so4_a1_anthro-ene_vertical_mol_175001-201412_ne30pg3_c20200103.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', @@ -58,7 +55,7 @@ 'so4_a1 -> $INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/emissions-cmip6_so4_a1_anthro-ene_vertical_mol_175001-201412_ne30pg3_c20200103.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' - + CYCLICAL @@ -67,15 +64,4 @@ CYCLICAL 1850 - - 3 - 2 - 4 - - - .false. - .false. - .false. - - diff --git a/bld/namelist_files/use_cases/1850_cam_mt.xml b/bld/namelist_files/use_cases/1850_cam_mt.xml index a987583778..67049703f3 100644 --- a/bld/namelist_files/use_cases/1850_cam_mt.xml +++ b/bld/namelist_files/use_cases/1850_cam_mt.xml @@ -9,9 +9,6 @@ atm/cam/inic/se/L93_ne30pg3_ne30pg3_mg17_450_short.cam.i.1979-01-07-00000.nc - -atm/cam/topo/se/ne30pg3_gmted2010_modis_bedmachine_nc3000_Laplace0100_20230105.nc - atm/waccm/lb/LBC_17500116-20150116_CMIP6_0p5degLat_c180905.nc 1850 @@ -62,18 +59,4 @@ CYCLICAL 1850 - - 6 - 3 - 3 - - - .false. - .true. - .true. - - .true. - 1.E6 - - diff --git a/bld/namelist_files/use_cases/hist_cam_lt.xml b/bld/namelist_files/use_cases/hist_cam_lt.xml index 2a4622eb14..577610275c 100644 --- a/bld/namelist_files/use_cases/hist_cam_lt.xml +++ b/bld/namelist_files/use_cases/hist_cam_lt.xml @@ -9,9 +9,6 @@ atm/cam/inic/se/FWsc_ne30pg3_58L_GRID_48_taperstart10km_lowtop_BL10_v3_beta1p75_Top_43km.nc - -atm/cam/topo/se/ne30pg3_gmted2010_modis_bedmachine_nc3000_Laplace0100_20230105.nc - atm/waccm/lb/LBC_17500116-20150116_CMIP6_0p5degLat_c180905.nc 'SERIAL' @@ -43,28 +40,9 @@ INTERP_MISSING_MONTHS - - 'num_a1 -> $INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/emissions-cmip6_num_so4_a1_anthro-ene_vertical_mol_175001-201412_ne30pg3_c20200103.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', - 'SO2 -> $INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/emissions-cmip6_SO2_contvolcano_vertical_850-5000_ne30pg3_c20200125.nc', - 'so4_a1 -> $INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/emissions-cmip6_so4_a1_anthro-ene_vertical_mol_175001-201412_ne30pg3_c20200103.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' - INTERP_MISSING_MONTHS SERIAL - - 3 - 2 - 4 - - - .false. - .false. - .false. - diff --git a/bld/namelist_files/use_cases/hist_cam_mt.xml b/bld/namelist_files/use_cases/hist_cam_mt.xml index f9c7704e18..08c53aa595 100644 --- a/bld/namelist_files/use_cases/hist_cam_mt.xml +++ b/bld/namelist_files/use_cases/hist_cam_mt.xml @@ -9,9 +9,6 @@ atm/cam/inic/se/L93_ne30pg3_ne30pg3_mg17_450_short.cam.i.1979-01-07-00000.nc - -atm/cam/topo/se/ne30pg3_gmted2010_modis_bedmachine_nc3000_Laplace0100_20230105.nc - atm/waccm/lb/LBC_17500116-20150116_CMIP6_0p5degLat_c180905.nc 'SERIAL' @@ -38,31 +35,9 @@ INTERP_MISSING_MONTHS - - 'num_a1 -> $INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/emissions-cmip6_num_so4_a1_anthro-ene_vertical_mol_175001-201412_ne30pg3_c20200103.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', - 'SO2 -> $INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/emissions-cmip6_SO2_contvolcano_vertical_850-5000_ne30pg3_c20200125.nc', - 'so4_a1 -> $INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/emissions-cmip6_so4_a1_anthro-ene_vertical_mol_175001-201412_ne30pg3_c20200103.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' - INTERP_MISSING_MONTHS SERIAL - - 6 - 3 - 3 - - - .false. - .true. - .true. - - .true. - 1.E6 - diff --git a/cime_config/config_compsets.xml b/cime_config/config_compsets.xml index a15edf378e..6cc8872de5 100644 --- a/cime_config/config_compsets.xml +++ b/cime_config/config_compsets.xml @@ -71,6 +71,16 @@ HIST_CAM%DEV%MT%GHGMAM4_CLM51%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV + + FLT1850 + 1850_CAM%DEV%LT%GHGMAM4_CLM51%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV + + + + FMT1850 + 1850_CAM%DEV%MT%GHGMAM4_CLM51%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV + + FHIST_BGC HIST_CAM60_CLM50%BGC-CROP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV From 74c14fd9c14711c7256d9ed9e36a75d9cc143614 Mon Sep 17 00:00:00 2001 From: Cheryl Craig Date: Tue, 16 May 2023 17:58:14 -0600 Subject: [PATCH 08/10] Preliminary ChangeLog --- doc/ChangeLog | 85 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 85 insertions(+) diff --git a/doc/ChangeLog b/doc/ChangeLog index b81fd8983d..6b579bafbe 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,5 +1,90 @@ =============================================================== +Tag name: cam6_3_111 +Originator(s): cacraig, hannay, fvitt +Date: May 17, 2023 +One-line Summary: create CAM LT and MT 1850 use_cases +Github PR URL: https://github.com/ESCOMP/CAM/pull/806 + +Purpose of changes (include the issue number and title text for each relevant GitHub issue): + - Add use_cases for 1850 LT and MT compsets: https://github.com/ESCOMP/CAM/issues/804 + IMPORTANT NOTE -- LT compsets do not restart + MT compsets do not run successfully for 9 time steps + +Describe any changes made to build system: N/A + +Describe any changes made to the namelist: + - See specific details below in file section: + Updated namelist settings based on discussion in: https://github.com/NCAR/amwg_dev/discussions/261 + +List any changes to the defaults for the boundary datasets: N/A + +Describe any substantial timing or memory changes: N/A + +Code reviewed by: hannay + +List all files eliminated: N/A + +List all files added and what they do: +A bld/namelist_files/use_cases/1850_cam_lt.xml +A bld/namelist_files/use_cases/1850_cam_mt.xml + - Initial use cases - setup for BLT1850 and BMT1850 to use + +List all existing files that have been modified, and describe the changes: +M bld/build-namelist + - Remove H2O ext_file from ghg_mam runs + +M bld/namelist_files/namelist_defaults_cam.xml + - Added gw_apply_tndmz defaults for ghg_mam4 93 and 58 level + - Added se_hypervis_subcycle default for ne30np4, npg3, 58 level + +M bld/namelist_files/use_cases/hist_cam_lt.xml +M bld/namelist_files/use_cases/hist_cam_mt.xml + - Removed the above settings and others which are set properly via namelist_defaults + +M cime_config/config_compsets.xml + ????????????????????????????????????DO WE WANT TO KEEP TEMPORARILY?????????????????????????????????? + ????????????????????????????????????DO WE WANT TO KEEP TEMPORARILY?????????????????????????????????? + ????????????????????????????????????DO WE WANT TO KEEP TEMPORARILY?????????????????????????????????? + ????????????????????????????????????DO WE WANT TO KEEP TEMPORARILY?????????????????????????????????? + ????????????????????????????????????DO WE WANT TO KEEP TEMPORARILY?????????????????????????????????? + + +If there were any failures reported from running test_driver.sh on any test +platform, and checkin with these failures has been OK'd by the gatekeeper, +then copy the lines from the td.*.status files for the failed tests to the +appropriate machine below. All failed tests must be justified. + +cheyenne/intel/aux_cam: + +izumi/nag/aux_cam: + +izumi/gnu/aux_cam: + +ADDITIONAL TESTS: +FLTHIST_v0c: Didn't quite complete, but 3 restart files were BFB with 9 timestep original run: + /glade/scratch/cacraig/ERP_D_Ln9_Vnuopc.ne30pg3_ne30pg3_mg17.FLTHIST_v0c.cheyenne_intel.cam-outfrq9s.20230516_144724_gs6zve +FLT1850: Finished original 9 timestep run, but stopped during initialization in restart, no error reported: + /glade/scratch/cacraig/ERP_D_Ln9_Vnuopc.ne30pg3_ne30pg3_mg17.FLT1850.cheyenne_intel.cam-outfrq9s.20230516_143553_k4i9e6 +FMTHIST_v0c: Stops during initialization - no error reported + /glade/scratch/cacraig/ERP_D_Ln9_Vnuopc.ne30pg3_ne30pg3_mg17.FMTHIST_v0c.cheyenne_intel.cam-outfrq9s.20230516_144956_aw8gtc +FMT1850: Stops during initialization - no error reported + /glade/scratch/cacraig/ERP_D_Ln9_Vnuopc.ne30pg3_ne30pg3_mg17.FMT1850.cheyenne_intel.cam-outfrq9s.20230516_144426_n4qhss + +NONDEBUG RESTART TESTS: +FLTHIST_v0c: Finished original 9 timestep run, but stopped during initialization in restart, no error reported: + /glade/scratch/cacraig/ERP_Ln9_Vnuopc.ne30pg3_ne30pg3_mg17.FLTHIST_v0c.cheyenne_intel.cam-outfrq9s.20230516_163931_c3lrrw +FLT1850: Finished original 9 timestep run, but stopped during initialization in restart, no error reported: + /glade/scratch/cacraig/ERP_Ln9_Vnuopc.ne30pg3_ne30pg3_mg17.FLT1850.cheyenne_intel.cam-outfrq9s.20230516_164207_isfo08 +FMTHIST_v0c: Stops during initialization - 36:MPT ERROR: Rank 36(g:36) received signal SIGBUS(7). (no traceback) + /glade/scratch/cacraig/ERP_Ln9_Vnuopc.ne30pg3_ne30pg3_mg17.FMTHIST_v0c.cheyenne_intel.cam-outfrq9s.20230516_164356_y2jmbv +FMT1850: Ran for 5 timesteps and stopped during writes? + /glade/scratch/cacraig/ERP_Ln9_Vnuopc.ne30pg3_ne30pg3_mg17.FMT1850.cheyenne_intel.cam-outfrq9s.20230516_164528_0anan8 + + +=============================================================== +=============================================================== + Tag name: cam6_3_110 Originator(s): eaton, bstephens Date: Tue May 9 01:46:34 PM EDT 2023 From f42c6b014d74a7b13c30d39d547c2bd06d4d9d14 Mon Sep 17 00:00:00 2001 From: Cheryl Craig Date: Wed, 17 May 2023 13:10:30 -0600 Subject: [PATCH 09/10] Update compset name and final ChangeLog for cam6_3_111 --- cime_config/config_compsets.xml | 4 +-- doc/ChangeLog | 55 ++++++++++++++++----------------- 2 files changed, 28 insertions(+), 31 deletions(-) diff --git a/cime_config/config_compsets.xml b/cime_config/config_compsets.xml index 6cc8872de5..90991b3cf0 100644 --- a/cime_config/config_compsets.xml +++ b/cime_config/config_compsets.xml @@ -72,12 +72,12 @@ - FLT1850 + FLT1850_TESTINGONLY_v0c 1850_CAM%DEV%LT%GHGMAM4_CLM51%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV - FMT1850 + FMT1850_TESTINGONLY_v0c 1850_CAM%DEV%MT%GHGMAM4_CLM51%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV diff --git a/doc/ChangeLog b/doc/ChangeLog index 6b579bafbe..77ceedc1b6 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -8,8 +8,8 @@ Github PR URL: https://github.com/ESCOMP/CAM/pull/806 Purpose of changes (include the issue number and title text for each relevant GitHub issue): - Add use_cases for 1850 LT and MT compsets: https://github.com/ESCOMP/CAM/issues/804 - IMPORTANT NOTE -- LT compsets do not restart - MT compsets do not run successfully for 9 time steps + + *** IMPORTANT NOTE -- MT compsets do not run successfully for 9 time steps Describe any changes made to build system: N/A @@ -21,7 +21,7 @@ List any changes to the defaults for the boundary datasets: N/A Describe any substantial timing or memory changes: N/A -Code reviewed by: hannay +Code reviewed by: hannay, nusbaume List all files eliminated: N/A @@ -43,11 +43,7 @@ M bld/namelist_files/use_cases/hist_cam_mt.xml - Removed the above settings and others which are set properly via namelist_defaults M cime_config/config_compsets.xml - ????????????????????????????????????DO WE WANT TO KEEP TEMPORARILY?????????????????????????????????? - ????????????????????????????????????DO WE WANT TO KEEP TEMPORARILY?????????????????????????????????? - ????????????????????????????????????DO WE WANT TO KEEP TEMPORARILY?????????????????????????????????? - ????????????????????????????????????DO WE WANT TO KEEP TEMPORARILY?????????????????????????????????? - ????????????????????????????????????DO WE WANT TO KEEP TEMPORARILY?????????????????????????????????? + - Added for Testing purposes ONLY - FLT1850_TESTINGONLY_v0c and FMT1850_TESTINGONLY_v0c If there were any failures reported from running test_driver.sh on any test @@ -56,30 +52,31 @@ then copy the lines from the td.*.status files for the failed tests to the appropriate machine below. All failed tests must be justified. cheyenne/intel/aux_cam: + FAIL ERP_Ln9_Vnuopc.ne30pg3_ne30pg3_mg17.FW2000climo.cheyenne_intel.cam-outfrq9s_wcm_ne30 RUN time=266 + - preexisting failure -izumi/nag/aux_cam: + FAIL ERS_Ln9_P36x1_Vnuopc.mpasa480_mpasa480.F2000climo.cheyenne_intel.cam-outfrq9s_mpasa480 RUN time=357 + - This test passed for Brian Eaton when he made cam6_3_110. We retested and Francis Vitt had it fail for + cam6_3_109. Cheryl Craig tested using cam6_3_110 and cam6_3_108 and it failed in both of these version. + Saying this is a preexisting failure and will be researched later -izumi/gnu/aux_cam: + FAIL ERS_Ld3_Vnuopc.f10_f10_mg37.F1850.cheyenne_intel.cam-outfrq1d_14dec_ghg_cam_dev BASELINE + FAIL SMS_D_Ln9_Vnuopc_P720x1.ne30pg3_ne30pg3_mg17.FCLTHIST.cheyenne_intel.cam-outfrq9s BASELINE + - expected baselines differences due to namelist changes + + +izumi/nag/aux_cam: all BFB except: + FAIL DAE_Vnuopc.f45_f45_mg37.FHS94.izumi_nag.cam-dae RUN time=10 + + +izumi/gnu/aux_cam: all BFB + +ADDITIONAL TESTS RUN: -ADDITIONAL TESTS: -FLTHIST_v0c: Didn't quite complete, but 3 restart files were BFB with 9 timestep original run: - /glade/scratch/cacraig/ERP_D_Ln9_Vnuopc.ne30pg3_ne30pg3_mg17.FLTHIST_v0c.cheyenne_intel.cam-outfrq9s.20230516_144724_gs6zve -FLT1850: Finished original 9 timestep run, but stopped during initialization in restart, no error reported: - /glade/scratch/cacraig/ERP_D_Ln9_Vnuopc.ne30pg3_ne30pg3_mg17.FLT1850.cheyenne_intel.cam-outfrq9s.20230516_143553_k4i9e6 -FMTHIST_v0c: Stops during initialization - no error reported - /glade/scratch/cacraig/ERP_D_Ln9_Vnuopc.ne30pg3_ne30pg3_mg17.FMTHIST_v0c.cheyenne_intel.cam-outfrq9s.20230516_144956_aw8gtc -FMT1850: Stops during initialization - no error reported - /glade/scratch/cacraig/ERP_D_Ln9_Vnuopc.ne30pg3_ne30pg3_mg17.FMT1850.cheyenne_intel.cam-outfrq9s.20230516_144426_n4qhss - -NONDEBUG RESTART TESTS: -FLTHIST_v0c: Finished original 9 timestep run, but stopped during initialization in restart, no error reported: - /glade/scratch/cacraig/ERP_Ln9_Vnuopc.ne30pg3_ne30pg3_mg17.FLTHIST_v0c.cheyenne_intel.cam-outfrq9s.20230516_163931_c3lrrw -FLT1850: Finished original 9 timestep run, but stopped during initialization in restart, no error reported: - /glade/scratch/cacraig/ERP_Ln9_Vnuopc.ne30pg3_ne30pg3_mg17.FLT1850.cheyenne_intel.cam-outfrq9s.20230516_164207_isfo08 -FMTHIST_v0c: Stops during initialization - 36:MPT ERROR: Rank 36(g:36) received signal SIGBUS(7). (no traceback) - /glade/scratch/cacraig/ERP_Ln9_Vnuopc.ne30pg3_ne30pg3_mg17.FMTHIST_v0c.cheyenne_intel.cam-outfrq9s.20230516_164356_y2jmbv -FMT1850: Ran for 5 timesteps and stopped during writes? - /glade/scratch/cacraig/ERP_Ln9_Vnuopc.ne30pg3_ne30pg3_mg17.FMT1850.cheyenne_intel.cam-outfrq9s.20230516_164528_0anan8 + Cecile ran FLTHIST and FLT1850 tests with restart and they ran properly (with user_nl_cam, user_nl_clm, CLM SourceMods and + various XML settings): + /glade/scratch/hannay/cases/f.cam6_3_111.FLT1850.001 + /glade/scratch/hannay/cases/f.cam6_3_111.FLTHIST_v0c.001 =============================================================== From dc86625bbf4525947dc74adf63e697c987316e90 Mon Sep 17 00:00:00 2001 From: Cheryl Craig Date: Wed, 17 May 2023 13:12:19 -0600 Subject: [PATCH 10/10] add one more entry to ChangeLog --- doc/ChangeLog | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/ChangeLog b/doc/ChangeLog index 77ceedc1b6..5d77cc2f5a 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -42,6 +42,9 @@ M bld/namelist_files/use_cases/hist_cam_lt.xml M bld/namelist_files/use_cases/hist_cam_mt.xml - Removed the above settings and others which are set properly via namelist_defaults +M cime_config/config_component.xml + - Added hooks for 1850 LT and MT use_cases + M cime_config/config_compsets.xml - Added for Testing purposes ONLY - FLT1850_TESTINGONLY_v0c and FMT1850_TESTINGONLY_v0c