From 7b6bf67a56dff5614f34c9664d79dc035b351d34 Mon Sep 17 00:00:00 2001 From: Anna Shlyaeva Date: Fri, 1 Dec 2023 23:20:28 +0000 Subject: [PATCH 1/2] Adapt to saber block interface change --- src/soca/ExplicitDiffusion/ExplicitDiffusion.cc | 2 +- src/soca/ExplicitDiffusion/ExplicitDiffusion.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/soca/ExplicitDiffusion/ExplicitDiffusion.cc b/src/soca/ExplicitDiffusion/ExplicitDiffusion.cc index 5353a37f4..490b29044 100644 --- a/src/soca/ExplicitDiffusion/ExplicitDiffusion.cc +++ b/src/soca/ExplicitDiffusion/ExplicitDiffusion.cc @@ -57,7 +57,7 @@ void ExplicitDiffusion::multiply(oops::FieldSet3D & fset) const { // -------------------------------------------------------------------------------------- -void ExplicitDiffusion::directCalibration(const std::vector &) { +void ExplicitDiffusion::directCalibration(const oops::FieldSet4DEnsemble &) { eckit::LocalConfiguration conf = (*params_.calibration.value()).toConfiguration(); soca_explicitdiffusion_calibrate_f90(keyFortran_, &conf); } diff --git a/src/soca/ExplicitDiffusion/ExplicitDiffusion.h b/src/soca/ExplicitDiffusion/ExplicitDiffusion.h index 9ab727c4b..10af30cfe 100644 --- a/src/soca/ExplicitDiffusion/ExplicitDiffusion.h +++ b/src/soca/ExplicitDiffusion/ExplicitDiffusion.h @@ -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 &) override; + void directCalibration(const oops::FieldSet4DEnsemble &) override; void read() override; void write() const override; From 211c6b086c00faaf3a9e9c87135d729eff2055dd Mon Sep 17 00:00:00 2001 From: Anna Shlyaeva Date: Fri, 8 Dec 2023 18:46:24 +0000 Subject: [PATCH 2/2] rename FieldSet4DEnsemble -> FieldSets --- src/soca/ExplicitDiffusion/ExplicitDiffusion.cc | 2 +- src/soca/ExplicitDiffusion/ExplicitDiffusion.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/soca/ExplicitDiffusion/ExplicitDiffusion.cc b/src/soca/ExplicitDiffusion/ExplicitDiffusion.cc index 490b29044..16e790221 100644 --- a/src/soca/ExplicitDiffusion/ExplicitDiffusion.cc +++ b/src/soca/ExplicitDiffusion/ExplicitDiffusion.cc @@ -57,7 +57,7 @@ void ExplicitDiffusion::multiply(oops::FieldSet3D & fset) const { // -------------------------------------------------------------------------------------- -void ExplicitDiffusion::directCalibration(const oops::FieldSet4DEnsemble &) { +void ExplicitDiffusion::directCalibration(const oops::FieldSets &) { eckit::LocalConfiguration conf = (*params_.calibration.value()).toConfiguration(); soca_explicitdiffusion_calibrate_f90(keyFortran_, &conf); } diff --git a/src/soca/ExplicitDiffusion/ExplicitDiffusion.h b/src/soca/ExplicitDiffusion/ExplicitDiffusion.h index 10af30cfe..6aad31d88 100644 --- a/src/soca/ExplicitDiffusion/ExplicitDiffusion.h +++ b/src/soca/ExplicitDiffusion/ExplicitDiffusion.h @@ -42,7 +42,7 @@ class ExplicitDiffusion : public saber::SaberCentralBlockBase { void randomize(oops::FieldSet3D &) const override; void multiply(oops::FieldSet3D &) const override; - void directCalibration(const oops::FieldSet4DEnsemble &) override; + void directCalibration(const oops::FieldSets &) override; void read() override; void write() const override;