Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
record
azodyn
Commits
3b76942f
Commit
3b76942f
authored
Apr 19, 2019
by
Ronan Trepos
Browse files
Frost : fix ST_S_i and ST_S_f equations
Integration of work of M. Chanis on Pea.
parent
b6bc11e1
Changes
2
Hide whitespace changes
Inline
Side-by-side
AZODYN/exp/AzodynBarley.vpz
View file @
3b76942f
...
...
@@ -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"
/>
...
...
AZODYN/src/Frost.cpp
View file @
3b76942f
...
...
@@ -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
=
STap
LEVEE
()
-
STap
S
()
+
pp
.
NbFi
*
pp
.
phyllo
;
ST_S_i
=
STap
S
()
-
STap
LEVEE
()
+
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
=
STap
LEVEE
()
-
STap
S
()
+
pp
.
NbFf
*
pp
.
phyllo
;
ST_S_f
=
STap
S
()
-
STap
LEVEE
()
+
pp
.
NbFf
*
pp
.
phyllo
;
//Calcul de Rmax
if
(
STapS
()
<=
ST_S_i
())
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment