Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Maintenance - Mise à jour mensuelle Lundi 6 Février entre 7h00 et 9h00
Open sidebar
record
sunflo
Commits
023a5ed4
Commit
023a5ed4
authored
Jun 27, 2019
by
RemiM
Committed by
Ronan Trepos
Sep 24, 2019
Browse files
Finish computations of indicators
parent
9b75dd11
Changes
1
Hide whitespace changes
Inline
Side-by-side
sunflo/src/Diagnostic.cpp
View file @
023a5ed4
...
...
@@ -80,8 +80,13 @@ public :
// Thermal stress entre germinatioan et initiation florale.
Var
NHT28_EF
;
// Thermal stress during
whole season
// Thermal stress during whole season
Var
NHT28
;
// Radiations
Var
RG
;
// Sum of radiations during flowering
Var
SGR_FM
;
////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////
...
...
@@ -111,6 +116,11 @@ public :
MET_EF
.
init
(
this
,
"MET_MH"
,
events
);
NHT28_EF
.
init
(
this
,
"NHT28_EF.init"
,
events
);
SGR_FM
.
init
(
this
,
"SGR_FM"
,
events
);
RG
.
init
(
this
,
"RG"
,
events
);
PhasePhenoPlante
.
init
(
this
,
"PhasePhenoPlante"
,
events
);
////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////
...
...
@@ -137,6 +147,7 @@ public :
MET_EF
=
0.0
;
NHT_28
=
0.0
;
NHT28_MH
=
0.0
;
SGR_FM
=
0.0
;
////////////////////////////////////////////////////////////////////////
}
else
{
{
...
...
@@ -283,6 +294,21 @@ public :
NHT28
=
NHT28
(
-
1
)
+
ddt
;
}
// calcul de SGR_FM
{
double
ddt
=
0.0
;
if
(
PhasePhenoPlante
()
!=
PHASEPHENOPLANTE_FLORAISON
){
ddt
=
0.0
;
}
else
{
ddt
=
RG
();
}
SGR_FM
=
SGR_FM
(
-
1
)
+
ddt
;
}
////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////
}
...
...
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