Changeset 1172 for XIOS/dev/branch_yushan_merged/extern/remap/src/elt.hpp

Timestamp:

06/15/17 19:32:13 (7 years ago)

Author:

yushan

Message:

save dev. need to unify the file type when using EP

File:

• XIOS/dev/branch_yushan_merged/extern/remap/src/elt.hpp (modified) (2 diffs)

XIOS/dev/branch_yushan_merged/extern/remap/src/elt.hpp

@@ -53 +53 @@
 struct Elt : Polyg
 {
-        Elt() {}
-        Elt(const double *bounds_lon, const double *bounds_lat, int max_num_vert)
-        {
-                int k = 0;
-                vertex[k++] = xyz(bounds_lon[0], bounds_lat[0]);
-                for (int i = 1; i < max_num_vert; i++)
-                {
-                        vertex[k] = xyz(bounds_lon[i], bounds_lat[i]);
-                        /* netCDF convention: if first vertex repeats element is finished (at least three vertices == triagle) */
-                        if (k >= 3 && squaredist(vertex[k], vertex[0]) < EPS*EPS) 
-                                break;
-                        /* eliminate zero edges: move to next vertex only if it is different */
-                        if (squaredist(vertex[k], vertex[k-1]) > EPS*EPS)
-                                k++;
-                        else
-                                /* cout << "Removed edge " << k << " due to zero length (coinciding endpoints)." << endl */ ;
-                }
-                n = k;
-                x = barycentre(vertex, n);
-        }
+  Elt() {}
+  Elt(const double *bounds_lon, const double *bounds_lat, int max_num_vert)
+  {
+    int k = 0;
+    vertex[k++] = xyz(bounds_lon[0], bounds_lat[0]);
+    for (int i = 1; i < max_num_vert; i++)
+    {
+      vertex[k] = xyz(bounds_lon[i], bounds_lat[i]);
+      /* netCDF convention: if first vertex repeats element is finished (at least three vertices == triagle) */
+      if (k >= 3 && squaredist(vertex[k], vertex[0]) < EPS*EPS) 
+        break;
+      /* eliminate zero edges: move to next vertex only if it is different */
+      if (squaredist(vertex[k], vertex[k-1]) > EPS*EPS)
+        k++;
+      //else cout << "Removed edge " << k << " due to zero length (coinciding endpoints)." << endl ;
+    }
+    n = k;
+    x = barycentre(vertex, n);
+  }
 
         Elt& operator=(const Elt& rhs)
@@ -96 +95 @@
         }
 
-        void delete_intersections()
-        {
-                for (list<Polyg*>::iterator it = this->is.begin(); it != this->is.end(); it++)
-                {
-                        Polyg* poly = *it;
-                        delete poly;
-                }
-        }
+  void delete_intersections()
+  {
+    for (list<Polyg*>::iterator it = this->is.begin(); it != this->is.end(); it++)
+    {
+      Polyg* poly = *it;
+      delete poly;
+    }
+  }
 
   void insert_vertex(int i, const Coord& v)