From 8939018177d16dd936452353494be6accb99fa52 Mon Sep 17 00:00:00 2001 From: ctgh Date: Thu, 3 Oct 2024 15:12:50 +0100 Subject: [PATCH 1/5] ufo filterbase --- src/nemo-feedback/NemoFeedback.h | 6 +++--- src/nemo-feedback/NemoFeedbackParameters.h | 6 +++--- src/nemo-feedback/instantiateObsFilterFactory.h | 5 ++--- src/tests/mains/TestObsFilters.cc | 2 +- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/nemo-feedback/NemoFeedback.h b/src/nemo-feedback/NemoFeedback.h index c337087..929e83e 100644 --- a/src/nemo-feedback/NemoFeedback.h +++ b/src/nemo-feedback/NemoFeedback.h @@ -13,20 +13,20 @@ #include "ioda/ObsDataVector.h" #include "oops/base/Variables.h" #include "oops/base/ObsVariables.h" -#include "oops/interface/ObsFilterBase.h" #include "oops/util/ObjectCounter.h" #include "oops/util/Printable.h" #include "nemo-feedback/NemoFeedbackParameters.h" #include "nemo-feedback/feedback_io/Writer.h" #include "nemo-feedback/NemoFeedbackDataCreator.h" #include "ufo/filters/ObsFilterData.h" +#include "ufo/ObsFilterBase.h" #include "ufo/ObsTraits.h" #include "ufo/utils/VariableNameMap.h" namespace nemo_feedback { /// \brief UFO filter for outputting data to NEMO feedback file -class NemoFeedback : public oops::interface::ObsFilterBase, +class NemoFeedback : public ufo::ObsFilterBase, private util::ObjectCounter { public: static const std::string classname() {return "nemo_feedback::NemoFeedback";} @@ -46,7 +46,7 @@ class NemoFeedback : public oops::interface::ObsFilterBase, const ioda::ObsVector &ov, const ioda::ObsVector &bv, const ufo::ObsDiagnostics &dv) override; - void checkFilterData(const oops::FilterStage filterStage) override {} + void checkFilterData(const ufo::FilterStage filterStage) override {} oops::Variables requiredVars() const override {return geovars_;} oops::ObsVariables requiredHdiagnostics() const override {return extradiagvars_;} diff --git a/src/nemo-feedback/NemoFeedbackParameters.h b/src/nemo-feedback/NemoFeedbackParameters.h index a3a8db3..131b6a3 100644 --- a/src/nemo-feedback/NemoFeedbackParameters.h +++ b/src/nemo-feedback/NemoFeedbackParameters.h @@ -8,11 +8,11 @@ #include #include "eckit/exception/Exceptions.h" -#include "oops/generic/ObsFilterParametersBase.h" #include "oops/util/parameters/Parameter.h" #include "oops/util/parameters/OptionalParameter.h" #include "oops/util/parameters/RequiredParameter.h" #include "ufo/filters/processWhere.h" +#include "ufo/ObsFilterParametersBase.h" #include "nemo-feedback/NemoFeedbackParameterTraitsOutputDtype.h" namespace nemo_feedback { @@ -43,9 +43,9 @@ class NemoFeedbackVariableParameters : public oops::Parameters { }; /// \brief NemoFeedback options. -class NemoFeedbackParameters : public oops::ObsFilterParametersBase { +class NemoFeedbackParameters : public ufo::ObsFilterParametersBase { OOPS_CONCRETE_PARAMETERS(NemoFeedbackParameters, - oops::ObsFilterParametersBase) + ufo::ObsFilterParametersBase) public: oops::Parameter Filename{"filename", "nemo_fdbk_out.nc", this}; diff --git a/src/nemo-feedback/instantiateObsFilterFactory.h b/src/nemo-feedback/instantiateObsFilterFactory.h index b899544..095b9b5 100644 --- a/src/nemo-feedback/instantiateObsFilterFactory.h +++ b/src/nemo-feedback/instantiateObsFilterFactory.h @@ -4,14 +4,13 @@ #pragma once -#include "oops/interface/ObsFilterBase.h" #include "nemo-feedback/NemoFeedback.h" +#include "ufo/ObsFilterBase.h" namespace nemo_feedback { -template void instantiateObsFilterFactory() { - static oops::interface::FilterMaker + static ufo::FilterMaker makerNemoFeedback_("NEMO Feedback Writer"); } diff --git a/src/tests/mains/TestObsFilters.cc b/src/tests/mains/TestObsFilters.cc index a0dbae4..6fdd7e3 100644 --- a/src/tests/mains/TestObsFilters.cc +++ b/src/tests/mains/TestObsFilters.cc @@ -11,7 +11,7 @@ int main(int argc, char ** argv) { oops::Run run(argc, argv); ufo::instantiateObsFilterFactory(); - nemo_feedback::instantiateObsFilterFactory(); + nemo_feedback::instantiateObsFilterFactory(); ufo::test::ObsFilters tests; return run.execute(tests); } From 358f1366b864a1d82689110daee1d261844ad305 Mon Sep 17 00:00:00 2001 From: ctgh Date: Fri, 4 Oct 2024 06:39:48 +0100 Subject: [PATCH 2/5] remove ufo ObsTraits --- src/nemo-feedback/NemoFeedback.h | 1 - 1 file changed, 1 deletion(-) diff --git a/src/nemo-feedback/NemoFeedback.h b/src/nemo-feedback/NemoFeedback.h index 929e83e..c519da6 100644 --- a/src/nemo-feedback/NemoFeedback.h +++ b/src/nemo-feedback/NemoFeedback.h @@ -20,7 +20,6 @@ #include "nemo-feedback/NemoFeedbackDataCreator.h" #include "ufo/filters/ObsFilterData.h" #include "ufo/ObsFilterBase.h" -#include "ufo/ObsTraits.h" #include "ufo/utils/VariableNameMap.h" namespace nemo_feedback { From 0b1b8a15358d3556a1c912926058d387d4d18e20 Mon Sep 17 00:00:00 2001 From: ctgh Date: Fri, 4 Oct 2024 06:40:46 +0100 Subject: [PATCH 3/5] remove more ufo ObsTraits --- src/tests/mains/TestObsFilters.cc | 1 - 1 file changed, 1 deletion(-) diff --git a/src/tests/mains/TestObsFilters.cc b/src/tests/mains/TestObsFilters.cc index 6fdd7e3..8475d98 100644 --- a/src/tests/mains/TestObsFilters.cc +++ b/src/tests/mains/TestObsFilters.cc @@ -6,7 +6,6 @@ #include "oops/runs/Run.h" #include "nemo-feedback/instantiateObsFilterFactory.h" #include "ufo/instantiateObsFilterFactory.h" -#include "ufo/ObsTraits.h" int main(int argc, char ** argv) { oops::Run run(argc, argv); From 5fb1b1aa135b5607829db50abd655be350671f5e Mon Sep 17 00:00:00 2001 From: ctgh Date: Fri, 4 Oct 2024 11:00:21 +0100 Subject: [PATCH 4/5] Trigger CI From 650b50d6da3863f4b01da4b19f40327f88173b0c Mon Sep 17 00:00:00 2001 From: mikecooke77 Date: Thu, 17 Oct 2024 23:06:00 +0100 Subject: [PATCH 5/5] trigger ci