Commit 8a1b44ea authored by Ronan Trépos's avatar Ronan Trépos
Browse files

update according new meteo

begin date is now different from simulation_engine.begin
parent 51f0408c
<?xml version='1.0' encoding='UTF-8'?>
<vle_project date="2014-Dec-17 17:32:19" author="Pierre Casadebaig" version="1.0">
<vle_project version="1.0" date="2014-Dec-17 17:32:19" author="Pierre Casadebaig">
<structures>
<model x="0" name="sunflo" width="1610" y="0" type="coupled" height="1051">
<model width="1610" name="sunflo" type="coupled" height="1051" y="0" x="0">
<submodels>
<model x="82" dynamics="ConduiteCulture" name="itk" width="100" conditions="itk" y="295" type="atomic" height="150">
<model width="100" name="itk" type="atomic" conditions="cBegin,itk" height="150" y="295" x="82" dynamics="ConduiteCulture">
<out>
<port name="ActionFerti"/>
<port name="ActionIrrig"/>
......@@ -15,7 +15,7 @@
<port name="zSemis"/>
</out>
</model>
<model x="286" name="sunflo_bio" width="100" y="64" type="coupled" height="255">
<model width="100" name="sunflo_bio" type="coupled" height="255" y="64" x="286">
<in>
<port name="ActionFerti"/>
<port name="ActionIrrig"/>
......@@ -49,7 +49,7 @@
<port name="Nabs"/>
</out>
<submodels>
<model x="777" dynamics="croissance_plante" name="croissance_plante" observables="croissance_plante" width="100" conditions="CONFIG_Plante,CONFIG_Variete,croissance_plante,simulation_engine,EXPERT_Plante" y="209" type="atomic" height="225">
<model width="100" name="croissance_plante" observables="croissance_plante" type="atomic" conditions="CONFIG_Plante,CONFIG_Variete,croissance_plante,simulation_engine,EXPERT_Plante" height="225" y="209" x="777" dynamics="croissance_plante">
<in>
<port name="ActionSemis"/>
<port name="ChgtPhasePhenoPlante"/>
......@@ -75,7 +75,7 @@
<port name="Eb"/>
</out>
</model>
<model x="633" dynamics="diagnostic" name="diagnostic" observables="diagnostic" width="100" conditions="CONFIG_Plante,CONFIG_SimuInit,CONFIG_Variete,diagnostic,EXPERT_Plante,EXPERT_SimuInit" y="124" type="atomic" height="75">
<model width="100" name="diagnostic" observables="diagnostic" type="atomic" conditions="CONFIG_Plante,CONFIG_SimuInit,CONFIG_Variete,diagnostic,EXPERT_Plante,EXPERT_SimuInit" height="75" y="124" x="633" dynamics="diagnostic">
<in>
<port name="ChgtPhasePhenoPlante"/>
<port name="ETRETM"/>
......@@ -87,7 +87,7 @@
<port name="ISH3"/>
</out>
</model>
<model x="252" dynamics="Phenologie" name="phenologie" observables="phenologie" width="100" conditions="CONFIG_SimuInit,CONFIG_Variete,phenologie,EXPERT_Plante,CONFIG_Plante,EXPERT_SimuInit" y="22" type="atomic" height="105">
<model width="100" name="phenologie" observables="phenologie" type="atomic" conditions="CONFIG_SimuInit,CONFIG_Variete,phenologie,EXPERT_Plante,CONFIG_Plante,EXPERT_SimuInit" height="105" y="22" x="252" dynamics="Phenologie">
<in>
<port name="ActionRecolte"/>
<port name="ActionSemis"/>
......@@ -102,7 +102,7 @@
<port name="TT_F1"/>
</out>
</model>
<model x="115" dynamics="TemperatureEfficace" name="temperature_efficace" observables="temperature_efficace" width="100" conditions="temperature_efficace,CONFIG_Plante,EXPERT_Plante" y="248" type="atomic" height="45">
<model width="100" name="temperature_efficace" observables="temperature_efficace" type="atomic" conditions="temperature_efficace,CONFIG_Plante,EXPERT_Plante" height="45" y="248" x="115" dynamics="TemperatureEfficace">
<in>
<port name="Tmoy"/>
</in>
......@@ -110,7 +110,7 @@
<port name="Teff"/>
</out>
</model>
<model x="828" name="performances" width="100" y="597" type="coupled" height="195">
<model width="100" name="performances" type="coupled" height="195" y="597" x="828">
<in>
<port name="ChgtPhasePhenoPlante"/>
<port name="ETRETM"/>
......@@ -135,7 +135,7 @@
<port name="TH"/>
</out>
<submodels>
<model x="360" dynamics="elaboration_qualite" name="elaboration_qualite" observables="elaboration_qualite" width="100" conditions="CONFIG_Variete,elaboration_qualite,itk" y="245" type="atomic" height="165">
<model width="100" name="elaboration_qualite" observables="elaboration_qualite" type="atomic" conditions="CONFIG_Variete,elaboration_qualite,itk" height="165" y="245" x="360" dynamics="elaboration_qualite">
<in>
<port name="ChgtPhasePhenoPlante"/>
<port name="JSM"/>
......@@ -152,7 +152,7 @@
<port name="TH"/>
</out>
</model>
<model x="320" dynamics="elaboration_rendement" name="elaboration_rendement" observables="elaboration_rendement" width="100" conditions="CONFIG_SimuInit,CONFIG_Variete,EXPERT_Plante,EXPERT_SimuInit,elaboration_rendement" y="33" type="atomic" height="135">
<model width="100" name="elaboration_rendement" observables="elaboration_rendement" type="atomic" conditions="CONFIG_SimuInit,CONFIG_Variete,EXPERT_Plante,EXPERT_SimuInit,elaboration_rendement" height="135" y="33" x="320" dynamics="elaboration_rendement">
<in>
<port name="ChgtPhasePhenoPlante"/>
<port name="ETRETM"/>
......@@ -242,7 +242,7 @@
</connection>
</connections>
</model>
<model x="372" name="contraintes" width="100" y="577" type="coupled" height="330">
<model width="100" name="contraintes" type="coupled" height="330" y="577" x="372">
<in>
<port name="ActionFerti"/>
<port name="ActionIrrig"/>
......@@ -285,7 +285,7 @@
<port name="vNabs"/>
</out>
<submodels>
<model x="937" dynamics="croissance_azote" name="contrainte_azote" observables="contrainte_azote" width="100" conditions="CONFIG_Plante,CONFIG_SimuInit,CONFIG_Sol,EXPERT_Plante,EXPERT_SimuInit,contrainte_azote" y="39" type="atomic" height="480">
<model width="100" name="contrainte_azote" observables="contrainte_azote" type="atomic" conditions="CONFIG_Plante,CONFIG_SimuInit,CONFIG_Sol,EXPERT_Plante,EXPERT_SimuInit,contrainte_azote" height="480" y="39" x="937" dynamics="croissance_azote">
<in>
<port name="ActionFerti"/>
<port name="ActionIrrig"/>
......@@ -327,7 +327,7 @@
<port name="vNabs"/>
</out>
</model>
<model x="478" dynamics="contrainte_eau" name="contrainte_eau" observables="contrainte_eau" width="100" conditions="CONFIG_Plante,CONFIG_SimuInit,CONFIG_Sol,CONFIG_Variete,contrainte_eau,EXPERT_Plante,EXPERT_SimuInit" y="352" type="atomic" height="330">
<model width="100" name="contrainte_eau" observables="contrainte_eau" type="atomic" conditions="CONFIG_Plante,CONFIG_SimuInit,CONFIG_Sol,CONFIG_Variete,contrainte_eau,EXPERT_Plante,EXPERT_SimuInit" height="330" y="352" x="478" dynamics="contrainte_eau">
<in>
<port name="ActionIrrig"/>
<port name="ActionSemis"/>
......@@ -364,7 +364,7 @@
<port name="FTSW"/>
</out>
</model>
<model x="335" dynamics="contrainte_lumiere" name="contrainte_lumiere" observables="contrainte_lumiere" width="100" conditions="contrainte_lumiere" y="61" type="atomic" height="135">
<model width="100" name="contrainte_lumiere" observables="contrainte_lumiere" type="atomic" conditions="contrainte_lumiere" height="135" y="61" x="335" dynamics="contrainte_lumiere">
<in>
<port name="ActionSemis"/>
<port name="Ei"/>
......@@ -379,7 +379,7 @@
<port name="iPAR"/>
</out>
</model>
<model x="282" dynamics="contrainte_temperature" name="contrainte_temperature" observables="contrainte_temperature" width="100" conditions="CONFIG_Plante,contrainte_temperature,EXPERT_Plante" y="370" type="atomic" height="60">
<model width="100" name="contrainte_temperature" observables="contrainte_temperature" type="atomic" conditions="CONFIG_Plante,contrainte_temperature,EXPERT_Plante" height="60" y="370" x="282" dynamics="contrainte_temperature">
<in>
<port name="PhasePhenoPlante"/>
<port name="Tmoy"/>
......@@ -877,7 +877,7 @@
</connection>
</connections>
</model>
<model x="19" name="climat" width="100" y="43" type="coupled" height="120">
<model width="100" name="climat" type="coupled" height="120" y="43" x="19">
<out>
<port name="ETPP"/>
<port name="Pluie"/>
......@@ -887,7 +887,7 @@
<port name="Tx"/>
</out>
<submodels>
<model x="284" dynamics="GenericMean" name="GenericMean" width="100" y="187" type="atomic" height="60">
<model width="100" name="GenericMean" type="atomic" height="60" y="187" x="284" dynamics="GenericMean">
<in>
<port name="Tmax"/>
<port name="Tmin"/>
......@@ -896,7 +896,7 @@
<port name="Mean"/>
</out>
</model>
<model x="62" dynamics="MeteoReader" name="lecture_climat" width="100" conditions="simulation_engine,sunflo_climat" y="38" type="atomic" height="105">
<model width="100" name="lecture_climat" type="atomic" conditions="cBegin,sunflo_climat" height="105" y="38" x="62" dynamics="MeteoReader">
<out>
<port name="ETP"/>
<port name="Pluie"/>
......@@ -999,21 +999,21 @@
</model>
</structures>
<dynamics>
<dynamic name="ConduiteCulture" library="ConduiteCulture" package="sunflo"/>
<dynamic name="GenericMean" library="GenericMean" package="vle.discrete-time"/>
<dynamic name="MeteoReader" library="MeteoReader" package="record.meteo"/>
<dynamic name="Phenologie" library="Phenologie" package="sunflo"/>
<dynamic name="TemperatureEfficace" library="TemperatureEfficace" package="sunflo"/>
<dynamic name="contrainte_eau" library="ContrainteEau" package="sunflo"/>
<dynamic name="contrainte_lumiere" library="ContrainteLumiere" package="sunflo"/>
<dynamic name="contrainte_temperature" library="ContrainteTemperature" package="sunflo"/>
<dynamic name="croissance_azote" library="ContrainteAzote" package="sunflo"/>
<dynamic name="croissance_plante" library="CroissancePlante" package="sunflo"/>
<dynamic name="diagnostic" library="Diagnostic" package="sunflo"/>
<dynamic name="elaboration_qualite" library="ElaborationQualite" package="sunflo"/>
<dynamic name="elaboration_rendement" library="ElaborationRendement" package="sunflo"/>
<dynamic package="sunflo" name="ConduiteCulture" library="ConduiteCulture"/>
<dynamic package="vle.discrete-time" name="GenericMean" library="GenericMean"/>
<dynamic package="record.meteo" name="MeteoReader" library="MeteoReader"/>
<dynamic package="sunflo" name="Phenologie" library="Phenologie"/>
<dynamic package="sunflo" name="TemperatureEfficace" library="TemperatureEfficace"/>
<dynamic package="sunflo" name="contrainte_eau" library="ContrainteEau"/>
<dynamic package="sunflo" name="contrainte_lumiere" library="ContrainteLumiere"/>
<dynamic package="sunflo" name="contrainte_temperature" library="ContrainteTemperature"/>
<dynamic package="sunflo" name="croissance_azote" library="ContrainteAzote"/>
<dynamic package="sunflo" name="croissance_plante" library="CroissancePlante"/>
<dynamic package="sunflo" name="diagnostic" library="Diagnostic"/>
<dynamic package="sunflo" name="elaboration_qualite" library="ElaborationQualite"/>
<dynamic package="sunflo" name="elaboration_rendement" library="ElaborationRendement"/>
</dynamics>
<experiment begin="2453834" name="sunflo_simple_new" combination="linear" duration="181">
<experiment combination="linear" name="sunflo_simple_new" begin="2453834" duration="181">
<conditions>
<condition name="CONFIG_Plante">
<port name="AA_a">
......@@ -1519,7 +1519,7 @@
</condition>
<condition name="simulation_engine">
<port name="begin">
<double>2453834</double>
<double>0</double>
</port>
<port name="duration">
<double>181</double>
......@@ -1550,10 +1550,15 @@
<boolean>true</boolean>
</port>
</condition>
</conditions>
<condition name="cBegin">
<port name="begin_date">
<string>2006-04-08</string>
</port>
</condition>
</conditions>
<views>
<outputs>
<output location="" name="viewDbg" package="vle.output" plugin="storage" format="local">
<output package="vle.output" location="" plugin="storage" name="viewDbg" format="local">
<map>
<key name="inc_columns">
<integer>10</integer>
......@@ -1573,7 +1578,7 @@
</map>
</output>
<output location="" name="viewStatic" package="vle.output" plugin="storage" format="local">
<output package="vle.output" location="" plugin="storage" name="viewStatic" format="local">
<map>
<key name="inc_columns">
<integer>10</integer>
......@@ -1755,9 +1760,9 @@
</observable>
</observables>
<view timestep="1.000000000000000" name="viewDbg" output="viewDbg" type="timed"/>
<view name="viewDbg" type="timed" timestep="1.000000000000000" output="viewDbg"/>
<view name="viewStatic" output="viewStatic" type="finish"/>
<view name="viewStatic" type="finish" output="viewStatic"/>
</views>
</experiment>
......
......@@ -96,6 +96,7 @@ public :
std::string jsemis;
std::string jrecolte;
double pzSemis;
double begin_date;
/// lesApportsIrrigation et lesApportsFertilisation servent a creer lesApports au travers duquel ils seront exploites.
std::map < std::string, double > lesApportsIrrigation;
......@@ -128,6 +129,9 @@ public :
jrecolte = events.getString("jrecolte");
pzSemis = events.getDouble("zSemis");
begin_date = vle::utils::DateTime::toJulianDayNumber(
events.getString("begin_date"));
if (events.exist("apports_irrigation")) {
......@@ -267,14 +271,14 @@ public :
switch ( (int) EtatConduite(-1) ){
case ETATCONDUITE_PRESEMIS :
if ( utils::coincidence( time, jsemis ) ){ // action semis
if ( utils::coincidence( time + begin_date, jsemis ) ){ // action semis
ActionSemis_tmp = (double)ACTIONCONDUITE_ACTIVE;
zSemis_tmp = pzSemis;
densite_tmp = pdensite;
// pour le cas d'apport a la date du semis (cf FFT_110131_013)
eventuellesIrrigationEtFertilisation( time,
eventuellesIrrigationEtFertilisation( time+ begin_date,
ActionIrrig_tmp, DoseIrrig_tmp,
ActionFerti_tmp, DoseFerti_tmp );
......@@ -283,14 +287,14 @@ public :
break;
case ETATCONDUITE_ENCULTURE :
if (utils::coincidence( time, jrecolte ) ){ // action recolte
if (utils::coincidence( time+ begin_date, jrecolte ) ){ // action recolte
ActionRecolte_tmp = (double)ACTIONCONDUITE_ACTIVE;
EtatConduite_tmp = ETATCONDUITE_POSTRECOLTE;
} else { // etude Irrigation et Fertilisation
eventuellesIrrigationEtFertilisation( time,
eventuellesIrrigationEtFertilisation( time+ begin_date,
ActionIrrig_tmp, DoseIrrig_tmp,
ActionFerti_tmp, DoseFerti_tmp );
}
......
Supports Markdown
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