From 5fef0ae6c1e2954004638b54e1ca1cc2cbcd5fd7 Mon Sep 17 00:00:00 2001 From: Francis Vitt Date: Fri, 15 Nov 2024 13:02:10 -0700 Subject: [PATCH 1/2] Initial changes for 1850 climate chemistry compsets modified: bld/namelist_files/mozart_master_gas_drydep_list.xml modified: bld/namelist_files/mozart_master_gas_wetdep_list.xml modified: cime_config/config_component.xml modified: src/cpl/nuopc/atm_stream_ndep.F90 new file: bld/namelist_files/use_cases/1850_trop_strat_t4s_cam7.xml renamed: bld/namelist_files/use_cases/hist_trop_strat_ts4_cam7.xml -> bld/namelist_files/use_cases/hist_trop_strat_t4s_cam7.xml --- .../mozart_master_gas_drydep_list.xml | 1 - .../mozart_master_gas_wetdep_list.xml | 2 - .../use_cases/1850_trop_strat_t4s_cam7.xml | 51 +++++++++++++++++++ ..._cam7.xml => hist_trop_strat_t4s_cam7.xml} | 3 ++ cime_config/config_component.xml | 3 +- src/cpl/nuopc/atm_stream_ndep.F90 | 2 +- 6 files changed, 57 insertions(+), 5 deletions(-) create mode 100644 bld/namelist_files/use_cases/1850_trop_strat_t4s_cam7.xml rename bld/namelist_files/use_cases/{hist_trop_strat_ts4_cam7.xml => hist_trop_strat_t4s_cam7.xml} (92%) diff --git a/bld/namelist_files/mozart_master_gas_drydep_list.xml b/bld/namelist_files/mozart_master_gas_drydep_list.xml index 7343d3f341..2d5264216c 100644 --- a/bld/namelist_files/mozart_master_gas_drydep_list.xml +++ b/bld/namelist_files/mozart_master_gas_drydep_list.xml @@ -77,7 +77,6 @@ ISOPNOOHB ISOPNOOHD ISOPOH - ISOPNO3 ISOPOOH LIMON MACR diff --git a/bld/namelist_files/mozart_master_gas_wetdep_list.xml b/bld/namelist_files/mozart_master_gas_wetdep_list.xml index c82ed1fcfa..c937493abe 100644 --- a/bld/namelist_files/mozart_master_gas_wetdep_list.xml +++ b/bld/namelist_files/mozart_master_gas_wetdep_list.xml @@ -127,7 +127,6 @@ HOCL HYAC HYDRALD - ISOPNO3 ISOPOOH MACR MACRN @@ -172,7 +171,6 @@ XHO2NO2 XONIT XONITR - XISOPNO3 diff --git a/bld/namelist_files/use_cases/1850_trop_strat_t4s_cam7.xml b/bld/namelist_files/use_cases/1850_trop_strat_t4s_cam7.xml new file mode 100644 index 0000000000..03fe2a3a6d --- /dev/null +++ b/bld/namelist_files/use_cases/1850_trop_strat_t4s_cam7.xml @@ -0,0 +1,51 @@ + + + + + +atm/cam/inic/se/1850C_T4S_ne30pg3_spinup01.cam.i.0002-01-01_c241114.nc + + +atm/cam/solar/SolarForcingCMIP6_18491230-23000102_c20200615.nc +FIXED +18500701 + + +CYCLICAL +1850 + + +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 +1850 + + +CYCLICAL +1850 +atm/waccm/lb/LBC_17500116-25001216_CMIP6_SSP585_0p5degLat_c20200824.nc + + 'CCL4', 'CF2CLBR', 'CF3BR', 'CFC11', 'CFC113', 'CFC12', 'CH3BR', 'CH3CCL3', 'CH3CL', 'CH4', 'CO2', 'H2', + 'HCFC22', 'N2O', 'CFC114', 'CFC115', 'HCFC141B', 'HCFC142B', 'H2402', 'OCS', 'SF6', 'CFC11eq' + + + +.true. +.false. +.false. + + + + + diff --git a/bld/namelist_files/use_cases/hist_trop_strat_ts4_cam7.xml b/bld/namelist_files/use_cases/hist_trop_strat_t4s_cam7.xml similarity index 92% rename from bld/namelist_files/use_cases/hist_trop_strat_ts4_cam7.xml rename to bld/namelist_files/use_cases/hist_trop_strat_t4s_cam7.xml index 4e65f4f34c..56a0e75b1f 100644 --- a/bld/namelist_files/use_cases/hist_trop_strat_ts4_cam7.xml +++ b/bld/namelist_files/use_cases/hist_trop_strat_t4s_cam7.xml @@ -29,4 +29,7 @@ .false. .false. + + + diff --git a/cime_config/config_component.xml b/cime_config/config_component.xml index 76fe7858db..e005ffc459 100644 --- a/cime_config/config_component.xml +++ b/cime_config/config_component.xml @@ -279,7 +279,8 @@ waccm_ma_hist_cam6 waccm_ma_hist_cam4 hist_trop_strat_vbs_cam6 - hist_trop_strat_ts4_cam7 + hist_trop_strat_t4s_cam7 + 1850_trop_strat_t4s_cam7 hist_trop_strat_nudged_cam6 hist_trop_strat_vbsext_cam6 hist_trop_strat_vbsfire_cam6 diff --git a/src/cpl/nuopc/atm_stream_ndep.F90 b/src/cpl/nuopc/atm_stream_ndep.F90 index a1d4530722..a393b27f05 100644 --- a/src/cpl/nuopc/atm_stream_ndep.F90 +++ b/src/cpl/nuopc/atm_stream_ndep.F90 @@ -118,7 +118,7 @@ subroutine stream_ndep_init(model_mesh, model_clock, rc) if (ierr /= 0) call endrun(trim(subname)//": FATAL: mpi_bcast: stream_ndep_year_align") ! Check whether the stream is being used. - if (stream_ndep_data_filename == ' ') then + if (stream_ndep_data_filename == ' '.or.stream_ndep_data_filename == 'UNSET') then use_ndep_stream = .false. if (masterproc) then write(iulog,'(a)') ' ' From 02df16950406180aeb2bb0e19f157ea212d14109 Mon Sep 17 00:00:00 2001 From: Francis Vitt Date: Mon, 18 Nov 2024 13:59:35 -0700 Subject: [PATCH 2/2] remove the ndep settings modified: bld/namelist_files/use_cases/1850_trop_strat_t4s_cam7.xml modified: bld/namelist_files/use_cases/hist_trop_strat_t4s_cam7.xml --- bld/namelist_files/use_cases/1850_trop_strat_t4s_cam7.xml | 3 --- bld/namelist_files/use_cases/hist_trop_strat_t4s_cam7.xml | 3 --- 2 files changed, 6 deletions(-) diff --git a/bld/namelist_files/use_cases/1850_trop_strat_t4s_cam7.xml b/bld/namelist_files/use_cases/1850_trop_strat_t4s_cam7.xml index 03fe2a3a6d..dfd6d55003 100644 --- a/bld/namelist_files/use_cases/1850_trop_strat_t4s_cam7.xml +++ b/bld/namelist_files/use_cases/1850_trop_strat_t4s_cam7.xml @@ -45,7 +45,4 @@ .false. .false. - - - diff --git a/bld/namelist_files/use_cases/hist_trop_strat_t4s_cam7.xml b/bld/namelist_files/use_cases/hist_trop_strat_t4s_cam7.xml index 56a0e75b1f..4e65f4f34c 100644 --- a/bld/namelist_files/use_cases/hist_trop_strat_t4s_cam7.xml +++ b/bld/namelist_files/use_cases/hist_trop_strat_t4s_cam7.xml @@ -29,7 +29,4 @@ .false. .false. - - -