diff --git a/src/CLibForeFire.cpp b/src/CLibForeFire.cpp index 7af7518..b25de75 100644 --- a/src/CLibForeFire.cpp +++ b/src/CLibForeFire.cpp @@ -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"); @@ -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 );; diff --git a/src/propagation/FarsitePropagationModel.cpp b/src/propagation/FarsitePropagationModel.cpp index 144e7af..78897ee 100644 --- a/src/propagation/FarsitePropagationModel.cpp +++ b/src/propagation/FarsitePropagationModel.cpp @@ -53,6 +53,7 @@ namespace libforefire size_t idx_heatl; /*! local variables */ + double adjustementWind; std::ofstream csvfile; /*! result of the model */ double getSpeed(double *); @@ -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"); @@ -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];