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
sunflo
Commits
4de53c84
Commit
4de53c84
authored
Aug 05, 2019
by
RemiM
Committed by
Ronan Trepos
Sep 24, 2019
Browse files
Add missing ports and change views names
parent
02ae45b8
Changes
4
Hide whitespace changes
Inline
Side-by-side
sunflo/exp/sunflo_web_modified_TT.vpz
View file @
4de53c84
...
...
@@ -87,7 +87,7 @@
<port
name=
"ISH3"
/>

</out>

</model>

<model
observables=
"phenologie"
conditions=
"
itk,
cBegin,CONFIG_SimuInit,CONFIG_
Variete,phenologie,EXPERT_Plante
,CONFIG_Plante,EXPERT_
SimuInit
"
width=
"100"
dynamics=
"Phenologie"
height=
"105"
x=
"252"
y=
"22"
name=
"phenologie"
type=
"atomic"
>

<model
observables=
"phenologie"
conditions=
"cBegin,CONFIG_
Variete,EXPERT_
SimuInit,CONFIG_
SimuInit,itk
,CONFIG_Plante,EXPERT_
Plante,phenologie
"
width=
"100"
dynamics=
"Phenologie"
height=
"105"
x=
"252"
y=
"22"
name=
"phenologie"
type=
"atomic"
>

<in>

<port
name=
"ActionRecolte"
/>

<port
name=
"ActionSemis"
/>

...
...
@@ -1444,32 +1444,7 @@
</set>

</port>

</condition>

<condition
name=
"itk"
>

<port
name=
"fertilization_1"
>

<string>
date=2006-04-10$dose=0
</string>

</port>

<port
name=
"irrigation_1"
>

<double>
0
</double>

</port>

<port
name=
"densite"
>

<double>
7.000000000000000
</double>

</port>

<port
name=
"jrecolte"
>

<string>
2006-10-01
</string>

</port>

<port
name=
"jsemis"
>

<string>
2006-04-16
</string>

</port>

<port
name=
"zSemis"
>

<double>
30.000000000000000
</double>

</port>

<port
name=
"fertilization_2"
>

<double>
0
</double>

</port>

<port
name=
"irrigation_2"
>

<double>
0
</double>

</port>

</condition>


<condition
name=
"phenologie"
>



...
...
@@ -1520,6 +1495,54 @@
<string>
2006-04-08
</string>

</port>

</condition>

<condition
name=
"itk"
>
<port
name=
"fertilization_1"
>
<string>
date=2006-04-10$dose=0
</string>
</port>
<port
name=
"irrigation_1"
>
<double>
0
</double>
</port>
<port
name=
"densite"
>
<double>
7.000000000000000
</double>
</port>
<port
name=
"jrecolte"
>
<string>
2006-10-01
</string>
</port>
<port
name=
"jsemis"
>
<string>
2006-04-16
</string>
</port>
<port
name=
"zSemis"
>
<double>
30.000000000000000
</double>
</port>
<port
name=
"irrigation_2"
>
<double>
0
</double>
</port>
<port
name=
"fertilization_2"
>
<string>
0
</string>
</port>
<port
name=
"irrigation_3"
>
<double>
0
</double>
</port>
<port
name=
"irrigation_4"
>
<double>
0
</double>
</port>
<port
name=
"irrigation_5"
>
<double>
0
</double>
</port>
<port
name=
"irrigation_6"
>
<double>
0
</double>
</port>
<port
name=
"irrigation_7"
>
<double>
0
</double>
</port>
<port
name=
"irrigation_8"
>
<double>
0
</double>
</port>
<port
name=
"irrigation_9"
>
<double>
0
</double>
</port>
</condition>
</conditions>

<views>

<outputs>

...
...
sunflo/exp/sunflo_web_modified_TT_new_model.vpz
View file @
4de53c84
...
...
@@ -1209,7 +1209,10 @@
<double>
20.000000000000000
</double>

</port>


</condition>

<port
name=
"date_levee"
>
<double>
-1
</double>
</port>
</condition>

<condition
name=
"CONFIG_Sol"
>

<port
name=
"Fpf"
>

<double>
0.200000000000000
</double>

...
...
@@ -1565,6 +1568,27 @@
<port
name=
"irrigation_2"
>

<double>
0
</double>

</port>

<port
name=
"irrigation_3"
>
<double>
0
</double>
</port>
<port
name=
"irrigation_4"
>
<double>
0
</double>
</port>
<port
name=
"irrigation_5"
>
<double>
0
</double>
</port>
<port
name=
"irrigation_6"
>
<double>
0
</double>
</port>
<port
name=
"irrigation_7"
>
<double>
0
</double>
</port>
<port
name=
"irrigation_8"
>
<double>
0
</double>
</port>
<port
name=
"irrigation_9"
>
<double>
0
</double>
</port>
</condition>

<condition
name=
"phenologie"
>


...
...
@@ -1621,7 +1645,7 @@
<outputs>



<output
format=
"local"
plugin=
"console"
package=
"vle.output"
location=
""
name=
"
fixed
"
>

<output
format=
"local"
plugin=
"console"
package=
"vle.output"
location=
""
name=
"
viewStatic
"
>

