Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 0 additions & 2 deletions src/CLibForeFire.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -496,7 +496,6 @@ void FFGetDoubleArray(const char* mname, double t
}
if (tmpname == "injectedAtGround"){
double atmosphericTimeStep = SimulationParameters::GetInstance()->getDouble("atmosphericTimeStep");
double atmoSurf = SimulationParameters::GetInstance()->getDouble("atmosphericCellLength") * SimulationParameters::GetInstance()->getDouble("atmosphericCellWidth");
double sumInjected = SimulationParameters::GetInstance()->getDouble("sumInjected");


Expand All @@ -507,7 +506,6 @@ void FFGetDoubleArray(const char* mname, double t

if (tmpname == "spotAtGround"){
double atmosphericTimeStep = SimulationParameters::GetInstance()->getDouble("atmosphericTimeStep");
double atmoSurf = SimulationParameters::GetInstance()->getDouble("atmosphericCellLength") * SimulationParameters::GetInstance()->getDouble("atmosphericCellWidth");

double sumSedimented = SimulationParameters::GetInstance()->getDouble("sumSedimented");
sumSedimented = sumSedimented + ((fullMatrix->sum()) * atmosphericTimeStep );;
Expand Down
5 changes: 3 additions & 2 deletions src/propagation/FarsitePropagationModel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ namespace libforefire
size_t idx_heatl;

/*! local variables */
double adjustementWind;
std::ofstream csvfile;
/*! result of the model */
double getSpeed(double *);
Expand Down Expand Up @@ -115,7 +116,7 @@ namespace libforefire

/* registering the model in the data broker */
dataBroker->registerPropagationModel(this);
double adjustementWind = 1.0;
adjustementWind = 1.0;
if (params->isValued("Farsite.adjustementWind"))
adjustementWind = params->getDouble("Farsite.adjustementWind");

Expand Down Expand Up @@ -182,7 +183,7 @@ namespace libforefire
//-----------------------------------------------------------------------------
// 2) Read actual values from valueOf
//-----------------------------------------------------------------------------
double windspd = valueOf[idx_wind]; // wind along the normal, m/s
double windspd = adjustementWind * valueOf[idx_wind]; // wind along the normal, m/s
double slope = valueOf[idx_slope]; // tangent of the slope along the normal
// moinstures variables
double m_ones = valueOf[idx_m_ones];
Expand Down
Loading