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
NearRealTimeCTDAS
CTDAS
Commits
4d1ecc23
Commit
4d1ecc23
authored
Dec 18, 2019
by
Auke van der Woude
Browse files
changed tabs to spaces
parent
369a05bb
Changes
4
Hide whitespace changes
Inline
Side-by-side
da/carbondioxide/obspack.py
View file @
4d1ecc23
...
...
@@ -254,27 +254,27 @@ class ObsPackObservations(Observations):
savedict
[
'missing_value'
]
=
'!'
f
.
add_data
(
savedict
)
data
=
self
.
getvalues
(
'obs'
)
savedict
=
io
.
std_savedict
.
copy
()
savedict
[
'name'
]
=
"observed"
savedict
[
'long_name'
]
=
"observedvalues"
savedict
[
'units'
]
=
"mol mol-1"
savedict
[
'dims'
]
=
dimid
savedict
[
'values'
]
=
data
.
tolist
()
savedict
[
'comment'
]
=
'Observations used in optimization'
f
.
add_data
(
savedict
)
data
=
self
.
getvalues
(
'obs'
)
savedict
=
io
.
std_savedict
.
copy
()
savedict
[
'name'
]
=
"observed"
savedict
[
'long_name'
]
=
"observedvalues"
savedict
[
'units'
]
=
"mol mol-1"
savedict
[
'dims'
]
=
dimid
savedict
[
'values'
]
=
data
.
tolist
()
savedict
[
'comment'
]
=
'Observations used in optimization'
f
.
add_data
(
savedict
)
data
=
self
.
getvalues
(
'mdm'
)
data
=
self
.
getvalues
(
'mdm'
)
savedict
=
io
.
std_savedict
.
copy
()
savedict
[
'name'
]
=
"modeldatamismatch"
savedict
[
'long_name'
]
=
"modeldatamismatch"
savedict
[
'units'
]
=
"[mol mol-1]"
savedict
[
'dims'
]
=
dimid
savedict
[
'values'
]
=
data
.
tolist
()
savedict
[
'comment'
]
=
'Standard deviation of mole fractions resulting from model-data mismatch'
f
.
add_data
(
savedict
)
savedict
=
io
.
std_savedict
.
copy
()
savedict
[
'name'
]
=
"modeldatamismatch"
savedict
[
'long_name'
]
=
"modeldatamismatch"
savedict
[
'units'
]
=
"[mol mol-1]"
savedict
[
'dims'
]
=
dimid
savedict
[
'values'
]
=
data
.
tolist
()
savedict
[
'comment'
]
=
'Standard deviation of mole fractions resulting from model-data mismatch'
f
.
add_data
(
savedict
)
f
.
close
()
...
...
da/platform/cartesius.py
View file @
4d1ecc23
...
...
@@ -39,7 +39,7 @@ class CartesiusPlatform(Platform):
"""
Returns a blocking flag, which is important if tm5 is submitted in a queue system. The python ctdas code is forced to wait before tm5 run is finished
-on Huygens: return "-s"
-on Huygens: return "-s"
-on Maunaloa: return "" (no queue available)
-on Jet/Zeus: return
"""
...
...
@@ -102,7 +102,7 @@ class CartesiusPlatform(Platform):
"""#SBATCH -o joblog
\n
"""
+
\
"""module load python
\n
"""
+
\
"""module load nco
\n
"""
+
\
"""
\n
"""
"""
\n
"""
if
'depends'
in
joboptions
:
template
+=
"""#$ -hold_jid depends
\n
"""
...
...
@@ -151,16 +151,16 @@ class CartesiusPlatform(Platform):
# jobid = output.split()[2]
# retcode = output.split()[-1]
#
#
# #for huygens
#
print 'output', output
#
test = output.split()[3]
#
print 'output', output
#
test = output.split()[3]
# dummy, jobid =test.split('nl.')
#
jobid='%s%s' %('"',jobid)
#
submitmsg ='%s%s%s'%(output.split()[4],output.split()[5],output.split()[6])
#
jobid='%s%s' %('"',jobid)
#
submitmsg ='%s%s%s'%(output.split()[4],output.split()[5],output.split()[6])
# if submitmsg=='hasbeensubmitted.':
#
retcode=2
# print 'retcode',submitmsg,retcode
#
retcode=2
# print 'retcode',submitmsg,retcode
# return retcode
#
# def KillJob(self,jobid):
...
...
da/stilt/obspack.py
View file @
4d1ecc23
...
...
@@ -67,7 +67,7 @@ class ObsPackObservations(Observations):
We will loop over all site files in the ObsPackage, and subset each to our needs
"""
import
string
import
string
# Step 1: Read list of available site files in package
...
...
@@ -98,11 +98,11 @@ class ObsPackObservations(Observations):
subselect
=
logical_and
(
dates
>=
self
.
startdate
,
dates
<=
self
.
enddate
).
nonzero
()[
0
]
if
len
(
subselect
)
==
0
:
if
len
(
subselect
)
==
0
:
ncf
.
close
()
continue
continue
logging
.
debug
(
"Trying to add %d observations from file (%s) to the Data list"
%
(
len
(
subselect
),
ncfile
))
logging
.
debug
(
"Trying to add %d observations from file (%s) to the Data list"
%
(
len
(
subselect
),
ncfile
))
dates
=
dates
.
take
(
subselect
,
axis
=
0
)
...
...
@@ -321,27 +321,27 @@ class ObsPackObservations(Observations):
savedict
[
'missing_value'
]
=
'!'
f
.
add_data
(
savedict
)
data
=
data_obs
savedict
=
io
.
std_savedict
.
copy
()
savedict
[
'name'
]
=
"observed"
savedict
[
'long_name'
]
=
"observedvalues"
savedict
[
'units'
]
=
"mol mol-1"
savedict
[
'dims'
]
=
dimid
savedict
[
'values'
]
=
data
.
tolist
()
savedict
[
'comment'
]
=
'Observations used in optimization'
f
.
add_data
(
savedict
)
data
=
data_mdm
savedict
=
io
.
std_savedict
.
copy
()
savedict
[
'name'
]
=
"modeldatamismatch"
savedict
[
'long_name'
]
=
"modeldatamismatch"
savedict
[
'units'
]
=
"[mol mol-1]"
savedict
[
'dims'
]
=
dimid
savedict
[
'values'
]
=
data
.
tolist
()
savedict
[
'comment'
]
=
'Standard deviation of mole fractions resulting from model-data mismatch'
f
.
add_data
(
savedict
)
data
=
data_obs
savedict
=
io
.
std_savedict
.
copy
()
savedict
[
'name'
]
=
"observed"
savedict
[
'long_name'
]
=
"observedvalues"
savedict
[
'units'
]
=
"mol mol-1"
savedict
[
'dims'
]
=
dimid
savedict
[
'values'
]
=
data
.
tolist
()
savedict
[
'comment'
]
=
'Observations used in optimization'
f
.
add_data
(
savedict
)
data
=
data_mdm
savedict
=
io
.
std_savedict
.
copy
()
savedict
[
'name'
]
=
"modeldatamismatch"
savedict
[
'long_name'
]
=
"modeldatamismatch"
savedict
[
'units'
]
=
"[mol mol-1]"
savedict
[
'dims'
]
=
dimid
savedict
[
'values'
]
=
data
.
tolist
()
savedict
[
'comment'
]
=
'Standard deviation of mole fractions resulting from model-data mismatch'
f
.
add_data
(
savedict
)
f
.
close
()
...
...
da/stilt/pipeline.py
View file @
4d1ecc23
...
...
@@ -325,7 +325,7 @@ def sample_step(dacycle, samples, statevector, obsoperator, lag, advance=False):
logging
.
info
(
" ... No simulations needed for this cycle of lag"
)
logging
.
info
(
" ... No residuals needed for this cycle of lag"
)
logging
.
info
(
" ... Proceeding to next cycle of lag"
)
return
return
samples
.
setup
(
dacycle
)
samples
.
add_observations
()
...
...
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