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
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Flexpart
Flex Extract
Commits
b957ef79
Commit
b957ef79
authored
5 years ago
by
Anne Philipp
Browse files
Options
Downloads
Patches
Plain Diff
python2 downgrade/ manually select EMOSLIB instead of MIR
parent
8bcf3ecf
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
source/python/classes/MarsRetrieval.py
+6
-2
6 additions, 2 deletions
source/python/classes/MarsRetrieval.py
with
6 additions
and
2 deletions
source/python/classes/MarsRetrieval.py
+
6
−
2
View file @
b957ef79
#!/usr/bin/env python
3
#!/usr/bin/env python
# -*- coding: utf-8 -*-
# -*- coding: utf-8 -*-
#*******************************************************************************
#*******************************************************************************
# @Author: Anne Fouilloux (University of Oslo)
# @Author: Anne Fouilloux (University of Oslo)
...
@@ -31,6 +31,8 @@
...
@@ -31,6 +31,8 @@
# ------------------------------------------------------------------------------
# ------------------------------------------------------------------------------
# MODULES
# MODULES
# ------------------------------------------------------------------------------
# ------------------------------------------------------------------------------
from
__future__
import
print_function
import
os
import
os
import
sys
import
sys
import
subprocess
import
subprocess
...
@@ -483,6 +485,8 @@ class MarsRetrieval(object):
...
@@ -483,6 +485,8 @@ class MarsRetrieval(object):
for
key
in
empty_keys
:
for
key
in
empty_keys
:
del
attrs
[
key
]
del
attrs
[
key
]
attrs
[
'
ppengine
'
]
=
'
emos
'
# MARS request via Python script
# MARS request via Python script
if
self
.
server
:
if
self
.
server
:
try
:
try
:
...
@@ -513,7 +517,7 @@ class MarsRetrieval(object):
...
@@ -513,7 +517,7 @@ class MarsRetrieval(object):
for
key
,
value
in
attrs
.
items
():
for
key
,
value
in
attrs
.
items
():
request_str
=
request_str
+
'
,
'
+
key
+
'
=
'
+
str
(
value
)
request_str
=
request_str
+
'
,
'
+
key
+
'
=
'
+
str
(
value
)
request_str
+=
'
,target=
"'
+
target
+
'"'
request_str
+=
'
,target=
"'
+
target
+
'"'
p
=
subprocess
.
Popen
([
'
mars
'
],
p
=
subprocess
.
Popen
([
'
mars
'
,
'
-e
'
],
stdin
=
subprocess
.
PIPE
,
stdin
=
subprocess
.
PIPE
,
stdout
=
subprocess
.
PIPE
,
stdout
=
subprocess
.
PIPE
,
stderr
=
subprocess
.
PIPE
,
stderr
=
subprocess
.
PIPE
,
...
...
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