Skip to content

Commit 54aaa58

Browse files
Merge remote-tracking branch 'meng630/mam4/fix_nbfb' (PR #7638)
EAMxx: Update linoz and oxid files in XML Replace the multi-year linoz and oxid files with single-year to fix NBFB restart in MAM4xx [BFB] * meng630/mam4/fix_nbfb: Added the new single year LINOZ files back Update oxid file for the microphysics standalone test Revert LINOZ files to check BFBness Update linoz files to cdf format Update linoz and oxid files in XML
2 parents c0e9aa7 + 0ffb55e commit 54aaa58

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

components/eamxx/cime_config/namelist_defaults_eamxx.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -317,12 +317,12 @@ be lost if SCREAM_HACK_XML is not enabled.
317317
<mam4_o3_lbl type="integer" doc="Linoz lbl parameter">4</mam4_o3_lbl>
318318
<mam4_psc_T type="real" doc="Linoz psc ozone loss temperature (K) threshold">193.0</mam4_psc_T>
319319
<mam4_linoz_ymd type="integer" > 20100101</mam4_linoz_ymd>
320-
<mam4_linoz_file_name type="file" doc="LINOZ chemistry file"> ${DIN_LOC_ROOT}/atm/scream/mam4xx/linoz/ne30pg2/linoz1850-2015_2010JPL_CMIP6_10deg_58km_ne30pg2_c20240724.nc</mam4_linoz_file_name>
321-
<mam4_linoz_file_name hgrid="ne4np4.pg2" type="file" doc="LINOZ chemistry file"> ${DIN_LOC_ROOT}/atm/scream/mam4xx/linoz/ne4pg2/linoz1850-2015_2010JPL_CMIP6_10deg_58km_ne4pg2_c20240724.nc</mam4_linoz_file_name>
320+
<mam4_linoz_file_name type="file" doc="LINOZ chemistry file"> ${DIN_LOC_ROOT}/atm/scream/mam4xx/linoz/ne30pg2/linoz2010_2010JPL_CMIP6_10deg_58km_ne30pg2_c20250826.nc</mam4_linoz_file_name>
321+
<mam4_linoz_file_name hgrid="ne4np4.pg2" type="file" doc="LINOZ chemistry file"> ${DIN_LOC_ROOT}/atm/scream/mam4xx/linoz/ne4pg2/linoz2010_2010JPL_CMIP6_10deg_58km_ne4pg2_c20250826.nc</mam4_linoz_file_name>
322322
<!--Invariants-->
323323
<mam4_oxid_ymd type="integer" > 20150101 </mam4_oxid_ymd>
324-
<mam4_oxid_file_name type="file" doc="File containing oxidants data">${DIN_LOC_ROOT}/atm/scream/mam4xx/invariants/ne30pg2/oxid_1.9x2.5_L26_1850-2015_ne30pg2_c20241009.nc</mam4_oxid_file_name>
325-
<mam4_oxid_file_name hgrid="ne4np4.pg2" type="file" doc="File containing oxidants data">${DIN_LOC_ROOT}/atm/scream/mam4xx/invariants/ne4pg2/oxid_1.9x2.5_L26_1850-2015_ne4pg2_c20241009.nc</mam4_oxid_file_name>
324+
<mam4_oxid_file_name type="file" doc="File containing oxidants data">${DIN_LOC_ROOT}/atm/scream/mam4xx/invariants/ne30pg2/oxid_1.9x2.5_L26_2015_ne30pg2_c20250813.nc</mam4_oxid_file_name>
325+
<mam4_oxid_file_name hgrid="ne4np4.pg2" type="file" doc="File containing oxidants data">${DIN_LOC_ROOT}/atm/scream/mam4xx/invariants/ne4pg2/oxid_1.9x2.5_L26_2015_ne4pg2_c20250813.nc</mam4_oxid_file_name>
326326
<mam4_chlorine_loading_ymd type="integer" doc="Cycle year for chlorine"> 20100101 </mam4_chlorine_loading_ymd>
327327
<mam4_linoz_chlorine_file type="file" doc="File containing chlorine data"> ${DIN_LOC_ROOT}/atm/scream/mam4xx/linoz/Linoz_Chlorine_Loading_CMIP6_0003-2017_c20171114.nc</mam4_linoz_chlorine_file>
328328
<!--Photolysis-->

components/eamxx/tests/single-process/mam/aero_microphys/input.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ eamxx:
2121
mam4_psc_T : 193.0
2222
mam4_linoz_ymd : 20100101
2323
mam4_linoz_file_name : ${SCREAM_DATA_DIR}/mam4xx/linoz/ne2np4/linoz1850-2015_2010JPL_CMIP6_10deg_58km_ne2np4_c20240724.nc
24-
mam4_oxid_file_name : ${SCREAM_DATA_DIR}/mam4xx/invariants/ne2np4/oxid_ne2np4_L26_1850-2015_c20240827.nc
24+
mam4_oxid_file_name : ${SCREAM_DATA_DIR}/mam4xx/invariants/ne2np4/oxid_ne2np4_L26_2015_c20250813.nc
2525
mam4_oxid_ymd : 20150101
2626
mam4_linoz_chlorine_file : ${SCREAM_DATA_DIR}/mam4xx/linoz/Linoz_Chlorine_Loading_CMIP6_0003-2017_c20171114.nc
2727
mam4_chlorine_loading_ymd : 20100101

0 commit comments

Comments
 (0)