Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
libcdi
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
1
Issues
1
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
mpim-sw
libcdi
Commits
6933cc4c
Commit
6933cc4c
authored
Sep 25, 2020
by
Uwe Schulzweida
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cdi_generate_vars: set level to level1 if zaxis bounds are available.
parent
6b38c8af
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
8 deletions
+14
-8
ChangeLog
ChangeLog
+4
-0
src/varscan.c
src/varscan.c
+10
-8
No files found.
ChangeLog
View file @
6933cc4c
...
...
@@ -3,6 +3,10 @@
* using CGRIBEX library version 1.9.5
* Version 1.9.9 released
2020-09-25 Uwe Schulzweida
* cdi_generate_vars: set level to level1 if zaxis bounds are available (removed level = (level1 + level2) / 2)
2020-09-21 Uwe Schulzweida
* Ignore netCDF attribute _NCProperties
...
...
src/varscan.c
View file @
6933cc4c
...
...
@@ -552,14 +552,14 @@ void cdi_generate_vars(stream_t *streamptr)
const
int
param
=
vartable
[
varid
].
param
;
const
int
ltype1
=
vartable
[
varid
].
ltype1
;
const
int
ltype2
=
vartable
[
varid
].
ltype2
;
int
zaxistype
=
vartable
[
varid
].
zaxistype
;
int
zaxistype
=
vartable
[
varid
].
zaxistype
;
if
(
ltype1
==
0
&&
zaxistype
==
ZAXIS_GENERIC
&&
cdiDefaultLeveltype
!=
-
1
)
zaxistype
=
cdiDefaultLeveltype
;
const
int
lbounds
=
vartable
[
varid
].
lbounds
;
const
int
prec
=
vartable
[
varid
].
prec
;
int
instID
=
vartable
[
varid
].
instID
;
int
modelID
=
vartable
[
varid
].
modelID
;
int
tableID
=
vartable
[
varid
].
tableID
;
int
instID
=
vartable
[
varid
].
instID
;
int
modelID
=
vartable
[
varid
].
modelID
;
int
tableID
=
vartable
[
varid
].
tableID
;
const
int
tsteptype
=
vartable
[
varid
].
tsteptype
;
const
int
comptype
=
vartable
[
varid
].
comptype
;
...
...
@@ -602,11 +602,12 @@ void cdi_generate_vars(stream_t *streamptr)
double
*
dlevels
=
(
double
*
)
Malloc
(
nlevels
*
sizeof
(
double
));
/*
if ( lbounds && zaxistype != ZAXIS_HYBRID && zaxistype != ZAXIS_HYBRID_HALF )
for ( unsigned levelID = 0; levelID < nlevels; levelID++ )
dlevels
[
levelID
]
=
(
level_sf
*
levelTable
[
levelID
].
level1
+
level_sf
*
levelTable
[
levelID
].
level2
)
/
2
;
dlevels[levelID] = (level_sf*levelTable[levelID].level1 + level_sf*levelTable[levelID].level2) / 2.0;
else
*/
for
(
unsigned
levelID
=
0
;
levelID
<
nlevels
;
levelID
++
)
dlevels
[
levelID
]
=
level_sf
*
levelTable
[
levelID
].
level1
;
...
...
@@ -645,11 +646,12 @@ void cdi_generate_vars(stream_t *streamptr)
if
(
lsort
)
{
/*
if ( lbounds && zaxistype != ZAXIS_HYBRID && zaxistype != ZAXIS_HYBRID_HALF )
for ( unsigned levelID = 0; levelID < nlevels; levelID++ )
dlevels
[
levelID
]
=
(
level_sf
*
levelTable
[
levelID
].
level1
+
level_sf
*
levelTable
[
levelID
].
level2
)
/
2
.;
dlevels[levelID] = (level_sf*levelTable[levelID].level1 + level_sf*levelTable[levelID].level2) / 2.0;
else
*/
for
(
unsigned
levelID
=
0
;
levelID
<
nlevels
;
levelID
++
)
dlevels
[
levelID
]
=
level_sf
*
levelTable
[
levelID
].
level1
;
}
...
...
Write
Preview
Markdown
is supported
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