diff --git a/src/soca/Model/mom6solo/Model.cc b/src/soca/Model/mom6solo/Model.cc index e1e35ed82..38d94a56f 100644 --- a/src/soca/Model/mom6solo/Model.cc +++ b/src/soca/Model/mom6solo/Model.cc @@ -31,11 +31,9 @@ namespace soca { : keyConfig_(0), tstep_(0), geom_(resol), - vars_(model, "model variables"), setup_mom6_(true) { Log::trace() << "Model::Model" << std::endl; - Log::trace() << "Model vars: " << vars_ << std::endl; tstep_ = util::Duration(model.getString("tstep")); setup_mom6_ = model.getBool("setup_mom6", true); const eckit::Configuration * configc = &model; diff --git a/src/soca/Model/mom6solo/Model.h b/src/soca/Model/mom6solo/Model.h index de320f6d4..c12989812 100644 --- a/src/soca/Model/mom6solo/Model.h +++ b/src/soca/Model/mom6solo/Model.h @@ -64,7 +64,6 @@ namespace soca { /// Utilities const util::Duration & timeResolution() const {return tstep_;} - const oops::Variables & variables() const {return vars_;} private: void print(std::ostream &) const; @@ -72,7 +71,6 @@ namespace soca { util::Duration tstep_; bool setup_mom6_; const Geometry & geom_; - const oops::Variables vars_; }; // ----------------------------------------------------------------------------- diff --git a/src/soca/Model/ufsm6c6/ModelUFSm6c6.cc b/src/soca/Model/ufsm6c6/ModelUFSm6c6.cc index 76c87d215..2466d2fb4 100644 --- a/src/soca/Model/ufsm6c6/ModelUFSm6c6.cc +++ b/src/soca/Model/ufsm6c6/ModelUFSm6c6.cc @@ -32,10 +32,8 @@ namespace soca { : keyConfig_(0), tstep_(0), geom_(resol), - vars_(model, "model variables") { Log::trace() << "ModelUFSm6c6::ModelUFSm6c6" << std::endl; - Log::trace() << "ModelUFSm6c6 vars: " << vars_ << std::endl; tstep_ = util::Duration(model.getString("tstep")); } // ----------------------------------------------------------------------------- diff --git a/src/soca/Model/ufsm6c6/ModelUFSm6c6.h b/src/soca/Model/ufsm6c6/ModelUFSm6c6.h index 593d79c11..cc306e6f6 100644 --- a/src/soca/Model/ufsm6c6/ModelUFSm6c6.h +++ b/src/soca/Model/ufsm6c6/ModelUFSm6c6.h @@ -64,14 +64,12 @@ namespace soca { /// Utilities const util::Duration & timeResolution() const {return tstep_;} - const oops::Variables & variables() const {return vars_;} private: void print(std::ostream &) const; int keyConfig_; util::Duration tstep_; const Geometry & geom_; - const oops::Variables vars_; }; // ----------------------------------------------------------------------------- diff --git a/test/testinput/3dvarfgat_pseudo.yml b/test/testinput/3dvarfgat_pseudo.yml index 7f101466d..2dbbcb9ee 100644 --- a/test/testinput/3dvarfgat_pseudo.yml +++ b/test/testinput/3dvarfgat_pseudo.yml @@ -26,7 +26,6 @@ cost function: model: name: PseudoModel tstep: PT1H - state variables: &model_vars [socn, tocn, ssh, hocn, uocn, vocn, mld, layer_depth] _state : &state basename: data_generated/forecast_mom6/ read_from_file: 1 @@ -55,7 +54,7 @@ cost function: basename: data_static/72x35x25/restarts/ ocn_filename: MOM.res.nc date: &bkg_date 2018-04-15T00:00:00Z - state variables: *model_vars + state variables: [socn, tocn, ssh, hocn, uocn, vocn, mld, layer_depth] background error: covariance model: SocaError diff --git a/test/testinput/forecast_pseudo.yml b/test/testinput/forecast_pseudo.yml index db90e93c6..dc9606b1d 100644 --- a/test/testinput/forecast_pseudo.yml +++ b/test/testinput/forecast_pseudo.yml @@ -6,7 +6,6 @@ geometry: model: name: PseudoModel tstep: PT1H - state variables: [socn, tocn, ssh, hocn, uocn, vocn] states: - date: 2018-04-15T01:00:00Z basename: data_generated/forecast_mom6/ diff --git a/test/testinput/hofx_4d_pseudo.yml b/test/testinput/hofx_4d_pseudo.yml index f7760ea37..b71387d8f 100644 --- a/test/testinput/hofx_4d_pseudo.yml +++ b/test/testinput/hofx_4d_pseudo.yml @@ -6,7 +6,6 @@ geometry: model: name: PseudoModel tstep: PT1H - state variables: &soca_vars [socn, tocn, ssh, hocn, uocn, vocn] states: - date: 2018-04-15T01:00:00Z basename: data_generated/forecast_mom6/ @@ -26,7 +25,7 @@ initial condition: date: 2018-04-15T00:00:00Z basename: data_static/72x35x25/restarts/ ocn_filename: MOM.res.nc - state variables: *soca_vars + state variables: [socn, tocn, ssh, hocn, uocn, vocn] window begin: 2018-04-15T00:00:00Z window length: PT3H