From ab5a2aca18da1784a013b86e3174772884141baa Mon Sep 17 00:00:00 2001 From: Ingrid Luijkx <ingrid.luijkx@wur.nl> Date: Fri, 4 Jun 2021 13:32:54 +0200 Subject: [PATCH] Updated template for new structure --- .gitignore | 2 +- templates/template.py | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index b350881f..da23194a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ # Exclude the files created from the templates: -templates/* +#templates/* # Exclude compiled files da/**/__pycache__/ da/**/*.pyc diff --git a/templates/template.py b/templates/template.py index 5129898d..0a88b2a7 100755 --- a/templates/template.py +++ b/templates/template.py @@ -25,13 +25,12 @@ sys.path.append(os.getcwd()) # Next, import the tools needed to initialize a data assimilation cycle ################################################################################################# -from da.tools.initexit import start_logger, validate_opts_args, parse_options, CycleControl +from da.cyclecontrol.initexit_cteco2 import start_logger, validate_opts_args, parse_options, CycleControl from da.pipelines.pipeline_cteco2 import ensemble_smoother_pipeline, header, footer, analysis_pipeline, archive_pipeline from da.dasystems.dasystem_cteco2 import CO2DaSystem from da.platform.cartesius import CartesiusPlatform from da.statevectors.statevectorNHgridded_cteco2 import CO2GriddedStateVector -from da.observations.obspack_globalviewplus_2020 import ObsPackObservations -from da.observations.column_obs import TotalColumnObservations +from da.observations.obs_gvp_co2 import ObsPackObservations from da.obsoperators.observationoperator_tm5_cteco2 import TM5ObservationOperator from da.optimizers.optimizer_cteco2 import CO2Optimizer @@ -53,7 +52,7 @@ dacycle = CycleControl(opts, args) platform = CartesiusPlatform() dasystem = CO2DaSystem(dacycle['da.system.rc']) obsoperator = TM5ObservationOperator(dacycle['da.obsoperator.rc']) -samples = [ObsPackObservations(),TotalColumnObservations()] +samples = [ObsPackObservations()] statevector = CO2GriddedStateVector() optimizer = CO2Optimizer() -- GitLab