Skip to content

Adapt to OOPS #2258 #931

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
travissluka merged 2 commits into from
Jul 20, 2023
Merged

Adapt to OOPS #2258 #931

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8d616ea
update yamls
travissluka Jul 20, 2023
8db4bf7
remove vars from model
travissluka Jul 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions src/soca/Model/mom6solo/Model.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 0 additions & 2 deletions src/soca/Model/mom6solo/Model.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,15 +64,13 @@ 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_;
bool setup_mom6_;
const Geometry & geom_;
const oops::Variables vars_;
};
// -----------------------------------------------------------------------------

Expand Down
2 changes: 0 additions & 2 deletions src/soca/Model/ufsm6c6/ModelUFSm6c6.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"));
}
// -----------------------------------------------------------------------------
Expand Down
2 changes: 0 additions & 2 deletions src/soca/Model/ufsm6c6/ModelUFSm6c6.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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_;
};
// -----------------------------------------------------------------------------

Expand Down
3 changes: 1 addition & 2 deletions test/testinput/3dvarfgat_pseudo.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion test/testinput/forecast_pseudo.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
3 changes: 1 addition & 2 deletions test/testinput/hofx_4d_pseudo.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand All @@ -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
Expand Down