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: 1 addition & 1 deletion src/BurningRatioLayer.h
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ template<typename T> class BurningRatioLayer : public DataLayer<T> {
BurningRatioLayer() : DataLayer<T>() {};
/*! \brief Constructor with all necessary information */
BurningRatioLayer(string name, FFPoint& atmoSWCorner, FFPoint& atmoNECorner, const size_t& nnx, const size_t& nny, FDCell** FDcells)
: DataLayer<T>(name), SWCorner(atmoSWCorner), NECorner(atmoNECorner), nx(nnx), ny(nny), cells(FDcells) {
: DataLayer<T>(name), nx(nnx), ny(nny), SWCorner(atmoSWCorner), NECorner(atmoNECorner), cells(FDcells) {
size = nx*ny;
ratioMap = new FFArray<T>("BRatio", 0., nx, ny);
latestCall = -1.;
Expand Down
17 changes: 0 additions & 17 deletions src/Command.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2235,23 +2235,6 @@ namespace libforefire
return error;
}

auto isoToSeconds = [&](const string &iso) -> double
{
if (iso == stringError)
return FLOATERROR;
SimulationParameters *simParam = SimulationParameters::GetInstance();
int year = 0, yday = 0;
double secs = 0.;
if (!simParam->ISODateDecomposition(iso, secs, year, yday))
{
return FLOATERROR;
}
return simParam->SecsBetween(simParam->getDouble("refTime"),
simParam->getInt("refYear"),
simParam->getInt("refDay"),
secs, year, yday);
};

auto parsePointString = [&](const string &raw, bool lonlat) -> FFPoint
{
if (raw == stringError || raw.size() < 2)
Expand Down
1 change: 0 additions & 1 deletion src/DataBroker.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -419,7 +419,6 @@ namespace libforefire
void DataBroker::createEmptyTwoTimeArrayLayer(const string &name, FFPoint &Forigin, double addTime, const double dx, const double dy )
{

FFArray<double>* xARR = new FFArray<double>(name, 0., atmosphericNy, atmosphericNy);
FFArray<double>* xARRDT = new FFArray<double>(name, 0., atmosphericNx+2, atmosphericNy+2);
FFArray<double>* xARRT = new FFArray<double>("Old"+name, 0., atmosphericNx+2, atmosphericNy+2);
TwoTimeArrayLayer<double> *xLAY = new TwoTimeArrayLayer<double>(name,
Expand Down
2 changes: 0 additions & 2 deletions src/FireDomain.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1415,8 +1415,6 @@
// Checking whether a location is still burning
bool FireDomain::isBurnt(FFPoint& loc, const double& t){
/* the location is considered to be burnt if at < t*/
double at = getArrivalTime(loc);

return t>getArrivalTime(loc);


Expand Down
8 changes: 0 additions & 8 deletions src/FluxLayer.h
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,6 @@ void FluxLayer<T>::addEmission(const FFPoint& center, double area, double startT

template<typename T>
void FluxLayer<T>::getMatrix(FFArray<T>** matrix, const double& t){
int domID = params->getInt("mpirank");


if ( t != latestCallGetMatrix ){
Expand All @@ -361,22 +360,15 @@ void FluxLayer<T>::getMatrix(FFArray<T>** matrix, const double& t){
pruneEmissions(t);


double sumAdded = 0.0;
for ( size_t i = 0; i < nx; i++ ){
for ( size_t j = 0; j < ny; j++ ){
double base = cells[i][j].applyModelsOnBmap(fluxName, latestCallGetMatrix, t, modelCount);
double cx = SWCorner.getX() + ( (double)i + 0.5 ) * dx;
double cy = SWCorner.getY() + ( (double)j + 0.5 ) * dy;
double added = emissionContributionAt(cx, cy, t);
(*flux)(i,j) = base + added;
sumAdded += (added+base);
}
}
if ((domID == 1 ) && (fluxName == "heatFlux" )){
double diffN = t - latestCallGetMatrix ;
//cout<<"ID "<<domID<<". "<<this->getKey() <<" has "<<sumAdded<<" at time "<< t <<" and "<< latestCallGetMatrix << " and " << diffN<< endl;
}

latestCallGetMatrix = t;
}
// Affecting the computed matrix to the desired array
Expand Down
2 changes: 1 addition & 1 deletion src/RosLayer.h
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ template<typename T> class RosLayer : public DataLayer<T> {
RosLayer() : DataLayer<T>() {};
/*! \brief Constructor with all necessary information */
RosLayer(string name,FFPoint& atmoSWCorner, FFPoint& atmoNECorner, const size_t& nnx, const size_t& nny, FDCell** FDcells)
: DataLayer<T>(name), SWCorner(atmoSWCorner), NECorner(atmoNECorner), nx(nnx), ny(nny), cells(FDcells) {
: DataLayer<T>(name), nx(nnx), ny(nny), SWCorner(atmoSWCorner), NECorner(atmoNECorner), cells(FDcells) {
size = nx*ny;
rosMap = new FFArray<T>("Ros", 0., nx, ny);
latestCall = -1.;
Expand Down
Loading