Skip to content

Commit

Permalink
Merge branch 'dev' into feature/msl/Ethnye_Ethylene
Browse files Browse the repository at this point in the history
  • Loading branch information
@yantosca
yantosca committed Sep 23, 2021
2 parents 6fc59b9 + 7ea7210 commit 7077fc1
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 4 deletions.
18 changes: 18 additions & 0 deletions run/GCHP/HISTORY.rc.templates/HISTORY.rc.fullchem
View file
Original file line number Diff line number Diff line change
Expand Up @@ -850,6 +850,7 @@ COLLECTIONS: #'AerosolMass',
'BudgetWetDepPBL_HOBr ', 'GCHPchem',
'BudgetWetDepPBL_HNO3 ', 'GCHPchem',
'BudgetWetDepPBL_HMML ', 'GCHPchem',
'BudgetWetDepPBL_HMS ', 'GCHPchem',
'BudgetWetDepPBL_HMHP ', 'GCHPchem',
'BudgetWetDepPBL_HI ', 'GCHPchem',
'BudgetWetDepPBL_HCOOH ', 'GCHPchem',
Expand Down Expand Up @@ -991,6 +992,7 @@ COLLECTIONS: #'AerosolMass',
'BudgetWetDepTrop_HOCl ', 'GCHPchem',
'BudgetWetDepTrop_HOBr ', 'GCHPchem',
'BudgetWetDepTrop_HNO3 ', 'GCHPchem',
'BudgetWetDepTrop_HMS ', 'GCHPchem',
'BudgetWetDepTrop_HMML ', 'GCHPchem',
'BudgetWetDepTrop_HMHP ', 'GCHPchem',
'BudgetWetDepTrop_HI ', 'GCHPchem',
Expand Down Expand Up @@ -1135,6 +1137,7 @@ COLLECTIONS: #'AerosolMass',
'BudgetWetDepFull_HOCl ', 'GCHPchem',
'BudgetWetDepFull_HOBr ', 'GCHPchem',
'BudgetWetDepFull_HNO3 ', 'GCHPchem',
'BudgetWetDepFull_HMS ', 'GCHPchem',
'BudgetWetDepFull_HMML ', 'GCHPchem',
'BudgetWetDepFull_HMHP ', 'GCHPchem',
'BudgetWetDepFull_HI ', 'GCHPchem',
Expand Down Expand Up @@ -1310,6 +1313,7 @@ COLLECTIONS: #'AerosolMass',
'BudgetChemistryPBL_HNO2 ', 'GCHPchem',
'BudgetChemistryPBL_HMML ', 'GCHPchem',
'BudgetChemistryPBL_HMHP ', 'GCHPchem',
'BudgetChemistryPBL_HMS ', 'GCHPchem',
'BudgetChemistryPBL_HI ', 'GCHPchem',
'BudgetChemistryPBL_HCOOH ', 'GCHPchem',
'BudgetChemistryPBL_HCl ', 'GCHPchem',
Expand Down Expand Up @@ -1526,6 +1530,7 @@ COLLECTIONS: #'AerosolMass',
'BudgetChemistryTrop_HNO4 ', 'GCHPchem',
'BudgetChemistryTrop_HNO3 ', 'GCHPchem',
'BudgetChemistryTrop_HNO2 ', 'GCHPchem',
'BudgetChemistryTrop_HMS ', 'GCHPchem',
'BudgetChemistryTrop_HMML ', 'GCHPchem',
'BudgetChemistryTrop_HMHP ', 'GCHPchem',
'BudgetChemistryTrop_HI ', 'GCHPchem',
Expand Down Expand Up @@ -1744,6 +1749,7 @@ COLLECTIONS: #'AerosolMass',
'BudgetChemistryFull_HNO4 ', 'GCHPchem',
'BudgetChemistryFull_HNO3 ', 'GCHPchem',
'BudgetChemistryFull_HNO2 ', 'GCHPchem',
'BudgetChemistryFull_HMS ', 'GCHPchem',
'BudgetChemistryFull_HMML ', 'GCHPchem',
'BudgetChemistryFull_HMHP ', 'GCHPchem',
'BudgetChemistryFull_HI ', 'GCHPchem',
Expand Down Expand Up @@ -1962,6 +1968,7 @@ COLLECTIONS: #'AerosolMass',
'BudgetConvectionPBL_HNO4 ', 'GCHPchem',
'BudgetConvectionPBL_HNO3 ', 'GCHPchem',
'BudgetConvectionPBL_HNO2 ', 'GCHPchem',
'BudgetConvectionPBL_HMS ', 'GCHPchem',
'BudgetConvectionPBL_HMML ', 'GCHPchem',
'BudgetConvectionPBL_HMHP ', 'GCHPchem',
'BudgetConvectionPBL_HI ', 'GCHPchem',
Expand Down Expand Up @@ -2180,6 +2187,7 @@ COLLECTIONS: #'AerosolMass',
'BudgetConvectionTrop_HNO4 ', 'GCHPchem',
'BudgetConvectionTrop_HNO3 ', 'GCHPchem',
'BudgetConvectionTrop_HNO2 ', 'GCHPchem',
'BudgetConvectionTrop_HMS ', 'GCHPchem',
'BudgetConvectionTrop_HMML ', 'GCHPchem',
'BudgetConvectionTrop_HMHP ', 'GCHPchem',
'BudgetConvectionTrop_HI ', 'GCHPchem',
Expand Down Expand Up @@ -2399,6 +2407,7 @@ COLLECTIONS: #'AerosolMass',
'BudgetConvectionFull_HNO3 ', 'GCHPchem',
'BudgetConvectionFull_HNO2 ', 'GCHPchem',
'BudgetConvectionFull_HMML ', 'GCHPchem',
'BudgetConvectionFull_HMS ', 'GCHPchem',
'BudgetConvectionFull_HMHP ', 'GCHPchem',
'BudgetConvectionFull_HI ', 'GCHPchem',
'BudgetConvectionFull_HCOOH ', 'GCHPchem',
Expand Down Expand Up @@ -2617,6 +2626,7 @@ COLLECTIONS: #'AerosolMass',
'BudgetMixingPBL_HNO3 ', 'GCHPchem',
'BudgetMixingPBL_HNO2 ', 'GCHPchem',
'BudgetMixingPBL_HMML ', 'GCHPchem',
'BudgetMixingPBL_HMS ', 'GCHPchem',
'BudgetMixingPBL_HMHP ', 'GCHPchem',
'BudgetMixingPBL_HI ', 'GCHPchem',
'BudgetMixingPBL_HCOOH ', 'GCHPchem',
Expand Down Expand Up @@ -2834,6 +2844,7 @@ COLLECTIONS: #'AerosolMass',
'BudgetMixingTrop_HNO4 ', 'GCHPchem',
'BudgetMixingTrop_HNO3 ', 'GCHPchem',
'BudgetMixingTrop_HNO2 ', 'GCHPchem',
'BudgetMixingTrop_HMS ', 'GCHPchem',
'BudgetMixingTrop_HMML ', 'GCHPchem',
'BudgetMixingTrop_HMHP ', 'GCHPchem',
'BudgetMixingTrop_HI ', 'GCHPchem',
Expand Down Expand Up @@ -3939,6 +3950,7 @@ COLLECTIONS: #'AerosolMass',
@ 'CloudConvFlux_HNO4 ', 'GCHPchem',
@ 'CloudConvFlux_HNO3 ', 'GCHPchem',
@ 'CloudConvFlux_HNO2 ', 'GCHPchem',
@ 'CloudConvFlux_HMS ', 'GCHPchem',
@ 'CloudConvFlux_HMML ', 'GCHPchem',
@ 'CloudConvFlux_HMHP ', 'GCHPchem',
@ 'CloudConvFlux_HI ', 'GCHPchem',
Expand Down Expand Up @@ -4197,6 +4209,7 @@ COLLECTIONS: #'AerosolMass',
'DryDep_HOCl ', 'GCHPchem',
'DryDep_HOBr ', 'GCHPchem',
'DryDep_HNO3 ', 'GCHPchem',
'DryDep_HMS ', 'GCHPchem',
'DryDep_HMML ', 'GCHPchem',
'DryDep_HMHP ', 'GCHPchem',
'DryDep_HI ', 'GCHPchem',
Expand Down Expand Up @@ -4357,6 +4370,7 @@ COLLECTIONS: #'AerosolMass',
'DryDepVel_HOCl ', 'GCHPchem',
'DryDepVel_HOBr ', 'GCHPchem',
'DryDepVel_HNO3 ', 'GCHPchem',
'DryDepVel_HMS ', 'GCHPchem',
'DryDepVel_HMML ', 'GCHPchem',
'DryDepVel_HMHP ', 'GCHPchem',
'DryDepVel_HI ', 'GCHPchem',
Expand Down Expand Up @@ -5107,6 +5121,7 @@ COLLECTIONS: #'AerosolMass',
'SpeciesConc_HNO4 ', 'GCHPchem',
'SpeciesConc_HNO3 ', 'GCHPchem',
'SpeciesConc_HNO2 ', 'GCHPchem',
'SpeciesConc_HMS ', 'GCHPchem',
'SpeciesConc_HMML ', 'GCHPchem',
'SpeciesConc_HMHP ', 'GCHPchem',
'SpeciesConc_HI ', 'GCHPchem',
Expand Down Expand Up @@ -5468,6 +5483,7 @@ COLLECTIONS: #'AerosolMass',
'WetLossConv_HOCl ', 'GCHPchem',
'WetLossConv_HOBr ', 'GCHPchem',
'WetLossConv_HNO3 ', 'GCHPchem',
'WetLossConv_HMS ', 'GCHPchem',
'WetLossConv_HMML ', 'GCHPchem',
'WetLossConv_HMHP ', 'GCHPchem',
'WetLossConv_HI ', 'GCHPchem',
Expand Down Expand Up @@ -5612,6 +5628,7 @@ COLLECTIONS: #'AerosolMass',
'WetLossConvFrac_HOCl ', 'GCHPchem',
'WetLossConvFrac_HOBr ', 'GCHPchem',
'WetLossConvFrac_HNO3 ', 'GCHPchem',
'WetLossConvFrac_HMS ', 'GCHPchem',
'WetLossConvFrac_HMML ', 'GCHPchem',
'WetLossConvFrac_HMHP ', 'GCHPchem',
'WetLossConvFrac_HI ', 'GCHPchem',
Expand Down Expand Up @@ -5779,6 +5796,7 @@ COLLECTIONS: #'AerosolMass',
'WetLossLS_HOCl ', 'GCHPchem',
'WetLossLS_HOBr ', 'GCHPchem',
'WetLossLS_HNO3 ', 'GCHPchem',
'WetLossLS_HMS ', 'GCHPchem',
'WetLossLS_HMML ', 'GCHPchem',
'WetLossLS_HMHP ', 'GCHPchem',
'WetLossLS_HI ', 'GCHPchem',
Expand Down
13 changes: 9 additions & 4 deletions run/GCHP/createRunDir.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,12 @@ do
if [[ ${sim_name} = "fullchem" ]]; then
start_date="20190701_0000z"
src_name="${src_prefix}${start_date}${src_suffix}"
ln -s ${restarts}/GC_13.0.0/${src_name} ${rundir}/${target_name}
#----------------------------------------------------------------------
# NOTE: We must now link restart files from v2021-09, since these will
# have extra species such as HMS, C2H2, C2H4, etc. (bmy, 9/23/21)
#ln -s ${restarts}/GC_13.0.0/${src_name} ${rundir}/${target_name}
#----------------------------------------------------------------------
ln -s ${restarts}/v2021-09/${src_name} ${rundir}/${target_name}
elif [[ ${sim_name} = "TransportTracers" ]]; then
start_date="20190101_0000z"
src_name="${src_prefix}${start_date}${src_suffix}"
Expand All @@ -387,7 +392,7 @@ cd ${rundir}
sed -i -e "s|{SIMULATION}|${sim_name}|" GCHP.rc
sed -i -e "s|{SIMULATION}|${sim_name}|" runConfig.sh
if [ "${sim_name}" == "CO2" ]; then
sed -i -e "s|{SIMULATION}|${sim_name}|" runConfig_adj.sh
sed -i -e "s|{SIMULATION}|${sim_name}|" runConfig_adj.sh
fi
sed -i -e "s|{DATA_ROOT}|${GC_DATA_ROOT}|" input.geos
sed -i -e "s|{MET}|${met_name}|" input.geos
Expand Down Expand Up @@ -427,8 +432,8 @@ fi
sed -i -e "s|{DATE1}|${startdate}|" ${rundir}/runConfig.sh
sed -i -e "s|{DATE2}|${enddate}|" ${rundir}/runConfig.sh
if [ "${sim_name}" == "CO2" ]; then
sed -i -e "s|{DATE1}|${startdate}|" ${rundir}/runConfig_adj.sh
sed -i -e "s|{DATE2}|${enddate}|" ${rundir}/runConfig_adj.sh
sed -i -e "s|{DATE1}|${startdate}|" ${rundir}/runConfig_adj.sh
sed -i -e "s|{DATE2}|${enddate}|" ${rundir}/runConfig_adj.sh
fi
sed -i -e "s|{DATE1}|${startdate}|" ${rundir}/CAP.rc
sed -i -e "s|{DATE2}|${enddate}|" ${rundir}/CAP.rc
Expand Down

0 comments on commit 7077fc1

Please sign in to comment.