Commit 15aa6916 authored by jouke's avatar jouke
Browse files

Fixes for the evapotranspiration computations.

parent 31a5a3c9

OpenSimRoot/InputFiles/environments/A-climateChambersFZJ/atmosphere.xml

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
			    2548.8 uMol/cm2/day (based on 12 hour day)

			    about 25% less because of mornings and evenings ?

			    		   

              2.8330E-3 MJ/cm2/d sunny summers day in the Netherlands: day 190 year 1999 data KNMI ; NOTE: use PAR/RDD ratio of 0.5--> 

              2.8330E-3 MJ/cm2/d sunny summers day in the Netherlands: day 190 year 1999 data KNMI ;--> 

			</SimulaConstant>

			<SimulaConstant name="PAR/RDD"  unit="100%" >

			<!--note="optional conversion factor from RDD to PAR - normally 0.5; only used if irradiation isn't converted yet otherwise set to 1"-->

OpenSimRoot/InputFiles/environments/Rocksprings/atmosphere.xml

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ You should have received the GNU GENERAL PUBLIC LICENSE v3 with this file in lic 
			    2548.8 uMol/cm2/day (based on 12 hour day)

			    about 25% less because of mornings and evenings ?

			    		   

              2.8330E-3 Mj/cm2/d sunny summers day in the Netherlands: day 190 year 1999 data KNMI ; NOTE: use PAR/RDD ratio of 0.5-->

              2.8330E-3 Mj/cm2/d sunny summers day in the Netherlands: day 190 year 1999 data KNMI ; -->

			</SimulaConstant>

			<SimulaTable

				name_column2="precipitation"

OpenSimRoot/InputFiles/environments/WageningseBovenBuurt/atmosphere.xml

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ You should have received the GNU GENERAL PUBLIC LICENSE v3 with this file in lic 
			    2548.8 uMol/cm2/day (based on 12 hour day)

			    about 25% less because of mornings and evenings ?

			    		   

              2.8330E-3 Mj/cm2/d sunny summers day in the Netherlands: day 190 year 1999 data KNMI ; NOTE: use PAR/RDD ratio of 0.5-->

              2.8330E-3 Mj/cm2/d sunny summers day in the Netherlands: day 190 year 1999 data KNMI ;-->

			</SimulaConstant>

			<SimulaTable

				name_column2="precipitation"

OpenSimRoot/src/engine/SimulaBase.cpp

+5 −0
Original line number Diff line number Diff line
@@ -884,6 +884,11 @@ void SimulaBase::getRate(const Time &t, Time &var){ 
void SimulaBase::get(const Time &t, Time &var){

	msg::error("SimulaBase::get: double requested, but not simulated by this simula object: "+getPath()+" of type: "+getType());

}

double SimulaBase::getDouble(const Time &t){

	double v;

	this->get(t,v);

	return(v);

}



void SimulaBase::getRate(const Time &t, Coordinate &var){

	parent_->get(t,var);

OpenSimRoot/src/engine/SimulaBase.hpp

+1 −0
Original line number Diff line number Diff line
@@ -163,6 +163,7 @@ public: 
	virtual void get(std::string &returnConstant);

	virtual void get(bool &returnConstant);

	virtual void get(const Time &x, Time &y);

	virtual double getDouble(const Time &x);//to simplify code

	virtual void get(Time &x);

	virtual void get(const Time &t, const Coordinate & pos, double &y);

	virtual void get(const Time &t, const Coordinate & pos, Coordinate &y);