Add coordinate system to PointList.

esmf-org · Sep 26, 2023 · 13d8bc0 · 13d8bc0
1 parent 1b2cc3d
commit 13d8bc0
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 9 deletions.
diff --git a/src/Infrastructure/GridUtil/src/ESMCI_GridToMesh.C b/src/Infrastructure/GridUtil/src/ESMCI_GridToMesh.C
@@ -1020,6 +1020,10 @@ void CpMeshDataToArray(Grid &grid, int staggerLoc, ESMCI::Mesh &mesh, ESMCI::Arr
     int orig_coord_dim=0; // 0 indicates not to add orig coords
     if (add_orig_coords) orig_coord_dim=grid.getDimCount();
 
+    // If needed get coordsys
+    ESMC_CoordSys_Flag coordSys=ESMC_COORDSYS_UNINIT;
+    if (add_orig_coords) coordSys==grid.getCoordSys();
+
     // Loop nodes of the grid.  Here we loop all nodes, both owned and not.
     ESMCI::GridIter *gni=new ESMCI::GridIter(&grid,staggerLoc,true);
 
@@ -1061,7 +1065,7 @@ void CpMeshDataToArray(Grid &grid, int staggerLoc, ESMCI::Mesh &mesh, ESMCI::Arr
 
       // Create PointList
       // (Put Cartesian coordinates in list)
-      ESMCI::PointList *pl=new PointList(num_local_pts, grid.getCartCoordDimCount(), orig_coord_dim);
+      ESMCI::PointList *pl=new PointList(num_local_pts, grid.getCartCoordDimCount(), orig_coord_dim, coordSys);
 
       // loop through all nodes in the Grid
       for(gni->toBeg(); !gni->isDone(); gni->adv()) {
@@ -1112,7 +1116,7 @@ void CpMeshDataToArray(Grid &grid, int staggerLoc, ESMCI::Mesh &mesh, ESMCI::Arr
 
       // Create PointList
       // (Put Cartesian coordinates in list)
-      ESMCI::PointList *pl=new PointList(num_local_pts, grid.getCartCoordDimCount(), orig_coord_dim);
+      ESMCI::PointList *pl=new PointList(num_local_pts, grid.getCartCoordDimCount(), orig_coord_dim, coordSys);
 
       // loop through all nodes in the Grid
       for(gni->toBeg(); !gni->isDone(); gni->adv()) {

diff --git a/src/Infrastructure/PointList/include/ESMCI_PointList.h b/src/Infrastructure/PointList/include/ESMCI_PointList.h
@@ -37,6 +37,8 @@
 //EOPI
 //-------------------------------------------------------------------------
 
+#include "ESMCI_CoordSys.h"
+
 
 namespace ESMCI {
 
@@ -68,6 +70,7 @@ namespace ESMCI {
 
     point *points;
 
+    ESMC_CoordSys_Flag orig_coord_sys;
     int orig_coord_dim;
     point *orig_points;  // Contains original coord points. Id is repeated from above to allow sorting. In separate list to
                          // keep typical implementation as standard as possible. i
@@ -76,13 +79,16 @@ namespace ESMCI {
   public:
 
     // Construct 
-    PointList(int max_size, int coord_dim, int orig_coord_dim=0);
+    PointList(int max_size, int coord_dim, int orig_coord_dim=0,ESMC_CoordSys_Flag orig_coord_sys=ESMC_COORDSYS_UNINIT);
 
     // Destruct
     ~PointList();
 
     // Detect original coords
     bool hasOrigCoords() const {return (orig_points != NULL);}
+
+    // Get coordinate system of original points
+    ESMC_CoordSys_Flag get_orig_coord_sys() const {return orig_coord_sys;}
 
     // Add Point to List
     int add(int _id, const double *_coord);

diff --git a/src/Infrastructure/PointList/src/ESMCI_PointList.C b/src/Infrastructure/PointList/src/ESMCI_PointList.C
@@ -72,8 +72,10 @@ namespace ESMCI {
   // !ARGUMENTS:
                    int _max_num_pts,
                    int _coord_dim,
-                   int _orig_coord_dim // If 0, no original coords allocated
-                                       // Defaults to 0.
+                   int _orig_coord_dim, // If 0, no original coords allocated
+                                        // Defaults to 0.
+                   ESMC_CoordSys_Flag _orig_coord_sys // coordinate system of original
+                                                     // coords, defaults to uninit
                    ){
     //
     // !DESCRIPTION:
@@ -85,7 +87,8 @@ namespace ESMCI {
     orig_coord_dim=_orig_coord_dim;
     max_num_pts=_max_num_pts;
     curr_num_pts=0;
-
+    orig_coord_sys=_orig_coord_sys;
+
     // Allocate point memory
     points = NULL;
     if (max_num_pts>=0) {
@@ -99,9 +102,6 @@ namespace ESMCI {
     }
   }
 
-
-  // STOPPED HERE ///
-
 #undef  ESMC_METHOD
 #define ESMC_METHOD "ESMCI::~PointList()"
   //BOPI