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
02ae45b8
Commit
02ae45b8
authored
Jul 30, 2019
by
RemiM
Committed by
Ronan Trepos
Sep 24, 2019
Browse files
Suppress Foo and Foo2
parent
4553a12a
Changes
3
Hide whitespace changes
Inline
Side-by-side
sunflo/exp/sunflo_web_modified_TT_new_model.vpz
View file @
02ae45b8
...
...
@@ -85,7 +85,6 @@
<port
name=
"RG"
/>
</in>

<out>
<port
name=
"Foo"
/>
<port
name=
"D_MH"
/>
<port
name=
"D_SE"
/>
<port
name=
"SET_MH"
/>
...
...
@@ -136,7 +135,6 @@
<port
name=
"Tx"
/>
<port
name=
"Eb"
/>
<port
name=
"FTSW"
/>
<port
name=
"Foo"
/>
<port
name=
"D_SE"
/>
<port
name=
"D_MH"
/>
<port
name=
"SGR_FM"
/>
...
...
@@ -187,15 +185,13 @@
<port
name=
"TDM"
/>
<port
name=
"TRPF"
/>
<port
name=
"TT_F1"
/>
<port
name=
"Foo"
/>
</in>

<out>

<port
name=
"IRs"
/>

<port
name=
"JSE"
/>

<port
name=
"JSF"
/>

<port
name=
"JSM"
/>

<port
name=
"RDT"
/>

<port
name=
"Foo2"
/>
<out>
<port
name=
"IRs"
/>
<port
name=
"JSE"
/>
<port
name=
"JSF"
/>
<port
name=
"JSM"
/>
<port
name=
"RDT"
/>
</out>

</model>

</submodels>

...
...
@@ -269,10 +265,6 @@
<destination
model=
"elaboration_qualite"
port=
"Eb"
/>
</connection>
<connection
type=
"input"
>
<origin
model=
"performances"
port=
"Foo"
/>
<destination
model=
"elaboration_rendement"
port=
"Foo"
/>
</connection>
<connection
type=
"input"
>
<origin
model=
"performances"
port=
"D_SE"
/>
<destination
model=
"elaboration_qualite"
port=
"D_SE"
/>
</connection>
...
...
@@ -935,10 +927,6 @@
<origin
model=
"contraintes"
port=
"vNabs"
/>
<destination
model=
"performances"
port=
"vNabs"
/>
</connection>
<connection
type=
"internal"
>
<origin
model=
"diagnostic"
port=
"Foo"
/>
<destination
model=
"performances"
port=
"Foo"
/>
</connection>
<connection
type=
"internal"
>
<origin
model=
"phenologie"
port=
"PhasePhenoPlante"
/>
<destination
model=
"diagnostic"
port=
"PhasePhenoPlante"
/>
...
...
@@ -1849,9 +1837,7 @@
<port
name=
"RDT"
>


</port>

<port
name=
"Foo2"
>
<attachedview
name=
"timed"
/>
</port>
</observable>


<observable
name=
"lecture_climat"
>

...
...
sunflo/src/Diagnostic.cpp
View file @
02ae45b8
...
...
@@ -41,9 +41,6 @@ public :
/*Sync*/
Var
PhasePhenoPlante
;
/*Sync*/
Var
Tmoy
;
/// # Variable test.
Var
Foo
;
/// # Jours entre maturation et récolte.
Var
D_MH
;
/// # Jours entre semis et germination.
...
...
@@ -90,7 +87,6 @@ public :
////////////////////////////////////////////////////////////////////////
/////////////////////////////REMI ADDS//////////////////////////////////
Foo
.
init
(
this
,
"Foo"
,
events
);
D_MH
.
init
(
this
,
"D_MH"
,
events
);
D_SE
.
init
(
this
,
"D_SE"
,
events
);
D_EF
.
init
(
this
,
"D_EF"
,
events
);
...
...
@@ -123,10 +119,7 @@ public :
////////////////////////////////////////////////////////////////////////
/////////////////////////////REMI ADDS//////////////////////////////////
////////////////////////////////////////////////////////////////////////
{
Foo
=
5.0
;
}
{
if
(
(
PhasePhenoPlante
()
!=
PHASEPHENOPLANTE_MATURATION
)
...
...
sunflo/src/ElaborationRendement.cpp
View file @
02ae45b8
...
...
@@ -36,7 +36,6 @@ public :
/*Sync*/
Var
ETRETM
;
/*Sync*/
Var
TRPF
;
/*Sync*/
Var
INN
;
/*Sync*/
Var
Foo
;
/// # Rendement (0% humidité, 0% impuretés)
Var
RDT
;
...
...
@@ -57,18 +56,13 @@ public :
/// Capture de RDT a un instant donne
Var
photo_RDT_aFinMATURATION
;
/////////////////////////////REMI ADDS//////////////////////////////////
Var
Foo2
;
////////////////////////////////////////////////////////////////////////
ElaborationRendement
(
const
vle
::
devs
::
DynamicsInit
&
model
,
const
vle
::
devs
::
InitEventList
&
events
)
:
DiscreteTimeDyn
(
model
,
events
)
{
/////////////////////////////REMI ADDS//////////////////////////////////
Foo
.
init
(
this
,
"Foo"
,
events
);
Foo2
.
init
(
this
,
"Foo2"
,
events
);
////////////////////////////////////////////////////////////////////////
pr
.
initialiser
(
events
);
pv
.
initialiser
(
events
);
...
...
@@ -111,9 +105,6 @@ public :
photo_INN_CROISSANCEACTIVE_A_FLORAISON
=
0.0
;
//codeMMpourMemo INNF1 = 0
IRs
=
0.0
;
photo_IRs_aFinMATURATION
=
0.0
;
/////////////////////////////REMI ADDS//////////////////////////////////
Foo2
=
0
;
////////////////////////////////////////////////////////////////////////
{
double
RDT_tmp
=
0.0
;
if
(
(
PhasePhenoPlante
()
>=
PHASEPHENOPLANTE_DESSICATION
)
...
...
@@ -127,11 +118,6 @@ public :
}
photo_RDT_aFinMATURATION
=
0.0
;
}
else
{
/////////////////////////////REMI ADDS//////////////////////////////////
{
Foo2
=
3
*
Foo
();
}
////////////////////////////////////////////////////////////////////////
{
double
ddt
=
0.0
;
...
...
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