From f91771bfb37b611c037d9132d70eaccdd287f38f Mon Sep 17 00:00:00 2001 From: ss421 Date: Thu, 29 Sep 2022 16:27:08 +0100 Subject: [PATCH 1/2] Update API for oops changes --- src/orca-jedi/geometry/Geometry.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/orca-jedi/geometry/Geometry.h b/src/orca-jedi/geometry/Geometry.h index cfeb7e9..7a3245d 100644 --- a/src/orca-jedi/geometry/Geometry.h +++ b/src/orca-jedi/geometry/Geometry.h @@ -15,6 +15,7 @@ #include "atlas/field/Field.h" #include "atlas/field/FieldSet.h" #include "atlas/functionspace/NodeColumns.h" +#include "atlas/functionspace.h" #include "atlas/mesh.h" #include "atlas/grid.h" #include "atlas/meshgenerator.h" @@ -58,6 +59,8 @@ class Geometry : public util::Printable { const oops::Variables & variables() const; void latlon(std::vector & lats, std::vector & lons, const bool halo) const; + const atlas::FunctionSpace & functionSpace() const {return nospace_;} + const atlas::FieldSet & extraFields() const {return nofields_;} const atlas::Grid & grid() const {return grid_;} const atlas::Mesh & mesh() const {return mesh_;} @@ -78,6 +81,8 @@ class Geometry : public util::Printable { atlas::grid::Partitioner partitioner_; atlas::Mesh mesh_; atlas::functionspace::NodeColumns funcSpace_; + atlas::FunctionSpace nospace_; + atlas::FieldSet nofields_; }; // ----------------------------------------------------------------------------- From 3ea84519dcdf6ab7f7dd0f8da7bca4711232d9dc Mon Sep 17 00:00:00 2001 From: ss421 Date: Thu, 29 Sep 2022 17:49:24 +0100 Subject: [PATCH 2/2] Code reviewer update --- src/orca-jedi/geometry/Geometry.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/orca-jedi/geometry/Geometry.h b/src/orca-jedi/geometry/Geometry.h index 7a3245d..c9db359 100644 --- a/src/orca-jedi/geometry/Geometry.h +++ b/src/orca-jedi/geometry/Geometry.h @@ -59,7 +59,7 @@ class Geometry : public util::Printable { const oops::Variables & variables() const; void latlon(std::vector & lats, std::vector & lons, const bool halo) const; - const atlas::FunctionSpace & functionSpace() const {return nospace_;} + const atlas::FunctionSpace & functionSpace() const {return funcSpace_;} const atlas::FieldSet & extraFields() const {return nofields_;} const atlas::Grid & grid() const {return grid_;} @@ -81,7 +81,6 @@ class Geometry : public util::Printable { atlas::grid::Partitioner partitioner_; atlas::Mesh mesh_; atlas::functionspace::NodeColumns funcSpace_; - atlas::FunctionSpace nospace_; atlas::FieldSet nofields_; }; // -----------------------------------------------------------------------------