<map>

<key
name=
"inc_columns"
>

<integer>
10
</integer>

...
...
@@ -1641,7 +1665,7 @@
</map>

</output>


<output
format=
"local"
plugin=
"storage"
package=
"vle.output"
name=
"
timed
"
location=
""
>

<output
format=
"local"
plugin=
"storage"
package=
"vle.output"
name=
"
viewDbg
"
location=
""
>

<map>
<key
name=
"columns"
>
<integer>
15
</integer>
...
...
@@ -1674,14 +1698,14 @@
<port
name=
"Ea"
/>


<port
name=
"FNIRUE"
>

<attachedview
name=
"
timed
"
/>

<attachedview
name=
"
viewDbg
"
/>

</port>


<port
name=
"FNLE"
/>


<port
name=
"INN"
>


<attachedview
name=
"
timed
"
/>

<attachedview
name=
"
viewDbg
"
/>

</port>


<port
name=
"INNI"
/>

...
...
@@ -1695,7 +1719,7 @@
</port>


<port
name=
"Nabs"
>

<attachedview
name=
"
timed
"
/>

<attachedview
name=
"
viewDbg
"
/>

</port>


<port
name=
"vAA"
/>

...
...
@@ -1713,6 +1737,9 @@
<port
name=
"N2"
>


</port>

<port
name=
"TNp"
>
<attachedview
name=
"viewDbg"
/>
</port>
</observable>


<observable
name=
"contrainte_eau"
>

...
...
@@ -1721,22 +1748,22 @@
</port>


<port
name=
"ETRETM"
>

<attachedview
name=
"
timed
"
/>

<attachedview
name=
"
viewDbg
"
/>

</port>


<port
name=
"FHLE"
/>


<port
name=
"FHRUE"
>

<attachedview
name=
"
timed
"
/>

<attachedview
name=
"
viewDbg
"
/>

</port>


<port
name=
"FHTR"
>


<attachedview
name=
"
timed
"
/>

<attachedview
name=
"
viewDbg
"
/>

</port>


<port
name=
"FTSW"
>

<attachedview
name=
"
timed
"
/>

<attachedview
name=
"
viewDbg
"
/>

</port>


<port
name=
"STOCKC1"
/>

...
...
@@ -1766,7 +1793,7 @@
<observable
name=
"contrainte_temperature"
>

<port
name=
"FT"
>


<attachedview
name=
"
timed
"
/>

<attachedview
name=
"
viewDbg
"
/>

</port>


<port
name=
"FTHN"
>

...
...
@@ -1783,25 +1810,25 @@
<port
name=
"DBP"
/>


<port
name=
"Eb"
>

<attachedview
name=
"
timed
"
/>

<attachedview
name=
"
viewDbg
"
/>

</port>


<port
name=
"Ebp"
/>


<port
name=
"Ei"
>

<attachedview
name=
"
timed
"
/>

<attachedview
name=
"
viewDbg
"
/>

</port>


<port
name=
"LAI"
>


<attachedview
name=
"
timed
"
/>

<attachedview
name=
"
viewDbg
"
/>

</port>


<port
name=
"SFp"
/>


<port
name=
"TDM"
>


<attachedview
name=
"
timed
"
/>

<attachedview
name=
"
viewDbg
"
/>

</port>


</observable>

...
...
@@ -1812,8 +1839,8 @@
<port
name=
"TH"
/>


<port
name=
"photo_TH_aFinMATURATION"
>

<attachedview
name=
"
fixed
"
/>

<attachedview
name=
"
timed
"
/>

<attachedview
name=
"
viewStatic
"
/>

<attachedview
name=
"
viewDbg
"
/>

</port>


</observable>

...
...
@@ -1830,8 +1857,8 @@
<port
name=
"photo_IRs_aFinMATURATION"
/>


<port
name=
"photo_RDT_aFinMATURATION"
>

<attachedview
name=
"
fixed
"
/>

<attachedview
name=
"
timed
"
/>

<attachedview
name=
"
viewStatic
"
/>

<attachedview
name=
"
viewDbg
"
/>

</port>


<port
name=
"RDT"
>

...
...
@@ -1842,25 +1869,25 @@

<observable
name=
"lecture_climat"
>

<port
name=
"Pluie"
>

<attachedview
name=
"
timed
"
/>

<attachedview
name=
"
viewDbg
"
/>

</port>


<port
name=
"Tmax"
>

<attachedview
name=
"
timed
"
/>

<attachedview
name=
"
viewDbg
"
/>

</port>


<port
name=
"current_date"
>


<attachedview
name=
"
timed
"
/>

<attachedview
name=
"
viewDbg
"
/>

</port>

<port
name=
"ETP"
>

<attachedview
name=
"
timed
"
/>

<attachedview
name=
"
viewDbg
"
/>

</port>

<port
name=
"RAD"
>

<attachedview
name=
"
timed
"
/>

<attachedview
name=
"
viewDbg
"
/>

</port>

<port
name=
"Tmin"
>

<attachedview
name=
"
timed
"
/>

<attachedview
name=
"
viewDbg
"
/>

