From b275459e2589d94ed0e6cde1235531589233c7c1 Mon Sep 17 00:00:00 2001 From: Francis Vitt Date: Wed, 7 Oct 2026 11:25:42 -0600 Subject: [PATCH 1/6] initial changes 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/hist_cam_lt.xml modified: bld/namelist_files/use_cases/waccm_ma_hist_cam7.xml modified: bld/namelist_files/use_cases/waccm_sc_hist_cam7.xml --- bld/build-namelist | 12 ++---------- bld/namelist_files/namelist_defaults_cam.xml | 9 ++------- bld/namelist_files/use_cases/1850_cam_lt.xml | 2 -- bld/namelist_files/use_cases/hist_cam_lt.xml | 2 -- bld/namelist_files/use_cases/waccm_ma_hist_cam7.xml | 2 -- bld/namelist_files/use_cases/waccm_sc_hist_cam7.xml | 2 -- 6 files changed, 4 insertions(+), 25 deletions(-) diff --git a/bld/build-namelist b/bld/build-namelist index aa3e8832ea..51ed6488ba 100755 --- a/bld/build-namelist +++ b/bld/build-namelist @@ -2965,17 +2965,9 @@ if ($maxzen>0.0) { # upper boundary specifier my $ubc_ver; if (($chem =~ /waccm_ma/ or $chem =~ /waccm_tsmlt/ or $chem =~ /waccm_t4ma/) and !$waccmx) { - if ($phys =~ /cam7/) { - $ubc_ver = 'waccm7chem'; - } else { - $ubc_ver = 'waccmchem'; - } + $ubc_ver = 'waccmchem'; } elsif ($chem =~ /waccm_sc/ or ($model_top eq "ht" and $chem =~ /ghg_mam/)) { - if ($phys =~ /cam7/) { - $ubc_ver = 'waccm7sc'; - } else { - $ubc_ver = 'waccmsc'; - } + $ubc_ver = 'waccmsc'; } if (defined $ubc_ver) { add_default($nl, 'ubc_specifier', 'ver'=>$ubc_ver); diff --git a/bld/namelist_files/namelist_defaults_cam.xml b/bld/namelist_files/namelist_defaults_cam.xml index 2693fa62f7..d6fb442b7f 100644 --- a/bld/namelist_files/namelist_defaults_cam.xml +++ b/bld/namelist_files/namelist_defaults_cam.xml @@ -189,6 +189,8 @@ atm/waccm/ic/FX2000_ne16pg3_spinup01.cam.i.0002-01-01_c251215.nc atm/cam/inic/se/FHISTC_LTso_ne16pg3_ne16pg3_mg17.i.c260220.nc atm/cam/inic/se/FHISTC_MTso_ne16pg3_ne16pg3_mg17.i.c260220.nc +atm/waccm/ic/FHISTC_WAt1ma_ne16pg3_watervapor_initial_spinup01.cam.i.1980-01-01_c260828.nc +atm/waccm/ic/FHISTC_WAt1ma_ne30pg3_watervapor_spinup02.cam.i.1980-01-01_c260922.nc atm/cam/inic/se/ape_topo_cam4_ne30np4_L26_c171020.nc atm/cam/inic/se/ape_cam4_ne30np4_L26_c170417.nc @@ -2099,13 +2101,6 @@ 'T->MSIS','Q->2.d-8vmr','CH4->2.d-10vmr' - - - 'T->MSIS','CH4->2.d-10vmr','F->1.0D-15mmr','HF->1.0D-15mmr','H->MSIS','N->MSIS','O->MSIS','O2->MSIS','H2->TGCM','NO->SNOE' - - - 'T->MSIS','CH4->2.d-10vmr' - atm/cam/chem/trop_mozart/ub/ubvals_b40.20th.track1_1996-2005_c110315.nc diff --git a/bld/namelist_files/use_cases/1850_cam_lt.xml b/bld/namelist_files/use_cases/1850_cam_lt.xml index 73b5fdda9e..e87cd96d36 100644 --- a/bld/namelist_files/use_cases/1850_cam_lt.xml +++ b/bld/namelist_files/use_cases/1850_cam_lt.xml @@ -12,12 +12,10 @@ 'CO2','CH4','N2O','CFC11','CFC12','CFC11eq' - 'atm/cam/ozone_strataero' diff --git a/bld/namelist_files/use_cases/hist_cam_lt.xml b/bld/namelist_files/use_cases/hist_cam_lt.xml index 2dafb9386a..e6b98a7484 100644 --- a/bld/namelist_files/use_cases/hist_cam_lt.xml +++ b/bld/namelist_files/use_cases/hist_cam_lt.xml @@ -11,11 +11,9 @@ 'CO2','CH4','N2O','CFC11','CFC12','CFC11eq' - 'atm/cam/ozone_strataero' diff --git a/bld/namelist_files/use_cases/waccm_ma_hist_cam7.xml b/bld/namelist_files/use_cases/waccm_ma_hist_cam7.xml index 252b293ed7..20417a121a 100644 --- a/bld/namelist_files/use_cases/waccm_ma_hist_cam7.xml +++ b/bld/namelist_files/use_cases/waccm_ma_hist_cam7.xml @@ -15,8 +15,6 @@ 'epp_ion_rates' -atm/waccm/ic/FHIST_WAt1ma_ne30pg3_spinup01.cam.i.1980-01-01-00000_c250124.nc -/glade/work/fvitt/waccm_ic/FHISTC_WAt1ma_ne16pg3_watervapor_initial_spinup01.cam.i.1980-01-01-00000.nc atm/waccm/ic/FHIST_WXma_ne30pg3_spinup03.cam.i.1980-01-01-00000_c250201.nc atm/waccm/ic/FHIST_WXma_ne16pg3_spinup02.cam.i.1980-01-01-00000_c250201.nc diff --git a/bld/namelist_files/use_cases/waccm_sc_hist_cam7.xml b/bld/namelist_files/use_cases/waccm_sc_hist_cam7.xml index 4f592c3886..4707985b97 100644 --- a/bld/namelist_files/use_cases/waccm_sc_hist_cam7.xml +++ b/bld/namelist_files/use_cases/waccm_sc_hist_cam7.xml @@ -11,8 +11,6 @@ atm/cam/solar/SolarForcingCMIP7-4.6_18491230-20240101_sumEPP_c20250630.nc -atm/waccm/ic/FHIST_WAt1ma_ne30pg3_spinup01.cam.i.1980-01-01-00000_c250124.nc -atm/waccm/ic/FHIST_WAt1ma_ne16pg3_spinup01.cam.i.1980-01-01-00000_c250124.nc atm/waccm/ic/FHIST_WXma_ne30pg3_spinup03.cam.i.1980-01-01-00000_c250201.nc atm/waccm/ic/FHIST_WXma_ne16pg3_spinup02.cam.i.1980-01-01-00000_c250201.nc From 05a3ae07682de435fa6005a3045759acd2e75907 Mon Sep 17 00:00:00 2001 From: Francis Vitt Date: Sat, 10 Oct 2026 14:48:19 -0600 Subject: [PATCH 2/6] update default ne16 waccm IC file --- bld/namelist_files/namelist_defaults_cam.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bld/namelist_files/namelist_defaults_cam.xml b/bld/namelist_files/namelist_defaults_cam.xml index d6fb442b7f..90b8b94b06 100644 --- a/bld/namelist_files/namelist_defaults_cam.xml +++ b/bld/namelist_files/namelist_defaults_cam.xml @@ -189,7 +189,7 @@ atm/waccm/ic/FX2000_ne16pg3_spinup01.cam.i.0002-01-01_c251215.nc atm/cam/inic/se/FHISTC_LTso_ne16pg3_ne16pg3_mg17.i.c260220.nc atm/cam/inic/se/FHISTC_MTso_ne16pg3_ne16pg3_mg17.i.c260220.nc -atm/waccm/ic/FHISTC_WAt1ma_ne16pg3_watervapor_initial_spinup01.cam.i.1980-01-01_c260828.nc +atm/waccm/ic/f.e30.FHISTC_WAt1ma.ne16pg3_mg17_L135_cam6_4_cam6_4_201_beres0.15.cam.i.1980-01-01_c260909.nc atm/waccm/ic/FHISTC_WAt1ma_ne30pg3_watervapor_spinup02.cam.i.1980-01-01_c260922.nc atm/cam/inic/se/ape_topo_cam4_ne30np4_L26_c171020.nc From 09d11e10b849740997805dc578b056fd12b6d498 Mon Sep 17 00:00:00 2001 From: Francis Vitt Date: Fri, 16 Oct 2026 15:00:41 -0600 Subject: [PATCH 3/6] update waccmx IC files modified: bld/namelist_files/namelist_defaults_cam.xml modified: bld/namelist_files/use_cases/waccm_ma_hist_cam7.xml modified: bld/namelist_files/use_cases/waccm_sc_hist_cam7.xml --- bld/namelist_files/namelist_defaults_cam.xml | 2 ++ bld/namelist_files/use_cases/waccm_ma_hist_cam7.xml | 4 ---- bld/namelist_files/use_cases/waccm_sc_hist_cam7.xml | 4 ---- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/bld/namelist_files/namelist_defaults_cam.xml b/bld/namelist_files/namelist_defaults_cam.xml index 90b8b94b06..cbe8076777 100644 --- a/bld/namelist_files/namelist_defaults_cam.xml +++ b/bld/namelist_files/namelist_defaults_cam.xml @@ -191,6 +191,8 @@ atm/cam/inic/se/FHISTC_MTso_ne16pg3_ne16pg3_mg17.i.c260220.nc atm/waccm/ic/f.e30.FHISTC_WAt1ma.ne16pg3_mg17_L135_cam6_4_cam6_4_201_beres0.15.cam.i.1980-01-01_c260909.nc atm/waccm/ic/FHISTC_WAt1ma_ne30pg3_watervapor_spinup02.cam.i.1980-01-01_c260922.nc +atm/waccm/ic/FHISTC_WXma_ne16pg3_watervapor_spinup02.cam.i.1980-01-01_c261015.nc +atm/waccm/ic/FHISTC_WXma_ne30pg3_watervapor_spinup02.cam.i.1980-01-01_c261015.nc atm/cam/inic/se/ape_topo_cam4_ne30np4_L26_c171020.nc atm/cam/inic/se/ape_cam4_ne30np4_L26_c170417.nc diff --git a/bld/namelist_files/use_cases/waccm_ma_hist_cam7.xml b/bld/namelist_files/use_cases/waccm_ma_hist_cam7.xml index 20417a121a..27fb325545 100644 --- a/bld/namelist_files/use_cases/waccm_ma_hist_cam7.xml +++ b/bld/namelist_files/use_cases/waccm_ma_hist_cam7.xml @@ -14,10 +14,6 @@ atm/cam/solar/SolarForcingCMIP7-4.6_18491230-20240101_sumEPP_c20250630.nc 'epp_ion_rates' - -atm/waccm/ic/FHIST_WXma_ne30pg3_spinup03.cam.i.1980-01-01-00000_c250201.nc -atm/waccm/ic/FHIST_WXma_ne16pg3_spinup02.cam.i.1980-01-01-00000_c250201.nc - SERIAL diff --git a/bld/namelist_files/use_cases/waccm_sc_hist_cam7.xml b/bld/namelist_files/use_cases/waccm_sc_hist_cam7.xml index 4707985b97..b477a25be2 100644 --- a/bld/namelist_files/use_cases/waccm_sc_hist_cam7.xml +++ b/bld/namelist_files/use_cases/waccm_sc_hist_cam7.xml @@ -10,10 +10,6 @@ atm/cam/solar/SolarForcingCMIP7-4.6_18491230-20240101_sumEPP_c20250630.nc - -atm/waccm/ic/FHIST_WXma_ne30pg3_spinup03.cam.i.1980-01-01-00000_c250201.nc -atm/waccm/ic/FHIST_WXma_ne16pg3_spinup02.cam.i.1980-01-01-00000_c250201.nc - SERIAL 'CO2','CH4','N2O','CFC11','CFC12','CFC11eq' From 369ff2dd3f3ff9cbcb68f5558c6cc1ae4a156222 Mon Sep 17 00:00:00 2001 From: Francis Vitt Date: Sun, 18 Oct 2026 07:02:02 -0600 Subject: [PATCH 4/6] update default waccm ne30 IC file modified: bld/namelist_files/namelist_defaults_cam.xml --- bld/namelist_files/namelist_defaults_cam.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bld/namelist_files/namelist_defaults_cam.xml b/bld/namelist_files/namelist_defaults_cam.xml index cbe8076777..b95d97cf99 100644 --- a/bld/namelist_files/namelist_defaults_cam.xml +++ b/bld/namelist_files/namelist_defaults_cam.xml @@ -190,7 +190,7 @@ atm/cam/inic/se/FHISTC_LTso_ne16pg3_ne16pg3_mg17.i.c260220.nc atm/cam/inic/se/FHISTC_MTso_ne16pg3_ne16pg3_mg17.i.c260220.nc atm/waccm/ic/f.e30.FHISTC_WAt1ma.ne16pg3_mg17_L135_cam6_4_cam6_4_201_beres0.15.cam.i.1980-01-01_c260909.nc -atm/waccm/ic/FHISTC_WAt1ma_ne30pg3_watervapor_spinup02.cam.i.1980-01-01_c260922.nc +atm/waccm/ic/f.e30.FHISTC_WAt1ma.ne30pg3_mg17_L135_cam6_4_201_beres0.15.cam.i.1980-01-01_c261017.nc atm/waccm/ic/FHISTC_WXma_ne16pg3_watervapor_spinup02.cam.i.1980-01-01_c261015.nc atm/waccm/ic/FHISTC_WXma_ne30pg3_watervapor_spinup02.cam.i.1980-01-01_c261015.nc From c56a9713c78075a008a605f135269be36e5a2919 Mon Sep 17 00:00:00 2001 From: Francis Vitt Date: Mon, 19 Oct 2026 06:45:33 -0600 Subject: [PATCH 5/6] include default ne3 IC file modified: bld/namelist_files/namelist_defaults_cam.xml --- bld/namelist_files/namelist_defaults_cam.xml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/bld/namelist_files/namelist_defaults_cam.xml b/bld/namelist_files/namelist_defaults_cam.xml index b95d97cf99..4be0642a75 100644 --- a/bld/namelist_files/namelist_defaults_cam.xml +++ b/bld/namelist_files/namelist_defaults_cam.xml @@ -189,10 +189,11 @@ atm/waccm/ic/FX2000_ne16pg3_spinup01.cam.i.0002-01-01_c251215.nc atm/cam/inic/se/FHISTC_LTso_ne16pg3_ne16pg3_mg17.i.c260220.nc atm/cam/inic/se/FHISTC_MTso_ne16pg3_ne16pg3_mg17.i.c260220.nc -atm/waccm/ic/f.e30.FHISTC_WAt1ma.ne16pg3_mg17_L135_cam6_4_cam6_4_201_beres0.15.cam.i.1980-01-01_c260909.nc -atm/waccm/ic/f.e30.FHISTC_WAt1ma.ne30pg3_mg17_L135_cam6_4_201_beres0.15.cam.i.1980-01-01_c261017.nc -atm/waccm/ic/FHISTC_WXma_ne16pg3_watervapor_spinup02.cam.i.1980-01-01_c261015.nc -atm/waccm/ic/FHISTC_WXma_ne30pg3_watervapor_spinup02.cam.i.1980-01-01_c261015.nc +atm/waccm/ic/FHISTC_WAt1ma_ne3pg3_spinup01.cam.i.1980-01-01_c261018.nc +atm/waccm/ic/f.e30.FHISTC_WAt1ma.ne16pg3_mg17_L135_cam6_4_cam6_4_201_beres0.15.cam.i.1980-01-01_c260909.nc +atm/waccm/ic/f.e30.FHISTC_WAt1ma.ne30pg3_mg17_L135_cam6_4_201_beres0.15.cam.i.1980-01-01_c261017.nc +atm/waccm/ic/FHISTC_WXma_ne16pg3_watervapor_spinup02.cam.i.1980-01-01_c261015.nc +atm/waccm/ic/FHISTC_WXma_ne30pg3_watervapor_spinup02.cam.i.1980-01-01_c261015.nc atm/cam/inic/se/ape_topo_cam4_ne30np4_L26_c171020.nc atm/cam/inic/se/ape_cam4_ne30np4_L26_c170417.nc From 7a3ed84b8d1b7b085be9510ec8ce1c9a81bbb7dc Mon Sep 17 00:00:00 2001 From: Francis Vitt Date: Mon, 19 Oct 2026 11:43:17 -0600 Subject: [PATCH 6/6] revert LT use case files --- bld/namelist_files/use_cases/1850_cam_lt.xml | 2 ++ bld/namelist_files/use_cases/hist_cam_lt.xml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/bld/namelist_files/use_cases/1850_cam_lt.xml b/bld/namelist_files/use_cases/1850_cam_lt.xml index e87cd96d36..73b5fdda9e 100644 --- a/bld/namelist_files/use_cases/1850_cam_lt.xml +++ b/bld/namelist_files/use_cases/1850_cam_lt.xml @@ -12,10 +12,12 @@ 'CO2','CH4','N2O','CFC11','CFC12','CFC11eq' + 'atm/cam/ozone_strataero' diff --git a/bld/namelist_files/use_cases/hist_cam_lt.xml b/bld/namelist_files/use_cases/hist_cam_lt.xml index e6b98a7484..2dafb9386a 100644 --- a/bld/namelist_files/use_cases/hist_cam_lt.xml +++ b/bld/namelist_files/use_cases/hist_cam_lt.xml @@ -11,9 +11,11 @@ 'CO2','CH4','N2O','CFC11','CFC12','CFC11eq' + 'atm/cam/ozone_strataero'