Skip to content

Commit 52ec5b6

Browse files
mikecooke77mikecooke77
authored
Update to work with changes to UFO filters (#225)
1 parent fb7f33a commit 52ec5b6

12 files changed

+34
-37
lines changed

‎src/opsinputs/CxWriter.h

+3-4
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,10 @@
1313
#include "ioda/ObsDataVector.h"
1414
#include "oops/base/ObsVariables.h"
1515
#include "oops/base/Variables.h"
16-
#include "oops/interface/ObsFilterBase.h"
1716
#include "oops/util/ObjectCounter.h"
1817
#include "opsinputs/CxWriter.interface.h"
1918
#include "opsinputs/CxWriterParameters.h"
20-
#include "ufo/ObsTraits.h"
19+
#include "ufo/ObsFilterBase.h"
2120

2221
namespace eckit {
2322
class Configuration;
@@ -42,7 +41,7 @@ class LocalEnvironment;
4241
/// Most of the implementation is in Fortran (opsinputs_cxwriter_mod.F90).
4342
///
4443
/// \see CxWriterParameters for the list of accepted configuration parameters.
45-
class CxWriter : public oops::interface::ObsFilterBase<ufo::ObsTraits>,
44+
class CxWriter : public ufo::ObsFilterBase,
4645
private util::ObjectCounter<CxWriter> {
4746
public:
4847
static const std::string classname() {return "opsinputs::CxWriter";}
@@ -62,7 +61,7 @@ class CxWriter : public oops::interface::ObsFilterBase<ufo::ObsTraits>,
6261
const ioda::ObsVector &hofx,
6362
const ioda::ObsVector &bias,
6463
const ufo::ObsDiagnostics & diags) override;
65-
void checkFilterData(const oops::FilterStage filterStage) override {}
64+
void checkFilterData(const ufo::FilterStage filterStage) override {}
6665

6766
oops::Variables requiredVars() const override {return geovars_;}
6867
oops::ObsVariables requiredHdiagnostics() const override {return extradiagvars_;}

‎src/opsinputs/CxWriterParameters.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,16 @@
99
#include <string>
1010
#include <vector>
1111

12-
#include "oops/generic/ObsFilterParametersBase.h"
1312
#include "oops/util/parameters/OptionalParameter.h"
1413
#include "oops/util/parameters/Parameter.h"
14+
#include "ufo/ObsFilterParametersBase.h"
1515
#include "ufo/utils/parameters/ParameterTraitsVariable.h"
1616

1717
namespace opsinputs {
1818

1919
/// \brief CxWriter options.
20-
class CxWriterParameters : public oops::ObsFilterParametersBase {
21-
OOPS_CONCRETE_PARAMETERS(CxWriterParameters, oops::ObsFilterParametersBase)
20+
class CxWriterParameters : public ufo::ObsFilterParametersBase {
21+
OOPS_CONCRETE_PARAMETERS(CxWriterParameters, ufo::ObsFilterParametersBase)
2222

2323
public:
2424
/// Determines OPS verbosity.

‎src/opsinputs/VarObsWriter.h

+3-4
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,11 @@
1515
#include "ioda/ObsDataVector.h"
1616
#include "oops/base/ObsVariables.h"
1717
#include "oops/base/Variables.h"
18-
#include "oops/interface/ObsFilterBase.h"
1918
#include "oops/util/ObjectCounter.h"
2019
#include "oops/util/Printable.h"
2120
#include "opsinputs/VarObsWriter.interface.h"
2221
#include "opsinputs/VarObsWriterParameters.h"
23-
#include "ufo/ObsTraits.h"
22+
#include "ufo/ObsFilterBase.h"
2423

2524
namespace eckit {
2625
class Configuration;
@@ -51,7 +50,7 @@ class LocalEnvironment;
5150
/// Ops_WriteVarobs).
5251
///
5352
/// \see VarObsWriterParameters for the list of accepted configuration parameters.
54-
class VarObsWriter : public oops::interface::ObsFilterBase<ufo::ObsTraits>,
53+
class VarObsWriter : public ufo::ObsFilterBase,
5554
private util::ObjectCounter<VarObsWriter> {
5655
public:
5756
static const std::string classname() {return "opsinputs::VarObsWriter";}
@@ -71,7 +70,7 @@ class VarObsWriter : public oops::interface::ObsFilterBase<ufo::ObsTraits>,
7170
const ioda::ObsVector &hofx,
7271
const ioda::ObsVector &bias,
7372
const ufo::ObsDiagnostics &diags) override;
74-
void checkFilterData(const oops::FilterStage filterStage) override {}
73+
void checkFilterData(const ufo::FilterStage filterStage) override {}
7574

7675
oops::Variables requiredVars() const override {return geovars_;}
7776
oops::ObsVariables requiredHdiagnostics() const override {return extradiagvars_;}

‎src/opsinputs/VarObsWriterParameters.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,18 @@
1010
#include <vector>
1111

1212
#include "eckit/exception/Exceptions.h"
13-
#include "oops/generic/ObsFilterParametersBase.h"
1413
#include "oops/util/parameters/OptionalParameter.h"
1514
#include "oops/util/parameters/Parameter.h"
1615
#include "oops/util/parameters/RequiredParameter.h"
1716
#include "ufo/filters/Variable.h"
17+
#include "ufo/ObsFilterParametersBase.h"
1818
#include "ufo/utils/parameters/ParameterTraitsVariable.h"
1919

2020
namespace opsinputs {
2121

2222
/// \brief VarObsWriter options.
23-
class VarObsWriterParameters : public oops::ObsFilterParametersBase {
24-
OOPS_CONCRETE_PARAMETERS(VarObsWriterParameters, oops::ObsFilterParametersBase)
23+
class VarObsWriterParameters : public ufo::ObsFilterParametersBase {
24+
OOPS_CONCRETE_PARAMETERS(VarObsWriterParameters, ufo::ObsFilterParametersBase)
2525

2626
public:
2727
/// Determines OPS verbosity.

‎src/opsinputs/instantiateObsFilterFactory.cc

+3-4
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,16 @@
55

66
#include "opsinputs/instantiateObsFilterFactory.h"
77

8-
#include "oops/interface/ObsFilterBase.h"
98
#include "opsinputs/CxWriter.h"
109
#include "opsinputs/VarObsWriter.h"
11-
#include "ufo/ObsTraits.h"
10+
#include "ufo/ObsFilterBase.h"
1211

1312
namespace opsinputs {
1413

1514
void instantiateObsFilterFactory() {
16-
static oops::interface::FilterMaker<ufo::ObsTraits, VarObsWriter>
15+
static ufo::FilterMaker<VarObsWriter>
1716
makerVarObsWriter_("VarObs Writer");
18-
static oops::interface::FilterMaker<ufo::ObsTraits, CxWriter>
17+
static ufo::FilterMaker<CxWriter>
1918
makerCxWriter_("Cx Writer");
2019
}
2120

‎test/opsinputs/CxChecker.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
#include "ioda/ObsDataVector.h"
1717
#include "oops/base/ObsVariables.h"
1818
#include "oops/base/Variables.h"
19-
#include "oops/interface/ObsFilterBase.h"
2019
#include "oops/util/ObjectCounter.h"
20+
#include "ufo/ObsFilterBase.h"
2121
#include "ufo/ObsTraits.h"
2222

2323
namespace eckit {
@@ -48,7 +48,7 @@ namespace test {
4848
/// from that output.
4949
///
5050
/// See CxCheckerParameters for a list of available options.
51-
class CxChecker : public oops::interface::ObsFilterBase<ufo::ObsTraits>,
51+
class CxChecker : public ufo::ObsFilterBase,
5252
private util::ObjectCounter<CxChecker> {
5353
public:
5454
static const std::string classname() {return "opsinputs::test::CxChecker";}
@@ -68,7 +68,7 @@ class CxChecker : public oops::interface::ObsFilterBase<ufo::ObsTraits>,
6868
const ioda::ObsVector &hofx,
6969
const ioda::ObsVector &bias,
7070
const ufo::ObsDiagnostics &) override;
71-
void checkFilterData(const oops::FilterStage filterStage) override {}
71+
void checkFilterData(const ufo::FilterStage filterStage) override {}
7272

7373
oops::Variables requiredVars() const override {return geovars_;}
7474
oops::ObsVariables requiredHdiagnostics() const override {return extradiagvars_;}

‎test/opsinputs/CxCheckerParameters.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@
1111
#include <vector>
1212

1313
#include "eckit/exception/Exceptions.h"
14-
#include "oops/generic/ObsFilterParametersBase.h"
1514
#include "oops/util/parameters/OptionalParameter.h"
1615
#include "oops/util/parameters/Parameter.h"
16+
#include "ufo/ObsFilterParametersBase.h"
1717

1818
namespace opsinputs {
1919

2020
/// \brief CxChecker options.
21-
class CxCheckerParameters : public oops::ObsFilterParametersBase {
21+
class CxCheckerParameters : public ufo::ObsFilterParametersBase {
2222
OOPS_CONCRETE_PARAMETERS(CxCheckerParameters, ObsFilterParametersBase)
2323

2424
public:

‎test/opsinputs/ResetFlagsToPass.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
#include "ioda/ObsDataVector.h"
1616
#include "oops/base/ObsVariables.h"
1717
#include "oops/base/Variables.h"
18-
#include "oops/interface/ObsFilterBase.h"
1918
#include "oops/util/ObjectCounter.h"
19+
#include "ufo/ObsFilterBase.h"
2020
#include "ufo/ObsTraits.h"
2121

2222
namespace eckit {
@@ -40,7 +40,7 @@ namespace test {
4040
/// \brief Resets observation QC flags to 'pass'.
4141
///
4242
/// See ResetFlagsToPassParameters for the available options.
43-
class ResetFlagsToPass : public oops::interface::ObsFilterBase<ufo::ObsTraits>,
43+
class ResetFlagsToPass : public ufo::ObsFilterBase,
4444
private util::ObjectCounter<ResetFlagsToPass> {
4545
public:
4646
static const std::string classname() {return "opsinputs::test::ResetFlagsToPass";}
@@ -60,7 +60,7 @@ class ResetFlagsToPass : public oops::interface::ObsFilterBase<ufo::ObsTraits>,
6060
const ioda::ObsVector &hofx,
6161
const ioda::ObsVector &bias,
6262
const ufo::ObsDiagnostics &) override;
63-
void checkFilterData(const oops::FilterStage filterStage) override {}
63+
void checkFilterData(const ufo::FilterStage filterStage) override {}
6464

6565
oops::Variables requiredVars() const override {return geovars_;}
6666
oops::ObsVariables requiredHdiagnostics() const override {return extradiagvars_;}

‎test/opsinputs/ResetFlagsToPassParameters.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88

99
#include <vector>
1010

11-
#include "oops/generic/ObsFilterParametersBase.h"
1211
#include "oops/util/parameters/Parameter.h"
12+
#include "ufo/ObsFilterParametersBase.h"
1313

1414
namespace opsinputs {
1515

1616
/// \brief ResetFlagsToPass filter's options.
17-
class ResetFlagsToPassParameters : public oops::ObsFilterParametersBase {
17+
class ResetFlagsToPassParameters : public ufo::ObsFilterParametersBase {
1818
OOPS_CONCRETE_PARAMETERS(ResetFlagsToPassParameters, ObsFilterParametersBase)
1919

2020
public:

‎test/opsinputs/VarObsChecker.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
#include "ioda/ObsDataVector.h"
1616
#include "oops/base/ObsVariables.h"
1717
#include "oops/base/Variables.h"
18-
#include "oops/interface/ObsFilterBase.h"
1918
#include "oops/util/ObjectCounter.h"
19+
#include "ufo/ObsFilterBase.h"
2020
#include "ufo/ObsTraits.h"
2121

2222
namespace eckit {
@@ -47,7 +47,7 @@ namespace test {
4747
/// from that output.
4848
///
4949
/// See VarObsCheckerParameters for a list of available options.
50-
class VarObsChecker : public oops::interface::ObsFilterBase<ufo::ObsTraits>,
50+
class VarObsChecker : public ufo::ObsFilterBase,
5151
private util::ObjectCounter<VarObsChecker> {
5252
public:
5353
static const std::string classname() {return "opsinputs::test::VarObsChecker";}
@@ -67,7 +67,7 @@ class VarObsChecker : public oops::interface::ObsFilterBase<ufo::ObsTraits>,
6767
const ioda::ObsVector &hofx,
6868
const ioda::ObsVector &bias,
6969
const ufo::ObsDiagnostics &) override;
70-
void checkFilterData(const oops::FilterStage filterStage) override {}
70+
void checkFilterData(const ufo::FilterStage filterStage) override {}
7171

7272
oops::Variables requiredVars() const override {return geovars_;}
7373
oops::ObsVariables requiredHdiagnostics() const override {return extradiagvars_;}

‎test/opsinputs/VarObsCheckerParameters.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@
1111
#include <vector>
1212

1313
#include "eckit/exception/Exceptions.h"
14-
#include "oops/generic/ObsFilterParametersBase.h"
1514
#include "oops/util/parameters/OptionalParameter.h"
1615
#include "oops/util/parameters/Parameter.h"
1716
#include "oops/util/parameters/RequiredParameter.h"
17+
#include "ufo/ObsFilterParametersBase.h"
1818

1919
namespace opsinputs {
2020

2121
/// \brief VarObsChecker options.
22-
class VarObsCheckerParameters : public oops::ObsFilterParametersBase {
22+
class VarObsCheckerParameters : public ufo::ObsFilterParametersBase {
2323
OOPS_CONCRETE_PARAMETERS(VarObsCheckerParameters, ObsFilterParametersBase)
2424

2525
public:

‎test/opsinputs/instantiateObsFilterFactory.cc

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,18 @@
99
#include "../opsinputs/CxChecker.h"
1010
#include "../opsinputs/ResetFlagsToPass.h"
1111
#include "../opsinputs/VarObsChecker.h"
12-
#include "oops/interface/ObsFilterBase.h"
12+
#include "ufo/ObsFilterBase.h"
1313
#include "ufo/ObsTraits.h"
1414

1515
namespace opsinputs {
1616
namespace test {
1717

1818
void instantiateObsFilterFactory() {
19-
static oops::interface::FilterMaker<ufo::ObsTraits, VarObsChecker>
19+
static ufo::FilterMaker<VarObsChecker>
2020
varObsCheckerMaker("VarObs Checker");
21-
static oops::interface::FilterMaker<ufo::ObsTraits, CxChecker>
21+
static ufo::FilterMaker<CxChecker>
2222
cxCheckerMaker("Cx Checker");
23-
static oops::interface::FilterMaker<ufo::ObsTraits, ResetFlagsToPass>
23+
static ufo::FilterMaker<ResetFlagsToPass>
2424
resetFlagsToPassMaker("Reset Flags to Pass");
2525
}
2626

0 commit comments

Comments
 (0)