</port>


</observable>

...
...
@@ -1870,7 +1897,7 @@

<port
name=
"PhasePhenoPlante"
>


<attachedview
name=
"
timed
"
/>

<attachedview
name=
"
viewDbg
"
/>

</port>


<port
name=
"TT_F1"
>

...
...
@@ -1879,7 +1906,7 @@

<port
name=
"TT_A2"
>


<attachedview
name=
"
timed
"
/>

<attachedview
name=
"
viewDbg
"
/>

</port>


</observable>

...
...
@@ -1889,48 +1916,48 @@

<observable
name=
"diagnostic"
>
<port
name=
"D_MH"
>
<attachedview
name=
"
timed
"
/>
<attachedview
name=
"
viewDbg
"
/>
</port>
<port
name=
"D_SE"
>
<attachedview
name=
"
timed
"
/>
<attachedview
name=
"
viewDbg
"
/>
</port>
<port
name=
"SET_MH"
>
<attachedview
name=
"
timed
"
/>
<attachedview
name=
"
viewDbg
"
/>
</port>
<port
name=
"MET_MH"
>
<attachedview
name=
"
timed
"
/>
<attachedview
name=
"
viewDbg
"
/>
</port>
<port
name=
"D_EF"
>
<attachedview
name=
"
timed
"
/>
<attachedview
name=
"
viewDbg
"
/>
</port>
<port
name=
"SET_EF"
>
<attachedview
name=
"
timed
"
/>
<attachedview
name=
"
viewDbg
"
/>
</port>
<port
name=
"MET_EF"
>
<attachedview
name=
"
timed
"
/>
<attachedview
name=
"
viewDbg
"
/>
</port>
<port
name=
"NHT28_EF"
>
<attachedview
name=
"
timed
"
/>
<attachedview
name=
"
viewDbg
"
/>
</port>
<port
name=
"NHT28"
>
<attachedview
name=
"
timed
"
/>
<attachedview
name=
"
viewDbg
"
/>
</port>
<port
name=
"SGR_FM"
>
<attachedview
name=
"
timed
"
/>
<attachedview
name=
"
viewDbg
"
/>
</port>
</observable>

<observable
name=
"temperature_efficace"
/>

<observable
name=
"temperature_moyenne"
>

<port
name=
"Mean"
>

<attachedview
name=
"
timed
"
/>

<attachedview
name=
"
viewDbg
"
/>

</port>

</observable>

</observables>



<view
enable=
"true"
name=
"
fixed"
output=
"fixed
"
type=
"finish"
/>

<view
enable=
"true"
name=
"
viewStatic"
output=
"viewStatic
"
type=
"finish"
/>


<view
timestep=
"1"
name=
"
timed
"
output=
"
timed
"
type=
"timed"
/>

<view
timestep=
"1"
name=
"
viewDbg
"
output=
"
viewDbg
"
type=
"timed"
/>

</views>

</experiment>

</vle_project>
sunflo/metadata/exp/sunflo_web_modified_TT_new_model.vpm
View file @
4de53c84
...
...
@@ -3,13 +3,19 @@
<vle_project_metadata
version=
"1.x"
author=
"me"
>
<condPlugins/>
<outputGUIplugins>
<outputGUIplugin
view=
"timed"
GUIplugin=
"gvle.output/storage"
/>
<outputGUIplugin
view=
"timed"
GUIplugin=
"gvle.output/storage"
/>
<outputGUIplugin
view=
"timed"
GUIplugin=
"gvle.output/storage"
/>
<outputGUIplugin
view=
"timed"
GUIplugin=
"gvle.output/storage"
/>
<outputGUIplugin
view=
"timed"
GUIplugin=
"gvle.output/storage"
/>
<outputGUIplugin
view=
"timed"
GUIplugin=
"gvle.output/storage"
/>
<outputGUIplugin
view=
"timed"
GUIplugin=
"gvle.output/storage"
/>
<outputGUIplugin
view=
"timed"
GUIplugin=
"gvle.output/storage"
/>
<outputGUIplugin
view=
"timed"
GUIplugin=
"gvle.output/storage"
/>
<outputGUIplugin
view=
"timed"
GUIplugin=
"gvle.output/storage"
/>
<outputGUIplugin
view=
"View"
GUIplugin=
"gvle.output/file"
/>
<outputGUIplugin
view=
"viewDbg"
GUIplugin=
"gvle.output/storage"
/>
<outputGUIplugin
view=
"viewDbg"
GUIplugin=
"gvle.output/storage"
/>
</outputGUIplugins>
</vle_project_metadata>
sunflo/src/Diagnostic.cpp
View file @
4de53c84
...
...
@@ -174,8 +174,8 @@ public :
}
// calcul de MET_MH
MET_MH
=
SET_MH
()
/
D_MH
();
//
MET_MH = SET_MH() / D_MH();
MET_MH
=
1.0
;
{
if
(
(
PhasePhenoPlante
()
<
PHASEPHENOPLANTE_JUVENILE
)
||
(
PhasePhenoPlante
()
>
PHASEPHENOPLANTE_CROISSANCEACTIVE
)
){
...
...
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