Commit 969b2682 authored by Auke van de Woude's avatar 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
...@@ -21,6 +21,7 @@ File created on 04 Aug 2010. ...@@ -21,6 +21,7 @@ File created on 04 Aug 2010.
""" """
def serial_py_against_serial_fortran(): def serial_py_against_serial_fortran():
""" Test the solution of the serial algorithm against the CT cy2 fortran generated one """ """ Test the solution of the serial algorithm against the CT cy2 fortran generated one """
......
...@@ -27,7 +27,7 @@ sys.path.append(os.getcwd()) ...@@ -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.initexit import start_logger, validate_opts_args, parse_options, CycleControl
from da.tools.pipeline import ensemble_smoother_pipeline, header, footer from da.tools.pipeline import ensemble_smoother_pipeline, header, footer
from da.platform.maunaloa import MaunaloaPlatform from da.platform.capegrim import CapeGrimPlatform
from da.baseclasses.dasystem import DaSystem from da.baseclasses.dasystem import DaSystem
from da.baseclasses.statevector import StateVector from da.baseclasses.statevector import StateVector
from da.carbondioxide.obspack_globalviewplus2 import ObsPackObservations from da.carbondioxide.obspack_globalviewplus2 import ObsPackObservations
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment