Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
METRo projects
metro
Commits
41dcf172
Commit
41dcf172
authored
Feb 06, 2013
by
Miguel Tremblay
Browse files
Update to remove the compilation warnings.
parent
0711bf84
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/model/macadam.c
View file @
41dcf172
...
...
@@ -170,7 +170,6 @@ void Do_Metro( BOOL bFlat, double dMLat, double dMLon, double* dpZones, long nNb
BOOL
bSucces
=
TRUE
;
long
nNtp
;
long
nNtp2
;
long
nNRec
;
long
nNtdcl
;
double
*
dpItp
;
double
dDiff
;
...
...
@@ -189,13 +188,13 @@ void Do_Metro( BOOL bFlat, double dMLat, double dMLon, double* dpZones, long nNb
double
dEr2
=
0
;
double
dFp
=
0
.
0
;
/* Grid values */
/* long nIRef=0; */
long
nIR40
;
double
*
dpCnt
;
double
*
dpCapacity
;
double
*
dpConductivity
;
long
i
;
long
nDeltaTIndice
=
0
;
long
nOne
=
1
;
/* Allocate memory for all structures */
init_structure
(
nNbrTimeSteps
,
nNGRILLEMAX
);
...
...
@@ -245,16 +244,11 @@ void Do_Metro( BOOL bFlat, double dMLat, double dMLon, double* dpZones, long nNb
/***********************************************************************/
/* Couplage de la prevision et des observations.
/* Differentes possibilites selon la quantite d'observations
/* presentes.
/**********************************************************************/
bFail
=
FALSE
;
/* Coupling is different if there is more or less than 3 hours. */
if
(
bpNoObs
[
2
]){
goto
liberation
;
}
else
if
(
bpNoObs
[
3
]){
BOOL
bFalse
=
FALSE
;
if
(
!
bSilent
)
printf
(
" Only one valid observation: No initialization nor coupling.
\n
"
);
f77name
(
makitp
)(
dpItp
,
&
stTemperatureDepth
.
nSize
,
&
nIR40
,
&
bFlat
,
\
...
...
@@ -264,8 +258,6 @@ void Do_Metro( BOOL bFlat, double dMLat, double dMLon, double* dpZones, long nNb
}
else
if
(
bpNoObs
[
1
]){
/* less than 3 hours of observation in the coupling */
BOOL
bFalse
=
FALSE
;
long
nOne
=
1
;
if
(
!
bSilent
)
printf
(
" Not enough data for coupling.
\n
"
);
f77name
(
makitp
)(
dpItp
,
&
stTemperatureDepth
.
nSize
,
&
nIR40
,
&
bFlat
,
&
(
dpTimeO
[
0
]),
\
...
...
@@ -277,7 +269,6 @@ void Do_Metro( BOOL bFlat, double dMLat, double dMLon, double* dpZones, long nNb
nNtp2
=
nLenObservation
-
nDeltaTIndice
;
}
else
if
(
bpNoObs
[
0
]){
BOOL
bTmp
=
FALSE
;
if
(
!
bSilent
)
printf
(
" Not enough data for initialization.
\n
"
);
nNtdcl
=
nLenObservation
-
((
nLenObservation
<
28800
.
0
/
dDT
)
\
...
...
@@ -306,7 +297,6 @@ void Do_Metro( BOOL bFlat, double dMLat, double dMLon, double* dpZones, long nNb
goto
liberation
;
}
if
(
bFail
){
long
nOne
=
1
;
if
(
!
bSilent
)
printf
(
"fail
\n
"
);
f77name
(
initial
)(
dpItp
,
(
dpRTO
+
1
),
(
dpDTO
+
1
),
(
dpTAO
+
1
),
&
nOne
,
\
...
...
@@ -315,7 +305,6 @@ void Do_Metro( BOOL bFlat, double dMLat, double dMLon, double* dpZones, long nNb
}
}
else
{
/* observation complete */
long
nOne
=
1
;
if
(
!
bSilent
)
printf
(
"Complete observations
\n
"
);
...
...
@@ -348,7 +337,7 @@ void Do_Metro( BOOL bFlat, double dMLat, double dMLon, double* dpZones, long nNb
goto
liberation
;
}
if
(
bFail
){
long
nOne
=
1
;
if
(
!
bSilent
)
printf
(
"fail
\n
"
);
f77name
(
initial
)(
dpItp
,
(
dpRTO
+
1
),
(
dpDTO
+
1
),
(
dpTAO
+
1
),
&
nOne
,
\
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a 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