Skip to content

Remove unused inputs #132

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lrobion wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Remove unused inputs #132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 0 additions & 70 deletions Code.v05-00/defaults/input.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,9 @@ SIMULATION MENU:
OUTPUT SUBMENU:
Output folder (string): =MISSING=
Overwrite if folder exists (T/F): T
# FFT options (for spectral solver)
Use threaded FFT (T/F): F
FFTW WISDOM SUBMENU:
Use FFTW WISDOM (T/F): T
Dir w/ write permission (string): =MISSING=
# This mostly contains information on background aerosol concentration; Not too relevant for contrail behavior
Input background condition (string): =DEFAULT=
# All parameters here are overwritten in EMISSION INDICES SUBMENU
Input engine emissions (string): =DEFAULT=
# Ignore/Don't change these, these are deprecated features.
SAVE FORWARD RESULTS SUBMENU:
Save forward results (T/F): F
netCDF filename format (string): APCEMM_Case_*
ADJOINT OPTIMIZATION SUBMENU:
Turn on adjoint optim. (T/F): F
netCDF filename format (string): APCEMM_ADJ_Case_*
BOX MODEL SUBMENU:
Run box model (T/F): F
netCDF filename format (string): APCEMM_BOX_CASE_*
RANDOM NUMBER GENERATION SUBMENU:
Force seed value (T/F): F
Seed value (positive int): 0
Expand All @@ -40,7 +24,6 @@ PARAMETER MENU:
# Pressure altitude at which the contrail is initialized
Pressure [hPa] (double): 265
Horiz. diff. coeff. [m^2/s] (double): 15.0
# Can be overwritten if met file is passed
Verti. diff. [m^2/s] (double): 0.15
Brunt-Vaisala Frequency [s^-1] (double): 0.013
LOCATION AND TIME SUBMENU:
Expand All @@ -60,10 +43,6 @@ PARAMETER MENU:
EMISSION INDICES SUBMENU:
# Engine specific parameters
# Default parameters are estimates for a 737-800 at 35k ft
# Affects EPM mostly:
NOx [g(NO2)/kg_fuel] (double): 10 # EDB for CFM56-5B3
CO [g/kg_fuel] (double): 1
UHC [g/kg_fuel] (double): 0.6
# Affects contrail diffusion model:
SO2 [g/kg_fuel] (double): 1.2 # Assuming 600ppm of Sulfur
SO2 to SO4 conv [%] (double): 2 # AEDT paper, Barrett et al. (2010)
Expand All @@ -82,58 +61,31 @@ PARAMETER MENU:
TRANSPORT MENU:
# Keep on
Turn on Transport (T/F): T
# Outdated, not used (was used by spectral solver)
Fill Negative Values (T/F): T
Transport Timestep [min] (double): 1
# Keep off: not sure of the effect yet + met updraft is included (if met file input)
PLUME UPDRAFT SUBMENU:
Turn on plume updraft (T/F): F
Updraft timescale [s] (double): 3600
Updraft veloc. [cm/s] (double): 5

# Chemistry component of APCEMM hasn't been touched in a long time; leave off if only interested in contrail simulation
CHEMISTRY MENU:
Turn on Chemistry (T/F): F
Perform hetero. chem. (T/F): F
Photolysis rates folder (string): /path/to/input/

AEROSOL MENU:
# Keep on
Turn on grav. settling (T/F): T
# Keep on
Turn on solid coagulation (T/F): T
# Keep off
Turn on liquid coagulation (T/F): F
# Keep on
Turn on ice growth (T/F): T
Ice growth timestep [min] (double): 1

# At least one of "Use met. input", "Impose moist layer depth", or "Impose lapse rate" must be true
# Imposing moist layer depth will automatically calculate the lapse rate and override the imposed lapse rate

