Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
mpim-sw
cdo
Commits
34c2daca
Commit
34c2daca
authored
Aug 27, 2018
by
Uwe Schulzweida
Browse files
Renamed field_init() to fieldInit() and changed type of parameter from pointer to reference.
parent
a4ef6fad
Changes
57
Hide whitespace changes
Inline
Side-by-side
src/Adisit.cc
View file @
34c2daca
...
...
@@ -235,9 +235,9 @@ Adisit(void *process)
}
Field
tho
,
sao
,
tis
;
field
_i
nit
(
&
tho
);
field
_i
nit
(
&
sao
);
field
_i
nit
(
&
tis
);
field
I
nit
(
tho
);
field
I
nit
(
sao
);
field
I
nit
(
tis
);
tho
.
ptr
=
(
double
*
)
Malloc
(
gridsize
*
nlevel
*
sizeof
(
double
));
sao
.
ptr
=
(
double
*
)
Malloc
(
gridsize
*
nlevel
*
sizeof
(
double
));
tis
.
ptr
=
(
double
*
)
Malloc
(
gridsize
*
nlevel
*
sizeof
(
double
));
...
...
src/Arith.cc
View file @
34c2daca
...
...
@@ -155,8 +155,8 @@ Arith(void *process)
if
(
nwpv
==
2
&&
opercplx
==
false
)
cdoAbort
(
"Fields with complex numbers are not supported by this operator!"
);
size_t
gridsizemax
=
nwpv
*
vlistGridsizeMax
(
vlistIDx1
);
field
_i
nit
(
&
field1
);
field
_i
nit
(
&
field2
);
field
I
nit
(
field1
);
field
I
nit
(
field2
);
field1
.
ptr
=
(
double
*
)
Malloc
(
gridsizemax
*
sizeof
(
double
));
field2
.
ptr
=
(
double
*
)
Malloc
(
gridsizemax
*
sizeof
(
double
));
if
(
filltype
==
FILL_VAR
||
filltype
==
FILL_VARTS
)
...
...
src/Arithc.cc
View file @
34c2daca
...
...
@@ -116,7 +116,7 @@ Arithc(void *process)
size_t
gridsizemax
=
nwpv
*
vlistGridsizeMax
(
vlistID1
);
Field
field
;
field
_i
nit
(
&
field
);
field
I
nit
(
field
);
field
.
ptr
=
(
double
*
)
Malloc
(
gridsizemax
*
sizeof
(
double
));
field
.
weight
=
NULL
;
...
...
src/Arithdays.cc
View file @
34c2daca
...
...
@@ -107,7 +107,7 @@ Arithdays(void *process)
size_t
gridsize
=
vlistGridsizeMax
(
vlistID1
);
Field
field
;
field
_i
nit
(
&
field
);
field
I
nit
(
field
);
field
.
ptr
=
(
double
*
)
Malloc
(
gridsize
*
sizeof
(
double
));
field
.
weight
=
NULL
;
...
...
src/Consecstat.cc
View file @
34c2daca
...
...
@@ -149,7 +149,7 @@ Consecstat(void *process)
vlistDefTaxis
(
ovlistID
,
otaxisID
);
Field
field
;
field
_i
nit
(
&
field
);
field
I
nit
(
field
);
field
.
ptr
=
(
double
*
)
Malloc
(
vlistGridsizeMax
(
ovlistID
)
*
sizeof
(
double
));
int
nvars
=
vlistNvars
(
ivlistID
);
...
...
src/Ensstat.cc
View file @
34c2daca
...
...
@@ -191,7 +191,7 @@ Ensstat(void *process)
Field
*
field
=
(
Field
*
)
Malloc
(
Threading
::
ompNumThreads
*
sizeof
(
Field
));
for
(
int
i
=
0
;
i
<
Threading
::
ompNumThreads
;
i
++
)
{
field
_i
nit
(
&
field
[
i
]);
field
I
nit
(
field
[
i
]);
field
[
i
].
size
=
nfiles
;
field
[
i
].
ptr
=
(
double
*
)
Malloc
(
nfiles
*
sizeof
(
double
));
}
...
...
src/Ensstat3.cc
View file @
34c2daca
...
...
@@ -131,7 +131,7 @@ Ensstat3(void *process)
Field
*
field
=
(
Field
*
)
Malloc
(
Threading
::
ompNumThreads
*
sizeof
(
Field
));
for
(
i
=
0
;
i
<
Threading
::
ompNumThreads
;
i
++
)
{
field
_i
nit
(
&
field
[
i
]);
field
I
nit
(
field
[
i
]);
field
[
i
].
size
=
nfiles
;
field
[
i
].
ptr
=
(
double
*
)
Malloc
(
nfiles
*
sizeof
(
double
));
field
[
i
].
weight
=
(
double
*
)
Malloc
(
nfiles
*
sizeof
(
double
));
...
...
src/Fillmiss.cc
View file @
34c2daca
...
...
@@ -560,8 +560,8 @@ Fillmiss(void *process)
size_t
gridsize
=
vlistGridsizeMax
(
vlistID1
);
Field
field1
,
field2
;
field
_i
nit
(
&
field1
);
field
_i
nit
(
&
field2
);
field
I
nit
(
field1
);
field
I
nit
(
field2
);
field1
.
ptr
=
(
double
*
)
Malloc
(
gridsize
*
sizeof
(
double
));
field2
.
ptr
=
(
double
*
)
Malloc
(
gridsize
*
sizeof
(
double
));
...
...
src/Fldrms.cc
View file @
34c2daca
...
...
@@ -81,9 +81,9 @@ Fldrms(void *process)
pstreamDefVlist
(
streamID3
,
vlistID3
);
Field
field1
,
field2
,
field3
;
field
_i
nit
(
&
field1
);
field
_i
nit
(
&
field2
);
field
_i
nit
(
&
field3
);
field
I
nit
(
field1
);
field
I
nit
(
field2
);
field
I
nit
(
field3
);
size_t
lim
=
vlistGridsizeMax
(
vlistID1
);
field1
.
ptr
=
(
double
*
)
Malloc
(
lim
*
sizeof
(
double
));
...
...
src/Fldstat.cc
View file @
34c2daca
...
...
@@ -181,7 +181,7 @@ Fldstat(void *process)
pstreamDefVlist
(
streamID2
,
vlistID2
);
Field
field
;
field
_i
nit
(
&
field
);
field
I
nit
(
field
);
size_t
gridsizemax
=
vlistGridsizeMax
(
vlistID1
);
field
.
ptr
=
(
double
*
)
Malloc
(
gridsizemax
*
sizeof
(
double
));
...
...
src/Gridboxstat.cc
View file @
34c2daca
...
...
@@ -578,8 +578,8 @@ Gridboxstat(void *process)
pstreamDefVlist
(
streamID2
,
vlistID2
);
Field
field1
,
field2
;
field
_i
nit
(
&
field1
);
field
_i
nit
(
&
field2
);
field
I
nit
(
field1
);
field
I
nit
(
field2
);
size_t
gridsize1
=
gridInqSize
(
gridID1
);
field1
.
ptr
=
(
double
*
)
Malloc
(
gridsize1
*
sizeof
(
double
));
...
...
src/Hi.cc
View file @
34c2daca
...
...
@@ -113,9 +113,9 @@ Hi(void *process)
size_t
gridsize
=
vlistGridsizeMax
(
vlistID1
);
Field
field1
,
field2
,
field3
;
field
_i
nit
(
&
field1
);
field
_i
nit
(
&
field2
);
field
_i
nit
(
&
field3
);
field
I
nit
(
field1
);
field
I
nit
(
field2
);
field
I
nit
(
field3
);
field1
.
ptr
=
(
double
*
)
Malloc
(
gridsize
*
sizeof
(
double
));
field2
.
ptr
=
(
double
*
)
Malloc
(
gridsize
*
sizeof
(
double
));
field3
.
ptr
=
(
double
*
)
Malloc
(
gridsize
*
sizeof
(
double
));
...
...
src/Intgrid.cc
View file @
34c2daca
...
...
@@ -332,8 +332,8 @@ Intgrid(void *process)
std
::
vector
<
double
>
array2
(
gridsize
);
Field
field1
,
field2
;
field
_i
nit
(
&
field1
);
field
_i
nit
(
&
field2
);
field
I
nit
(
field1
);
field
I
nit
(
field2
);
int
tsID
=
0
;
while
((
nrecs
=
cdoStreamInqTimestep
(
streamID1
,
tsID
)))
...
...
src/Intgridtraj.cc
View file @
34c2daca
...
...
@@ -75,8 +75,8 @@ Intgridtraj(void *process)
int
vlistID1
=
cdoStreamInqVlist
(
streamID1
);
Field
field1
,
field2
;
field
_i
nit
(
&
field1
);
field
_i
nit
(
&
field2
);
field
I
nit
(
field1
);
field
I
nit
(
field2
);
int
nvars
=
vlistNvars
(
vlistID1
);
...
...
src/Isosurface.cc
View file @
34c2daca
...
...
@@ -119,7 +119,7 @@ Isosurface(void *process)
size_t
gridsizemax
=
vlistGridsizeMax
(
vlistID1
);
Field
field
;
field
_i
nit
(
&
field
);
field
I
nit
(
field
);
field
.
ptr
=
(
double
*
)
Malloc
(
gridsizemax
*
sizeof
(
double
));
int
nvars
=
vlistNvars
(
vlistID1
);
...
...
@@ -138,7 +138,7 @@ Isosurface(void *process)
liso
[
varID
]
=
(
zaxisID
==
zaxisID1
);
field
_i
nit
(
&
vars1
[
varID
]);
field
I
nit
(
vars1
[
varID
]);
vars1
[
varID
].
grid
=
gridID
;
vars1
[
varID
].
zaxis
=
zaxisID
;
vars1
[
varID
].
nmiss
=
0
;
...
...
src/Merstat.cc
View file @
34c2daca
...
...
@@ -115,8 +115,8 @@ Merstat(void *process)
size_t
lim
=
vlistGridsizeMax
(
vlistID1
);
Field
field1
,
field2
;
field
_i
nit
(
&
field1
);
field
_i
nit
(
&
field2
);
field
I
nit
(
field1
);
field
I
nit
(
field2
);
field1
.
ptr
=
(
double
*
)
Malloc
(
lim
*
sizeof
(
double
));
field1
.
weight
=
NULL
;
...
...
src/Monarith.cc
View file @
34c2daca
...
...
@@ -59,8 +59,8 @@ Monarith(void *process)
size_t
gridsizemax
=
vlistGridsizeMax
(
vlistID1
);
Field
field1
,
field2
;
field
_i
nit
(
&
field1
);
field
_i
nit
(
&
field2
);
field
I
nit
(
field1
);
field
I
nit
(
field2
);
field1
.
ptr
=
(
double
*
)
Malloc
(
gridsizemax
*
sizeof
(
double
));
field2
.
ptr
=
(
double
*
)
Malloc
(
gridsizemax
*
sizeof
(
double
));
...
...
src/Regres.cc
View file @
34c2daca
...
...
@@ -64,8 +64,8 @@ Regres(void *process)
size_t
gridsize
=
vlistGridsizeMax
(
vlistID1
);
Field
field1
,
field2
;
field
_i
nit
(
&
field1
);
field
_i
nit
(
&
field2
);
field
I
nit
(
field1
);
field
I
nit
(
field2
);
field1
.
ptr
=
(
double
*
)
Malloc
(
gridsize
*
sizeof
(
double
));
field2
.
ptr
=
(
double
*
)
Malloc
(
gridsize
*
sizeof
(
double
));
...
...
src/Rhopot.cc
View file @
34c2daca
...
...
@@ -239,9 +239,9 @@ Rhopot(void *process)
for
(
int
i
=
0
;
i
<
nlevel
;
++
i
)
cdoPrint
(
"%5d %g"
,
i
+
1
,
pressure
[
i
]);
}
field
_i
nit
(
&
to
);
field
_i
nit
(
&
sao
);
field
_i
nit
(
&
rho
);
field
I
nit
(
to
);
field
I
nit
(
sao
);
field
I
nit
(
rho
);
to
.
ptr
=
(
double
*
)
Malloc
(
gridsize
*
nlevel
*
sizeof
(
double
));
sao
.
ptr
=
(
double
*
)
Malloc
(
gridsize
*
nlevel
*
sizeof
(
double
));
rho
.
ptr
=
(
double
*
)
Malloc
(
gridsize
*
nlevel
*
sizeof
(
double
));
...
...
src/Seascount.cc
View file @
34c2daca
...
...
@@ -62,7 +62,7 @@ Seascount(void *process)
if
(
vlistNumber
(
vlistID1
)
!=
CDI_REAL
)
gridsize
*=
2
;
Field
field
;
field
_i
nit
(
&
field
);
field
I
nit
(
field
);
field
.
ptr
=
(
double
*
)
Malloc
(
gridsize
*
sizeof
(
double
));
FieldVector2D
vars1
;
...
...
Prev
1
2
3
Next
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