Skip to content

Change methods of saber blocks to take oops::FieldSet3D #978

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
ytremolet merged 2 commits into from
Nov 30, 2023
Merged

Change methods of saber blocks to take oops::FieldSet3D #978

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
60403da
Update with oops::FieldSet3D
benjaminmenetrier Nov 21, 2023
db9fbe6
trigger CI
shlyaeva Nov 27, 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
12 changes: 6 additions & 6 deletions src/soca/ExplicitDiffusion/ExplicitDiffusion.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ ExplicitDiffusion::ExplicitDiffusion(
const Parameters_ & params,
const oops::FieldSet3D & xb,
const oops::FieldSet3D & fg)
: saber::SaberCentralBlockBase(params), params_(params)
: saber::SaberCentralBlockBase(params, xb.validTime()), params_(params)
{
// setup geometry
geom_.reset(new Geometry(params_.geometry.value(), geometryData.comm()));
Expand All @@ -40,24 +40,24 @@ ExplicitDiffusion::ExplicitDiffusion(

// --------------------------------------------------------------------------------------

void ExplicitDiffusion::randomize(atlas::FieldSet &) const {
void ExplicitDiffusion::randomize(oops::FieldSet3D &) const {
throw eckit::NotImplemented("read not implemented yet for ExplictDiffusion");
}

// --------------------------------------------------------------------------------------

void ExplicitDiffusion::multiply(atlas::FieldSet & fset) const {
void ExplicitDiffusion::multiply(oops::FieldSet3D & fset) const {
Increment dx(*geom_, vars_, util::DateTime());
dx.fromFieldSet(fset);
dx.fromFieldSet(fset.fieldSet());

soca_explicitdiffusion_multiply_f90(keyFortran_, dx.toFortran());

dx.toFieldSet(fset);
dx.toFieldSet(fset.fieldSet());
}

// --------------------------------------------------------------------------------------

void ExplicitDiffusion::directCalibration(const std::vector<atlas::FieldSet> &) {
void ExplicitDiffusion::directCalibration(const std::vector<oops::FieldSet3D> &) {
eckit::LocalConfiguration conf = (*params_.calibration.value()).toConfiguration();
soca_explicitdiffusion_calibrate_f90(keyFortran_, &conf);
}
Expand Down
6 changes: 3 additions & 3 deletions src/soca/ExplicitDiffusion/ExplicitDiffusion.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@ class ExplicitDiffusion : public saber::SaberCentralBlockBase {
const oops::FieldSet3D &,
const oops::FieldSet3D &);

void randomize(atlas::FieldSet &) const override;
void multiply(atlas::FieldSet &) const override;
void randomize(oops::FieldSet3D &) const override;
void multiply(oops::FieldSet3D &) const override;

void directCalibration(const std::vector<atlas::FieldSet> &) override;
void directCalibration(const std::vector<oops::FieldSet3D> &) override;
void read() override;
void write() const override;

Expand Down