Commit 65df3b7b authored by Thomas Fetzer's avatar Thomas Fetzer

[mhs][mm] Fix compiler warnings

parent 8e551bf9
......@@ -49,11 +49,11 @@ class GroundwaterSpatialParams: public FVSpatialParamsOneP<TypeTag>
struct Lens
{
Lens(const GlobalPosition& upperRight, const GlobalPosition& lowerLeft, const Scalar& permeability)
: lowerLeft(lowerLeft), upperRight(upperRight), permeability(permeability) {}
Lens(const GlobalPosition& upRight, const GlobalPosition& lowLeft, const Scalar& perm)
: upperRight(upRight), lowerLeft(lowLeft), permeability(perm) {}
const GlobalPosition lowerLeft;
const GlobalPosition upperRight;
const GlobalPosition lowerLeft;
const Scalar permeability;
};
......
......@@ -227,20 +227,20 @@ public:
void episodeEnd()
{
indexEpisode = this->timeManager().episodeIndex();
indexEpisode_ = this->timeManager().episodeIndex();
// Start new episode if episode is over
// for first 10 year episode length is 1 year
this->timeManager().startNextEpisode(3600*12); //episode length sent to 12 hours
std::cout<<"Episode index is set to: "<<indexEpisode <<std::endl;
std::cout<<"Episode index is set to: "<<indexEpisode_ <<std::endl;
if (std::fmod(indexEpisode,2) == 0)
if (std::fmod(indexEpisode_,2) == 0)
{
std::cout<<"Episode index is: "<<indexEpisode << ", which is an even episode index and this is a non-injection phase "<<std::endl;
std::cout<<"Episode index is: "<<indexEpisode_ << ", which is an even episode index and this is a non-injection phase "<<std::endl;
}
else
{
std::cout<<"Episode index is: "<<indexEpisode << ", which is an odd episode index and this is an injection phase "<<std::endl;
std::cout<<"Episode index is: "<<indexEpisode_ << ", which is an odd episode index and this is an injection phase "<<std::endl;
}
}
......@@ -490,7 +490,7 @@ private:
mutable Scalar massProducedWater_;
// int vectorSize;
Scalar episodeLength_;
Scalar indexEpisode;
int indexEpisode_;
std::string name_;
// std::string name_;
// std::ifstream inputFile; //Input file stream object
......
......@@ -490,7 +490,6 @@ private:
Scalar pOut_;
//int vectorSize;
Scalar episodeLength_;
Scalar indexEpisode;
std::string name_;
Scalar totalMassProducedOil_;
Scalar totalMassProducedWater_;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment