Skip to content

Adapt to saber block interface change #982

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 6 commits into from
Dec 13, 2023
Merged

Adapt to saber block interface change #982

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7b6bf67
Adapt to saber block interface change
shlyaeva Dec 1, 2023
2535c6f
Merge branch 'develop' into feature/4dens_read
travissluka Dec 7, 2023
211c6b0
rename FieldSet4DEnsemble -> FieldSets
shlyaeva Dec 8, 2023
ce343bc
Merge branch 'develop' into feature/4dens_read
shlyaeva Dec 8, 2023
0a4dd6a
Merge branch 'develop' into feature/4dens_read
shlyaeva Dec 12, 2023
58341dd
Merge branch 'develop' into feature/4dens_read
shlyaeva Dec 13, 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: 1 addition & 1 deletion src/soca/ExplicitDiffusion/ExplicitDiffusion.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ void ExplicitDiffusion::multiply(oops::FieldSet3D & fset) const {

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

void ExplicitDiffusion::directCalibration(const std::vector<oops::FieldSet3D> &) {
void ExplicitDiffusion::directCalibration(const oops::FieldSets &) {
eckit::LocalConfiguration conf = (*params_.calibration.value()).toConfiguration();
soca_explicitdiffusion_calibrate_f90(keyFortran_, &conf);
}
Expand Down
2 changes: 1 addition & 1 deletion src/soca/ExplicitDiffusion/ExplicitDiffusion.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ class ExplicitDiffusion : public saber::SaberCentralBlockBase {
void randomize(oops::FieldSet3D &) const override;
void multiply(oops::FieldSet3D &) const override;

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

Expand Down