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
969b2682
Commit
969b2682
authored
Dec 17, 2019
by
Auke van de Woude
Browse files
Merge branch 'master' of
https://git.wur.nl/ctdas/CTDAS
into feature-STILT
Conflicts: stilt.nc4.sib.co2.Feb.2015.May13.r
parents
0cc23577
2a19664b
Changes
4
Hide whitespace changes
Inline
Side-by-side
da/test/test_optimizer.py
View file @
969b2682
...
...
@@ -21,6 +21,7 @@ File created on 04 Aug 2010.
"""
def
serial_py_against_serial_fortran
():
""" Test the solution of the serial algorithm against the CT cy2 fortran generated one """
...
...
template.jb
→
templates/
template.jb
View file @
969b2682
File moved
template.py
→
templates/
template.py
View file @
969b2682
...
...
@@ -27,7 +27,7 @@ sys.path.append(os.getcwd())
from
da.tools.initexit
import
start_logger
,
validate_opts_args
,
parse_options
,
CycleControl
from
da.tools.pipeline
import
ensemble_smoother_pipeline
,
header
,
footer
from
da.platform.
maunaloa
import
Maunaloa
Platform
from
da.platform.
capegrim
import
CapeGrim
Platform
from
da.baseclasses.dasystem
import
DaSystem
from
da.baseclasses.statevector
import
StateVector
from
da.carbondioxide.obspack_globalviewplus2
import
ObsPackObservations
...
...
template.rc
→
templates/
template.rc
View file @
969b2682
File moved
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