# If using met. input:
# Exactly one of "Init temp. from met." and "Impose lapse rate" must be true
# Exactly one of "Init RH from met." and "Impose moist layer depth" must be true
METEOROLOGY MENU:
# --- MET INPUT OPTIONS ---+
METEOROLOGICAL INPUT SUBMENU:
Use met. input (T/F): T
Met input file path (string): =MISSING=
# Frequency of met data availability
Time series data timestep [hr] (double): 1.0
# If off, uses the parameter specified in METEOROLOGICAL PARAMETERS SUBMENU
Init temp. from met. (T/F): T
Temp. time series input (T/F): T
# Always interpolates in time, this controls spatial interpolation
Interpolate temp. met. data (T/F): T
# Same options as the ones for Temperature:
Init RH from met. (T/F): T
RH time series input (T/F): T
Interpolate RH met. data (T/F): T
Init wind shear from met. (T/F): T
Wind shear time series input (T/F): T
Interpolate shear met. data (T/F): F
Init vert. veloc. from met. data (T/F): T
Vert. veloc. time series input (T/F): F
Interpolate vert. veloc. met. data (T/F): F

Expand All @@ -150,25 +102,10 @@ METEOROLOGY MENU:

# The only thing that should be changed here is the save frequency
DIAGNOSTIC MENU:
netCDF filename format (string): trac_avg.apcemm.hhmm
# Leave "save species timeseries" off. It will do nothing without also turning chemistry on.
SPECIES TIMESERIES SUBMENU:
Save species timeseries (T/F): F
Inst timeseries file (string): ts_hhmm.nc
#list input: separate by spaces. e.g. 1 2 3 4 5
Species indices to include (list of ints): 1
Save frequency [min] (double): 10
# Index 1 (ice) is the only relevant thing to save
AEROSOL TIMESERIES SUBMENU:
Save aerosol timeseries (T/F): T
Inst timeseries file (string): ts_aerosol_hhmm.nc
#list input: separate by spaces. e.g. 1 2 3 4 5
Aerosol indices to include (list of ints): 1
Save frequency [min] (double): 10
# Keep off if chemistry is also off
PRODUCTION & LOSS SUBMENU:
Turn on P/L diag (T/F): F
Save O3 P/L (T/F): F

# Sometimes you have to change YLIM_DOWN here if the supersaturated layer is very thick
# because YLIM_DOWN must be larger than the layer thickness.
Expand All @@ -182,13 +119,6 @@ ADVANCED OPTIONS MENU:
XLIM_LEFT (positive double): 1.0e+3
YLIM_UP (positive double): 300
YLIM_DOWN (positive double): 1.5e+3
INITIAL CONTRAIL SIZE SUBMENU:
#Depth = BaseDepth + DepthScalingFactor * Default_Depth
#Same formula for width
Base Contrail Depth [m] (double): 0.0
Contrail Depth Scaling Factor [-] (double): 1.0
Base Contrail Width [m] (double): 0.0
Contrail Width Scaling Factor [-] (double): 1.0
Ambient Lapse Rate [K/km] (double): -3.0
Tropopause Pressure [Pa] (double): 2.0e+4
EARLY PLUME SUBMENU:
Expand Down
3 changes: 0 additions & 3 deletions Code.v05-00/include/Core/Aircraft.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,6 @@ class Aircraft
inline const Vortex& vortex() const { return vortex_; }

/* Setters for engine properties */
void setEI_NOx(const double NOx);
void setEI_CO(const double CO);
void setEI_HC(const double HC);
void setEI_Soot(const double Soot);
void setSootRad(const double sootRad);
void setFuelFlow(const double ff);
Expand Down
9 changes: 0 additions & 9 deletions Code.v05-00/include/Core/Input.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,6 @@ class Input
UInt emissionDOY_ = 0;
double emissionTime_ = 0.0;

double EI_NOx_ = 0.0;
double EI_CO_ = 0.0;
double EI_HC_ = 0.0;
double EI_SO2_ = 0.0;
double EI_SO2TOSO4_ = 0.0;
double EI_Soot_ = 0.0;
Expand Down Expand Up @@ -97,9 +94,6 @@ class Input
UInt emissionMonth() const { return emissionMonth_; }
double emissionTime() const { return emissionTime_; }

