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
mpim-sw
cdo
Commits
f570a7b4
Commit
f570a7b4
authored
Nov 07, 2017
by
Fabian Wachsmann
Browse files
Adapted to new CMOR version
parent
5b482c1e
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/CMOR.cc
View file @
f570a7b4
...
...
@@ -4199,20 +4199,20 @@ static void write_variables(list_t *kvl, int *streamID, struct mapping vars[], i
void
*
dataslice
=
(
void
*
)
Malloc
(
gridsize
*
zsize
*
sizeof
(
double
));
for
(
int
j
=
0
;
j
<
gridsize
*
zsize
;
j
++
)
((
double
*
)
dataslice
)[
j
]
=
((
double
*
)
vars
[
i
].
data
)[(
tsID
-
1
)
*
gridsize
*
zsize
+
j
];
#if ( CMOR_VERSION_MAJOR ==
2
)
#if ( CMOR_VERSION_MAJOR ==
3 && CMOR_VERSION_MINOR <= 2 && CMOR_VERSION_PATCH <= 7
)
cmf
=
cmor_write
(
vars
[
i
].
cmor_varID
,
dataslice
,
vars
[
i
].
datatype
,
chunk_files
[
i
],
1
,
&
time_val
,
time_bndsp
,
NULL
);
Free
(
dataslice
);
#el
if ( CMOR_VERSION_MAJOR == 3 )
#el
se
cmf
=
cmor_write
(
vars
[
i
].
cmor_varID
,
dataslice
,
vars
[
i
].
datatype
,
chunk_files
[
i
],
1
,
&
time_val
,
time_bndsp
,
...
...
@@ -4222,40 +4222,41 @@ static void write_variables(list_t *kvl, int *streamID, struct mapping vars[], i
}
else
{
#if ( CMOR_VERSION_MAJOR ==
2 )
#if ( CMOR_VERSION_MAJOR ==
3 && CMOR_VERSION_MINOR <= 2 && CMOR_VERSION_PATCH <= 7 )
cmf
=
cmor_write
(
vars
[
i
].
cmor_varID
,
vars
[
i
].
data
,
vars
[
i
].
datatype
,
chunk_files
[
i
],
1
,
&
time_val
,
time_bndsp
,
NULL
);
#el
if ( CMOR_VERSION_MAJOR == 3 )
#el
se
cmf
=
cmor_write
(
vars
[
i
].
cmor_varID
,
vars
[
i
].
data
,
vars
[
i
].
datatype
,
chunk_files
[
i
],
1
,
&
time_val
,
time_bndsp
,
NULL
);
#endif
}
if
(
vars
[
i
].
zfactor_id
>
0
)
{
#if ( CMOR_VERSION_MAJOR ==
2 )
#if ( CMOR_VERSION_MAJOR ==
3 && CMOR_VERSION_MINOR <= 2 && CMOR_VERSION_PATCH <= 7 )
cmf
=
cmor_write
(
vars
[
i
].
zfactor_id
,
vars
[
ps_index
].
data
,
vars
[
ps_index
].
datatype
,
chunk_files
[
i
],
1
,
&
time_val
,
time_bndsp
,
&
vars
[
i
].
cmor_varID
);
#el
if ( CMOR_VERSION_MAJOR == 3 )
#el
se
cmf
=
cmor_write
(
vars
[
i
].
zfactor_id
,
vars
[
ps_index
].
data
,
vars
[
ps_index
].
datatype
,
chunk_files
[
i
],
1
,
&
time_val
,
time_bndsp
,
...
...
@@ -4265,16 +4266,16 @@ static void write_variables(list_t *kvl, int *streamID, struct mapping vars[], i
}
else
{
#if ( CMOR_VERSION_MAJOR ==
2 )
#if ( CMOR_VERSION_MAJOR ==
3 && CMOR_VERSION_MINOR <= 2 && CMOR_VERSION_PATCH <= 7 )
cmf
=
cmor_write
(
vars
[
i
].
cmor_varID
,
vars
[
i
].
data
,
vars
[
i
].
datatype
,
chunk_files
[
i
],
0
,
0
,
0
,
NULL
);
#elif ( CMOR_VERSION_MAJOR == 3 )
0
,
0
,
0
,
NULL
);
#else
cmf
=
cmor_write
(
vars
[
i
].
cmor_varID
,
vars
[
i
].
data
,
vars
[
i
].
datatype
,
0
,
0
,
0
,
NULL
);
chunk_files
[
i
],
0
,
0
,
0
,
NULL
);
#endif
}
}
...
...
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