Commit 3b76942f authored by Ronan Trepos's avatar Ronan Trepos
Browse files

Frost : fix ST_S_i and ST_S_f equations

Integration of work of M. Chanis on Pea.
parent b6bc11e1
......@@ -11,7 +11,7 @@
<port name="I"/>
</out>
</model>
<model observables="oFrost" conditions="cFrost,cPlant,cBegin,cCrop" dynamics="dFrost" width="100" height="225" y="689" x="616" name="Frost" type="atomic">
<model observables="oFrost" conditions="cFrost,cPlant,cBegin,cCrop" dynamics="dFrost" width="100" height="225" y="821" x="578" name="Frost" type="atomic">
<in>
<port name="STapLEVEE"/>
<port name="STapS"/>
......
......@@ -56,10 +56,10 @@ public:
//---------------------------------//
//Calcul de la somme de température entre le semis et le stade initial ou on l'augmente le Rmax
ST_S_i = STapLEVEE() - STapS() + pp.NbFi * pp.phyllo;
ST_S_i = STapS() - STapLEVEE() + pp.NbFi * pp.phyllo;
//Calcul de la somme de température entre le semis et le stade final ou on l'augmente plus le Rmax
ST_S_f = STapLEVEE() - STapS() + pp.NbFf * pp.phyllo;
ST_S_f = STapS() - STapLEVEE() + pp.NbFf * pp.phyllo;
//Calcul de Rmax
if(STapS()<= ST_S_i()) {
......
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