Changeset 2515

Timestamp:

06/09/23 16:51:02 (13 months ago)

Author:

jderouillat

Message:

Modified default fill values in UGRID (From A. Stirnemann)

Location:

XIOS2/trunk/src

Files:

• io/nc4_data_output.cpp (modified) (4 diffs)
• node/mesh.cpp (modified) (10 diffs)
• node/mesh_values.hpp (added)

XIOS2/trunk/src/io/nc4_data_output.cpp

@@ -12 +12 @@
 #include "timer.hpp"
 #include "uuid.hpp"
+#include "mesh_values.hpp"
 namespace xios
 {
@@ -741 +742 @@
               SuperClassWriter::addAttribute("long_name", StdString("Maps every face to its edges."), &face_edges);
               SuperClassWriter::addAttribute("start_index", 0, &face_edges);
-              SuperClassWriter::addAttribute("_FillValue", 999999, &face_edges);
+              SuperClassWriter::addAttribute("_FillValue", fill_value_face_edges(), &face_edges);
               dim0.clear();
               dim0.push_back(dimEdge);
@@ -749 +750 @@
               SuperClassWriter::addAttribute("long_name", StdString("neighbor faces for edges"), &edge_faces);
               SuperClassWriter::addAttribute("start_index", 0, &edge_faces);
-              SuperClassWriter::addAttribute("_FillValue", -999, &edge_faces);
+              SuperClassWriter::addAttribute("_FillValue", fill_value_edge_faces(), &edge_faces);
               SuperClassWriter::addAttribute("comment", StdString("missing neighbor faces are indicated using _FillValue"), &edge_faces);
               dim0.clear();
@@ -758 +759 @@
               SuperClassWriter::addAttribute("long_name", StdString("Indicates which other faces neighbor each face"), &face_faces);
               SuperClassWriter::addAttribute("start_index", 0, &face_faces);
-              SuperClassWriter::addAttribute("_FillValue", 999999, &face_faces);
+              SuperClassWriter::addAttribute("_FillValue", fill_value_face_faces(), &face_faces);
               SuperClassWriter::addAttribute("flag_values", -1, &face_faces);
               SuperClassWriter::addAttribute("flag_meanings", StdString("out_of_mesh"), &face_faces);

XIOS2/trunk/src/node/mesh.cpp

@@ -6 +6 @@
 
 #include "mesh.hpp"
+#include "mesh_values.hpp"
 #include <boost/functional/hash.hpp>
 //#include <unordered_map>
@@ -816 +817 @@
             else
             {
-              face_edges(nv1,nf) = 999999;
+              face_edges(nv1,nf) = fill_value_face_edges();
             }
           }
@@ -895 +896 @@
           else
           {
-            edge_faces(1, indexGlo - edge_start) = -999;
+            edge_faces(1, indexGlo - edge_start) = fill_value_edge_faces();
           }
         }
@@ -943 +944 @@
                 if (itFace1->second.size() == 1)
                 {
-                  face_faces(nv1, nf) = 999999;
+                  face_faces(nv1, nf) = fill_value_face_faces();
                 }
                 else
@@ -961 +962 @@
             else
             {
-              face_faces(nv1, nf) = 999999;
+              face_faces(nv1, nf) = fill_value_face_faces();
             }
           }
@@ -1183 +1184 @@
             else
             {
-              face_edges(nv1,nf) = 999999;
+              face_edges(nv1,nf) = fill_value_face_edges();
             }
           }
@@ -1234 +1235 @@
               {
                 edge_faces(0, edgeIdxGlo - edge_start) = face1;
-                edge_faces(1, edgeIdxGlo - edge_start) = -999;
-                face_faces(nv1, nf) = 999999;
+                edge_faces(1, edgeIdxGlo - edge_start) = fill_value_edge_faces();
+                face_faces(nv1, nf) = fill_value_face_faces();
               }
               else
@@ -1563 +1564 @@
             else
             {
-              face_edges(nv1,nf) = 999999;
+              face_edges(nv1,nf) = fill_value_face_edges();
             }
           }
@@ -1607 +1608 @@
                 {
                   edge_faces(0, edgeIdxGlo - edge_start) = face1;
-                  edge_faces(1, edgeIdxGlo - edge_start) = -999;
-                  face_faces(nv1, nf) = 999999;
+                  edge_faces(1, edgeIdxGlo - edge_start) = fill_value_edge_faces();
+                  face_faces(nv1, nf) = fill_value_face_faces();
                 }
                 else
@@ -1627 +1628 @@
             } // myNodeIdx1 != myNodeIdx2
             else
-              face_faces(nv1, nf) = 999999;
+              face_faces(nv1, nf) = fill_value_face_faces();
           }
         }