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
36 changes: 18 additions & 18 deletions src/ArrayDataLayer.h
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ template<typename T> class Array3DdataLayer : public DataLayer<T> {
/*! \brief directly stores the desired values in a given array */
size_t getValuesAt(FFPoint, const double&, FluxModel*, size_t);

void setValueAt(FFPoint loc, double tval, T value){};
void setValueAt(FFPoint /*loc*/, double /*tval*/, T /*value*/){};
/*! \brief getter to the pointer on the FFArray */
void getMatrix(FFArray<T>**, const double&);
/*! \brief stores data from a fortran array into the FFArray */
Expand Down Expand Up @@ -146,7 +146,7 @@ T Array3DdataLayer<T>::getValueAt(FireNode* fn){
}

template<typename T>
T Array3DdataLayer<T>::getValueAt(FFPoint loc, const double& time){
T Array3DdataLayer<T>::getValueAt(FFPoint loc, const double& /*time*/){
if ( interp == nearestData ) return getNearestData(loc);
if ( interp == bilinear ) return bilinearInterp(loc);
cout<<"WARNING: unknown interpolation method in "
Expand All @@ -161,14 +161,14 @@ FFPoint& getOriginPoint();
FFPoint& getSpan();

template<typename T>
size_t Array3DdataLayer<T>::getValuesAt(FireNode* fn
, PropagationModel* model, size_t curItem){
size_t Array3DdataLayer<T>::getValuesAt(FireNode* /*fn*/
, PropagationModel* /*model*/, size_t /*curItem*/){
return 0;
}

template<typename T>
size_t Array3DdataLayer<T>::getValuesAt(FFPoint loc, const double&
, FluxModel* model, size_t curItem){
size_t Array3DdataLayer<T>::getValuesAt(FFPoint /*loc*/, const double&
, FluxModel* /*model*/, size_t /*curItem*/){
return 0;
}

Expand Down Expand Up @@ -244,13 +244,13 @@ T Array3DdataLayer<T>::bilinearInterp(FFPoint loc){

template<typename T>
void Array3DdataLayer<T>::getMatrix(
FFArray<T>** matrix, const double& time){
FFArray<T>** matrix, const double& /*time*/){
*matrix = array;
}

template<typename T>
void Array3DdataLayer<T>::setMatrix(string& mname, double* inMatrix
, const size_t& sizein, size_t& sizeout, const double& time){
void Array3DdataLayer<T>::setMatrix(string& /*mname*/, double* inMatrix
, const size_t& sizein, size_t& /*sizeout*/, const double& /*time*/){
if ( array->getSize() == sizein ){
// copying data from atmospheric matrix
array->copyDataFromFortran(inMatrix);
Expand Down Expand Up @@ -376,7 +376,7 @@ template<typename T> class Array2DdataLayer : public DataLayer<T> {
size_t getValuesAt(FireNode*, PropagationModel*, size_t);
/*! \brief directly stores the desired values in a given array */
size_t getValuesAt(FFPoint, const double&, FluxModel*, size_t);
void setValueAt(FFPoint loc, double tval, T value){};
void setValueAt(FFPoint /*loc*/, double /*tval*/, T /*value*/){};
/*! \brief getter to the pointer on the FFArray */
void getMatrix(FFArray<T>**, const double&);
/*! \brief stores data from a fortran array into the FFArray */
Expand Down Expand Up @@ -417,7 +417,7 @@ T Array2DdataLayer<T>::getValueAt(FireNode* fn){
}

template<typename T>
T Array2DdataLayer<T>::getValueAt(FFPoint loc, const double& time){
T Array2DdataLayer<T>::getValueAt(FFPoint loc, const double& /*time*/){
if ( interp == nearestData ) return getNearestData(loc);
if ( interp == bilinear ) return bilinearInterp(loc);
cout<<"WARNING: unknown interpolation method in "
Expand All @@ -426,14 +426,14 @@ T Array2DdataLayer<T>::getValueAt(FFPoint loc, const double& time){
}

template<typename T>
size_t Array2DdataLayer<T>::getValuesAt(FireNode* fn
, PropagationModel* model, size_t curItem){
size_t Array2DdataLayer<T>::getValuesAt(FireNode* /*fn*/
, PropagationModel* /*model*/, size_t /*curItem*/){
return 0;
}

template<typename T>
size_t Array2DdataLayer<T>::getValuesAt(FFPoint loc, const double&
, FluxModel* model, size_t curItem){
size_t Array2DdataLayer<T>::getValuesAt(FFPoint /*loc*/, const double&
, FluxModel* /*model*/, size_t /*curItem*/){
return 0;
}

Expand Down Expand Up @@ -506,13 +506,13 @@ T Array2DdataLayer<T>::bilinearInterp(FFPoint loc){

template<typename T>
void Array2DdataLayer<T>::getMatrix(
FFArray<T>** matrix, const double& time){
FFArray<T>** matrix, const double& /*time*/){
*matrix = array;
}

template<typename T>
void Array2DdataLayer<T>::setMatrix(string& mname, double* inMatrix
, const size_t& sizein, size_t& sizeout, const double& time){
void Array2DdataLayer<T>::setMatrix(string& /*mname*/, double* inMatrix
, const size_t& sizein, size_t& /*sizeout*/, const double& /*time*/){
if ( array->getSize() == sizein ){
// copying data from atmospheric matrix
array->copyDataFromFortran(inMatrix);
Expand Down
20 changes: 10 additions & 10 deletions src/BurningMapLayer.h
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ template<typename T> class BurningMapLayer : public DataLayer<T> {
size_t getValuesAt(FireNode*, PropagationModel*, size_t);
/*! \brief directly stores the desired values in a given array */
size_t getValuesAt(FFPoint, const double&, FluxModel*, size_t);
void setValueAt(FFPoint loc, double tval, T value){};
void setValueAt(FFPoint /*loc*/, double /*tval*/, T /*value*/){};
/*! \brief getter to the pointer on the FFArray */
void getMatrix(FFArray<T>**, const double&);
/*! \brief stores data from a fortran array into the FFArray */
Expand Down Expand Up @@ -101,19 +101,19 @@ T BurningMapLayer<T>::getValueAt(FireNode* fn){
}

template<typename T>
T BurningMapLayer<T>::getValueAt(FFPoint loc, const double& time){
T BurningMapLayer<T>::getValueAt(FFPoint loc, const double& /*time*/){
return getNearestData(loc);
}

template<typename T>
size_t BurningMapLayer<T>::getValuesAt(FireNode* fn
, PropagationModel* model, size_t curItem){
size_t BurningMapLayer<T>::getValuesAt(FireNode* /*fn*/
, PropagationModel* /*model*/, size_t /*curItem*/){
return 0;
}

template<typename T>
size_t BurningMapLayer<T>::getValuesAt(FFPoint loc, const double& t
, FluxModel* model, size_t curItem){
size_t BurningMapLayer<T>::getValuesAt(FFPoint /*loc*/, const double& /*t*/
, FluxModel* /*model*/, size_t /*curItem*/){
return 0;
}

Expand Down Expand Up @@ -143,8 +143,8 @@ void BurningMapLayer<T>::getMatrix(
}

template<typename T>
void BurningMapLayer<T>::setMatrix(string& mname, double* inMatrix
, const size_t& sizein, size_t& sizeout, const double& time){
void BurningMapLayer<T>::setMatrix(string& /*mname*/, double* inMatrix
, const size_t& sizein, size_t& /*sizeout*/, const double& /*time*/){
if ( arrivalTimes->getSize() == sizein ){
arrivalTimes->copyDataFromFortran(inMatrix);
} else {
Expand All @@ -164,8 +164,8 @@ string BurningMapLayer<T>::print2D(size_t i, size_t j){
}

template<typename T>
void BurningMapLayer<T>::dumpAsBinary(string filename, const double& time
, FFPoint& SWC, FFPoint& NEC, size_t& nnx, size_t& nny){
void BurningMapLayer<T>::dumpAsBinary(string filename, const double& /*time*/
, FFPoint& /*SWC*/, FFPoint& /*NEC*/, size_t& /*nnx*/, size_t& /*nny*/){
/* writing the matrix in a binary file */
ostringstream outputfile;
outputfile<<filename<<"."<<this->getKey();
Expand Down
22 changes: 11 additions & 11 deletions src/BurningRatioLayer.h
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ template<typename T> class BurningRatioLayer : public DataLayer<T> {
size_t getValuesAt(FireNode*, PropagationModel*, size_t);
/*! \brief directly stores the desired values in a given array */
size_t getValuesAt(FFPoint, const double&, FluxModel*, size_t);
void setValueAt(FFPoint loc, double tval, T value){};
void setValueAt(FFPoint /*loc*/, double /*tval*/, T /*value*/){};
/*! \brief getter to the pointer on the FFArray */
void getMatrix(FFArray<T>**, const double&);
/*! \brief stores data from a fortran array into the FFArray */
Expand Down Expand Up @@ -104,24 +104,24 @@ T BurningRatioLayer<T>::getValueAt(FireNode* fn){
}

template<typename T>
T BurningRatioLayer<T>::getValueAt(FFPoint loc, const double& time){
T BurningRatioLayer<T>::getValueAt(FFPoint loc, const double& /*time*/){
return getNearestData(loc);
}

template<typename T>
size_t BurningRatioLayer<T>::getValuesAt(FireNode* fn
, PropagationModel* model, size_t curItem){
size_t BurningRatioLayer<T>::getValuesAt(FireNode* /*fn*/
, PropagationModel* /*model*/, size_t /*curItem*/){
return 0;
}

template<typename T>
size_t BurningRatioLayer<T>::getValuesAt(FFPoint loc, const double& t
, FluxModel* model, size_t curItem){
size_t BurningRatioLayer<T>::getValuesAt(FFPoint /*loc*/, const double& /*t*/
, FluxModel* /*model*/, size_t /*curItem*/){
return 0;
}

template<typename T>
T BurningRatioLayer<T>::getNearestData(FFPoint loc){
T BurningRatioLayer<T>::getNearestData(FFPoint /*loc*/){
cout<<"BurningRatioLayer<T>::getNearestData() "
<<"shouldn't have been called"<<endl;
return 0.;
Expand Down Expand Up @@ -156,8 +156,8 @@ void BurningRatioLayer<T>::getMatrix(
}

template<typename T>
void BurningRatioLayer<T>::setMatrix(string& mname, double* inMatrix
, const size_t& sizein, size_t& sizeout, const double& time){
void BurningRatioLayer<T>::setMatrix(string& /*mname*/, double* inMatrix
, const size_t& sizein, size_t& /*sizeout*/, const double& /*time*/){
if ( ratioMap->getSize() == sizein ){
ratioMap->copyDataFromFortran(inMatrix);
} else {
Expand All @@ -177,8 +177,8 @@ string BurningRatioLayer<T>::print2D(size_t i, size_t j){
}

template<typename T>
void BurningRatioLayer<T>::dumpAsBinary(string filename, const double& time
, FFPoint& SWC, FFPoint& NEC, size_t& nnx, size_t& nny){
void BurningRatioLayer<T>::dumpAsBinary(string filename, const double& /*time*/
, FFPoint& /*SWC*/, FFPoint& /*NEC*/, size_t& /*nnx*/, size_t& /*nny*/){
/* writing the matrix in a binary file */
ostringstream outputfile;
outputfile<<filename<<"."<<this->getKey();
Expand Down
16 changes: 8 additions & 8 deletions src/CLibForeFire.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ void MNHCreateDomain(const int id
, const double lat, const double lon
, const int mdimx, const double* meshx
, const int mdimy, const double* meshy
, const int mdimz, const double* zgrid
, const int mdimz, const double* /*zgrid*/
, const double dt){

/* Defining the Fire Domain */
Expand Down Expand Up @@ -623,7 +623,7 @@ void executeMNHCommand(const char* cmd){
executor.ExecuteCommand(scmd);
}

void FFPutString(const char* mname, char* str){
void FFPutString(const char* /*mname*/, char* /*str*/){
// NOT TO BE CALLED
}

Expand All @@ -643,13 +643,13 @@ void FFGetInt(const char* mname, int* n){
SimulationParameters::GetInstance()->setInt(name, *n);
}

void FFPutIntArray(const char* mname, int* x,
size_t sizein, size_t sizeout){
void FFPutIntArray(const char* /*mname*/, int* /*x*/,
size_t /*sizein*/, size_t /*sizeout*/){
// TODO
}

void FFGetIntArray(const char* mname, double time
, int* x, int sizein, int sizeout){
void FFGetIntArray(const char* /*mname*/, double /*time*/
, int* /*x*/, int /*sizein*/, int /*sizeout*/){
// TODO
}

Expand All @@ -664,7 +664,7 @@ void FFGetDouble(const char* mname, double* x){
}

void FFPutDoubleArray(const char* mname, double* x,
size_t sizein, size_t sizeout){
size_t /*sizein*/, size_t /*sizeout*/){
string tmpname(mname);
// searching for concerned layer

Expand Down Expand Up @@ -698,7 +698,7 @@ void FFPutDoubleArray(const char* mname, double* x,


void FFDumpDoubleArray(size_t nmodel, size_t nip, const char* mname, double t
, double* x, size_t sizein, size_t ni, size_t nj, size_t nk, size_t sizeout){
, double* x, size_t sizein, size_t ni, size_t nj, size_t nk, size_t /*sizeout*/){

string tmpname(mname);
ostringstream outputfile;
Expand Down
Loading
Loading