double EI_NOx() const { return EI_NOx_; }
double EI_CO() const { return EI_CO_; }
double EI_HC() const { return EI_HC_; }
double EI_SO2() const { return EI_SO2_; }
double EI_SO2TOSO4() const { return EI_SO2TOSO4_; }
double EI_Soot() const { return EI_Soot_; }
Expand Down Expand Up @@ -136,9 +130,6 @@ class Input
void set_emissionDOY( UInt emissionDOY ) { emissionDOY_ = emissionDOY; }
void set_emissionTime( double emissionTime ) { emissionTime_ = emissionTime; }

void set_EI_NOx( double EI_NOx ) { EI_NOx_ = EI_NOx; }
void set_EI_CO( double EI_CO ) { EI_CO_ = EI_CO; }
void set_EI_HC( double EI_HC ) { EI_HC_ = EI_HC; }
void set_EI_SO2( double EI_SO2 ) { EI_SO2_ = EI_SO2; }
void set_EI_SO2TOSO4( double EI_SO2TOSO4 ) { EI_SO2TOSO4_ = EI_SO2TOSO4; }
void set_EI_Soot( double EI_Soot ) { EI_Soot_ = EI_Soot; }
Expand Down
49 changes: 0 additions & 49 deletions Code.v05-00/include/Core/Input_Mod.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,17 +31,8 @@ struct OptInput
int SIMULATION_OMP_NUM_THREADS;
std::string SIMULATION_OUTPUT_FOLDER;
bool SIMULATION_OVERWRITE;
bool SIMULATION_THREADED_FFT;
bool SIMULATION_USE_FFTW_WISDOM;
std::string SIMULATION_DIRECTORY_W_WRITE_PERMISSION;
std::string SIMULATION_INPUT_BACKG_COND;
std::string SIMULATION_INPUT_ENG_EI;
bool SIMULATION_SAVE_FORWARD;
std::string SIMULATION_FORWARD_FILENAME;
bool SIMULATION_ADJOINT;
std::string SIMULATION_ADJOINT_FILENAME;
bool SIMULATION_BOXMODEL;
std::string SIMULATION_BOX_FILENAME;
bool SIMULATION_FORCE_SEED;
unsigned int SIMULATION_SEED_VALUE;
epm_type SIMULATION_EPM_TYPE;
Expand All @@ -56,78 +47,42 @@ struct OptInput
/* ========================================== */

bool TRANSPORT_TRANSPORT;
bool TRANSPORT_FILL;
double TRANSPORT_TIMESTEP;
bool TRANSPORT_UPDRAFT;
double TRANSPORT_UPDRAFT_TIMESCALE;
double TRANSPORT_UPDRAFT_VELOCITY;

/* ========================================== */
/* ---- CHEMISTRY MENU ---------------------- */
/* ========================================== */

bool CHEMISTRY_CHEMISTRY;
bool CHEMISTRY_HETCHEM;
std::string CHEMISTRY_JRATE_FOLDER;

/* ========================================== */
/* ---- AEROSOL MENU ------------------------ */
/* ========================================== */

bool AEROSOL_GRAVSETTLING;
bool AEROSOL_COAGULATION_SOLID;
bool AEROSOL_COAGULATION_LIQUID;
bool AEROSOL_ICE_GROWTH;
double AEROSOL_ICE_GROWTH_TIMESTEP;

/* ========================================== */
/* ---- METEOROLOGY MENU -------------------- */
/* ========================================== */

bool MET_LOADMET;
std::string MET_FILENAME;
double MET_DT;
bool MET_LOADTEMP;
bool MET_TEMPTIMESERIES;
bool MET_INTERPTEMPDATA;
bool MET_LOADRH;
bool MET_RHTIMESERIES;
bool MET_INTERPRHDATA;
bool MET_LOADSHEAR;
bool MET_SHEARTIMESERIES;
bool MET_INTERPSHEARDATA;
bool MET_LOADVERTVELOC;
bool MET_VERTVELOCTIMESERIES;
bool MET_INTERPVERTVELOC;
bool MET_ENABLE_TEMP_PERTURB;
double MET_TEMP_PERTURB_AMPLITUDE;

