Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Flex Extract
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Monitor
Service Desk
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Flexpart
Flex Extract
Commits
65748f4c
Commit
65748f4c
authored
Sep 29, 2018
by
Anne Philipp
Browse files
Options
Downloads
Patches
Plain Diff
deleted unused variables, code style changes
parent
295ff45a
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
source/python/classes/EcFlexpart.py
+20
-26
20 additions, 26 deletions
source/python/classes/EcFlexpart.py
with
20 additions
and
26 deletions
source/python/classes/EcFlexpart.py
+
20
−
26
View file @
65748f4c
...
@@ -491,13 +491,13 @@ class EcFlexpart(object):
...
@@ -491,13 +491,13 @@ class EcFlexpart(object):
self
.
inputdir
=
inputdir
self
.
inputdir
=
inputdir
oro
=
False
oro
=
False
# define times
# define times
with datetime module
t12h
=
timedelta
(
hours
=
12
)
t12h
=
timedelta
(
hours
=
12
)
t24h
=
timedelta
(
hours
=
24
)
t24h
=
timedelta
(
hours
=
24
)
# dictionary which contains all parameter for the mars request
# dictionary which contains all parameter for the mars request
#
E
ntries with a "None" will change
for
different requests and
therefore
#
e
ntries with a "None" will change
in
different requests and
will
#
will
be set in each request seperately
#
therefore
be set in each request seperately
retr_param_dict
=
{
'
marsclass
'
:
self
.
marsclass
,
retr_param_dict
=
{
'
marsclass
'
:
self
.
marsclass
,
'
stream
'
:
None
,
'
stream
'
:
None
,
'
type
'
:
None
,
'
type
'
:
None
,
...
@@ -517,7 +517,7 @@ class EcFlexpart(object):
...
@@ -517,7 +517,7 @@ class EcFlexpart(object):
'
param
'
:
None
}
'
param
'
:
None
}
for
ftype
in
self
.
types
:
for
ftype
in
self
.
types
:
# fk contains field
s
types such as
# fk contains field types such as
# [AN, FC, PF, CV]
# [AN, FC, PF, CV]
# fv contains all of the items of the belonging key
# fv contains all of the items of the belonging key
# [times, steps]
# [times, steps]
...
@@ -534,9 +534,9 @@ class EcFlexpart(object):
...
@@ -534,9 +534,9 @@ class EcFlexpart(object):
retr_param_dict
[
'
step
'
]
=
self
.
types
[
ftype
][
'
steps
'
]
retr_param_dict
[
'
step
'
]
=
self
.
types
[
ftype
][
'
steps
'
]
retr_param_dict
[
'
date
'
]
=
self
.
dates
retr_param_dict
[
'
date
'
]
=
self
.
dates
retr_param_dict
[
'
stream
'
]
=
self
.
stream
retr_param_dict
[
'
stream
'
]
=
self
.
stream
retr_param_dict
[
'
target
'
]
=
self
.
inputdir
+
"
/
"
+
ftype
+
\
retr_param_dict
[
'
target
'
]
=
\
pk
+
'
.
'
+
self
.
dates
.
split
(
'
/
'
)[
0
]
+
'
.
'
+
\
self
.
_mk_targetname
(
ftype
,
pk
,
str
(
os
.
getppid
())
+
'
.
'
+
str
(
os
.
getpid
())
+
"
.grb
"
retr_param_dict
[
'
date
'
].
split
(
'
/
'
)[
0
])
retr_param_dict
[
'
param
'
]
=
pv
[
0
]
retr_param_dict
[
'
param
'
]
=
pv
[
0
]
retr_param_dict
[
'
levtype
'
]
=
pv
[
1
]
retr_param_dict
[
'
levtype
'
]
=
pv
[
1
]
retr_param_dict
[
'
levelist
'
]
=
pv
[
2
]
retr_param_dict
[
'
levelist
'
]
=
pv
[
2
]
...
@@ -563,30 +563,17 @@ class EcFlexpart(object):
...
@@ -563,30 +563,17 @@ class EcFlexpart(object):
# ------ on demand path --------------------------------------------------
# ------ on demand path --------------------------------------------------
if
not
self
.
basetime
:
if
not
self
.
basetime
:
# ******* start retrievement
self
.
_start_retrievement
(
request
,
retr_param_dict
)
self
.
_start_retrievement
(
request
,
retr_param_dict
)
# ------ operational path ------------------------------------------------
# ------ operational path ------------------------------------------------
else
:
else
:
# check if mars job requests fields beyond basetime.
# check if mars job requests fields beyond basetime.
#
I
f yes eliminate those fields since they may not
#
i
f yes eliminate those fields since they may not
# be accessible with user's credentials
# be accessible with user's credentials
if
'
by
'
in
retr_param_dict
[
'
step
'
]:
sm1
=
2
else
:
sm1
=
-
1
if
'
by
'
in
retr_param_dict
[
'
time
'
]:
enddate
=
retr_param_dict
[
'
date
'
].
split
(
'
/
'
)[
-
1
]
tm1
=
2
elimit
=
datetime
.
strptime
(
enddate
+
self
.
basetime
,
else
:
tm1
=
-
1
maxdate
=
datetime
.
strptime
(
retr_param_dict
[
'
date
'
].
split
(
'
/
'
)[
-
1
]
+
retr_param_dict
[
'
time
'
].
split
(
'
/
'
)[
tm1
],
'
%Y%m%d%H
'
)
'
%Y%m%d%H
'
)
maxtime
=
maxdate
+
\
timedelta
(
hours
=
int
(
retr_param_dict
[
'
step
'
].
split
(
'
/
'
)[
sm1
]))
elimit
=
datetime
.
strptime
(
retr_param_dict
[
'
date
'
].
split
(
'
/
'
)[
-
1
]
+
self
.
basetime
,
'
%Y%m%d%H
'
)
if
self
.
basetime
==
'
12
'
:
if
self
.
basetime
==
'
12
'
:
# -------------- flux data ----------------------------
# -------------- flux data ----------------------------
...
@@ -601,8 +588,11 @@ class EcFlexpart(object):
...
@@ -601,8 +588,11 @@ class EcFlexpart(object):
startdate
=
retr_param_dict
[
'
date
'
].
split
(
'
/
'
)[
0
]
startdate
=
retr_param_dict
[
'
date
'
].
split
(
'
/
'
)[
0
]
enddate
=
datetime
.
strftime
(
elimit
-
t24h
,
'
%Y%m%d
'
)
enddate
=
datetime
.
strftime
(
elimit
-
t24h
,
'
%Y%m%d
'
)
retr_param_dict
[
'
date
'
]
=
'
/
'
.
join
([
startdate
,
'
to
'
,
enddate
])
retr_param_dict
[
'
date
'
]
=
'
/
'
.
join
([
startdate
,
'
to
'
,
enddate
])
# ******* start retrievement
self
.
_start_retrievement
(
request
,
retr_param_dict
)
self
.
_start_retrievement
(
request
,
retr_param_dict
)
retr_param_dict
[
'
date
'
]
=
\
retr_param_dict
[
'
date
'
]
=
\
...
@@ -612,10 +602,12 @@ class EcFlexpart(object):
...
@@ -612,10 +602,12 @@ class EcFlexpart(object):
self
.
_mk_targetname
(
ftype
,
pk
,
self
.
_mk_targetname
(
ftype
,
pk
,
retr_param_dict
[
'
date
'
])
retr_param_dict
[
'
date
'
])
# ******* start retrievement
self
.
_start_retrievement
(
request
,
retr_param_dict
)
self
.
_start_retrievement
(
request
,
retr_param_dict
)
# -------------- non flux data ------------------------
# -------------- non flux data ------------------------
else
:
else
:
# ******* start retrievement
self
.
_start_retrievement
(
request
,
retr_param_dict
)
self
.
_start_retrievement
(
request
,
retr_param_dict
)
else
:
# basetime = 0
else
:
# basetime = 0
...
@@ -637,6 +629,7 @@ class EcFlexpart(object):
...
@@ -637,6 +629,7 @@ class EcFlexpart(object):
else
:
else
:
retr_param_dict
[
'
time
'
]
=
times
[
0
]
retr_param_dict
[
'
time
'
]
=
times
[
0
]
# ******* start retrievement
self
.
_start_retrievement
(
request
,
retr_param_dict
)
self
.
_start_retrievement
(
request
,
retr_param_dict
)
if
(
pk
!=
'
OG_OROLSM__SL
'
and
if
(
pk
!=
'
OG_OROLSM__SL
'
and
...
@@ -651,6 +644,7 @@ class EcFlexpart(object):
...
@@ -651,6 +644,7 @@ class EcFlexpart(object):
self
.
_mk_targetname
(
ftype
,
pk
,
self
.
_mk_targetname
(
ftype
,
pk
,
retr_param_dict
[
'
date
'
])
retr_param_dict
[
'
date
'
])
# ******* start retrievement
self
.
_start_retrievement
(
request
,
retr_param_dict
)
self
.
_start_retrievement
(
request
,
retr_param_dict
)
if
request
==
0
or
request
==
2
:
if
request
==
0
or
request
==
2
:
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment