Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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/mains/AnalysisPostproc.h
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ class AnalysisPostproc : public oops::Application {
const size_t ensMember = incs.local_ens()[iens];
oops::Log::info() << "updating ice state " << ensMember << ":" << ens[iens] << std::endl;
for (size_t itime = 0; itime < ens.local_time_size(); ++itime) {
ens(itime, iens) += incs[itime, iens];
ens(itime, iens) += incs(itime, iens);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice catch! I was unaware of the comma operator and had to go educate myself on it. Talk about functionality that seems ideal for creating difficult bugs!

}
oops::Log::info() << "updated ice state " << ensMember << ":" << ens[iens] << std::endl;
// set up variable change
Expand Down
8 changes: 4 additions & 4 deletions src/soca/LinearVariableChange/Balance/Balance.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@ class Balance: public LinearVariableChangeBase {
~Balance();

/// Perform linear transforms
void multiply(const Increment &, Increment &) const;
void multiplyInverse(const Increment &, Increment &) const;
void multiplyAD(const Increment &, Increment &) const;
void multiplyInverseAD(const Increment &, Increment &) const;
void multiply(const Increment &, Increment &) const override;
void multiplyInverse(const Increment &, Increment &) const override;
void multiplyAD(const Increment &, Increment &) const override;
void multiplyInverseAD(const Increment &, Increment &) const override;

private:
void print(std::ostream &) const override;
Expand Down
2 changes: 1 addition & 1 deletion src/soca/VariableChange/Model2Ana/Model2Ana.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ namespace soca {

class Model2Ana: public VariableChangeBase {
public:
const std::string classname() {return "soca::Model2Ana";}
const std::string classname() override {return "soca::Model2Ana";}

Model2Ana(const Geometry &, const eckit::Configuration &);
~Model2Ana();
Expand Down
2 changes: 1 addition & 1 deletion src/soca/VariableChange/Model2GeoVaLs/Model2GeoVaLs.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ namespace soca {

class Model2GeoVaLs: public VariableChangeBase {
public:
const std::string classname() {return "soca::Model2GeoVaLs";}
const std::string classname() override {return "soca::Model2GeoVaLs";}

Model2GeoVaLs(const Geometry &, const eckit::Configuration &);
~Model2GeoVaLs();
Expand Down
2 changes: 1 addition & 1 deletion src/soca/VariableChange/Soca2Cice/Soca2Cice.h
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ class Soca2Cice: public VariableChangeBase {
"minimum allowable ice volume", 0.00001, this, {oops::minConstraint(0.0)}};
};

const std::string classname() {return "soca::Soca2Cice";}
const std::string classname() override {return "soca::Soca2Cice";}

Soca2Cice(const Geometry &, const eckit::Configuration &);
~Soca2Cice();
Expand Down