/* ========================================== */
/* ---- DIAGNOSTIC MENU --------------------- */
/* ========================================== */

std::string DIAG_FILENAME;

/* ========================================== */
/* ---- TIMESERIES MENU --------------------- */
/* ========================================== */

bool TS_SPEC;
std::string TS_FILENAME;
std::vector<int> TS_SPECIES;
double TS_FREQ;
bool TS_AERO;
std::string TS_AERO_FILENAME;
std::vector<int> TS_AEROSOL;
double TS_AERO_FREQ;

/* ========================================== */
/* ---- PROD & LOSS MENU -------------------- */
/* ========================================== */

bool PL_PL;
bool PL_O3;

/* =============================================== */
/* ---- ADVANCED OPTIONS MENU -------------------- */
/* =============================================== */
Expand All @@ -138,10 +93,6 @@ struct OptInput
double ADV_GRID_XLIM_LEFT;
double ADV_GRID_YLIM_UP;
double ADV_GRID_YLIM_DOWN;
double ADV_CSIZE_DEPTH_BASE;
double ADV_CSIZE_DEPTH_SCALING_FACTOR;
double ADV_CSIZE_WIDTH_BASE;
double ADV_CSIZE_WIDTH_SCALING_FACTOR;
double ADV_AMBIENT_LAPSERATE;
double ADV_TROPOPAUSE_PRESSURE;
double ADV_EP_N_REF;
Expand Down
39 changes: 0 additions & 39 deletions Code.v05-00/include/Core/MPMSimVarsWrapper.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,33 +9,14 @@ struct MPMSimVarsWrapper{
/* --- Input options from the SIMULATION MENU ---------------------------- */
/* ======================================================================= */

bool RUN_BOXMODEL;
bool BUILD_LUT;
bool SAVE_FORWARD;
bool ADJOINT;
std::string BACKG_FILENAME;
bool THREADED_FFT;
bool USE_WISDOM;
std::string FFTW_DIR;

/* ======================================================================= */
/* ---- Input options from the TRANSPORT MENU ---------------------------- */
/* ======================================================================= */

bool TRANSPORT;
bool FILLNEG;

bool UPDRAFT;
double UPDRAFT_TIME;
double UPDRAFT_VEL;

/* ======================================================================= */
/* ---- Input options from the CHEMISTRY MENU ---------------------------- */
/* ======================================================================= */

bool CHEMISTRY;
bool HETCHEM;
std::string JRATE_FOLDER;

/* ======================================================================= */
/* ---- Input options from the AEROSOL MENU ------------------------------ */
Expand All @@ -56,35 +37,15 @@ struct MPMSimVarsWrapper{
bool TEMP_PERTURB;
double metDepth;

/* ======================================================================= */
/* ---- Input options from the DIAGNOSTIC MENU --------------------------- */
/* ======================================================================= */

std::string DIAG_FILENAME;

/* ======================================================================= */
/* ---- Input options from the TIMESERIES MENU --------------------------- */
/* ======================================================================= */

std::string TS_FOLDER;
bool TS_SPEC;
std::string TS_SPEC_FILEPATH;
std::vector<int> TS_SPEC_LIST;
double TS_FREQ;

bool TS_AERO;
std::string TS_AERO_FILEPATH;
std::vector<int> TS_AERO_LIST;
double TS_AERO_FREQ;

/* ======================================================================= */
/* ---- Input options from the PROD & LOSS MENU -------------------------- */
/* ======================================================================= */

/* TODO: Implement PL rates */
bool SAVE_PL;
bool SAVE_O3PL;

/* If DIAG_OUTPUT is turned on, make sure that output timestep is a
* multiple of the dynamic timestep */

Expand Down
1 change: 0 additions & 1 deletion Code.v05-00/include/Core/Meteorology.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,6 @@ class Meteorology


//Information on loading
bool useMetFileInput_;
MetVarLoadType tempLoadType_;
MetVarLoadType rhLoadType_;
MetVarLoadType shearLoadType_;
Expand Down
Loading