Changeset 2643

Timestamp:

02/16/09 15:10:57 (18 hours ago)

Author:

janehu

Message:

Updated to be able to update the coordinates on copy of the DB exodus file as defined in the FileOption::destination, and keep the original coordinates if the node map are not matching.

Files:

• MOAB/trunk/ReadNCDF.cpp (modified) (21 diffs)

MOAB/trunk/ReadNCDF.cpp

@@ -1927 +1927 @@
-  //currently support 'sum'
-  //destination shows where to store the updated info, currently assume it is
-
+
+
+
-  //Assumptions:
-  //Since the exodus_file will not have a node_num_map, so the strategies are following, this is expected to be very slow.
-  //1. Assume the num_el_blk's in both DB and update exodus file are the same. 
-  //2. Assume num_el_in_blk1...num_el_in_blk(num_el_blk) numbers are matching, may in 
@@ -1974 +1975 @@
-
-  std::string filename( exodus_file_name );
+
+  //3. check for destination, current only generates exodus file
+  const char* des ;
+  if(tokens.size() > 3 && !tokens[3].empty())
+    des = tokens[3].c_str();
+  else
+    des = "";
-
-  //a. Deal with DB file first: get the node_num_map. 
@@ -1997 +2005 @@
-    arrays[2] = new double[numberNodes_loading];
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  // b. read in the node_num_map and coords from the input exodus file.
-  reset();
@@ -2027 +2077 @@
-      if (0 == status) {
-        readMeshIface->report_error("ReadNCDF:: Problem getting node number map data.");
-elete [] ptr2
+o_delete(ptr1, ptr2, NULL, NULL, arrays)
-        return MB_FAILURE;
-      }
@@ -2056 +2106 @@
-        (numberDimensions_loading == 3 && (NULL == coordz || !coordz->is_valid())) ) {
-      readMeshIface->report_error("MBCN:: Problem getting coords variable.");
-deformed_arrays, 
-
-
-
-NcBool 
+&deformed_arrays, &
+
+
+
+
-    if (0 == status) {
-      readMeshIface->report_error("MBCN:: Problem getting x deformation array.");
-deformed_arrays, 
+&deformed_arrays, &
-      return MB_FAILURE;
-    }
@@ -2069 +2119 @@
-    if (0 == status) {
-      readMeshIface->report_error("MBCN:: Problem getting x deformation array.");
-deformed_arrays, 
+&deformed_arrays, &
-      return MB_FAILURE;
-    }
@@ -2075 +2125 @@
-    if (0 == status) {
-      readMeshIface->report_error("MBCN:: Problem getting y deformation array.");
-deformed_arrays, 
+&deformed_arrays, &
-      return MB_FAILURE;
-    }
@@ -2081 +2131 @@
-    if (0 == status) {
-      readMeshIface->report_error("MBCN:: Problem getting y deformation array.");
-deformed_arrays, 
+&deformed_arrays, &
-      return MB_FAILURE;
-    }
@@ -2089 +2139 @@
-      if (0 == status) {
-        readMeshIface->report_error("MBCN:: Problem getting z deformation array.");
-deformed_arrays, 
+&deformed_arrays, &
-        return MB_FAILURE;
-      }
@@ -2095 +2145 @@
-      if (0 == status) {
-        readMeshIface->report_error("MBCN:: Problem getting z deformation array.");
-deformed_arrays, 
+&deformed_arrays, &
-        return MB_FAILURE;
-      }
@@ -2109 +2159 @@
-        (numberDimensions_loading == 3 && (NULL == coord3 || !coord3->is_valid())) ) {
-      readMeshIface->report_error("MBCN:: Problem getting coords variable.");
-deformed_arrays, 
+&deformed_arrays, &
-      return MB_FAILURE;
-    }
@@ -2116 +2166 @@
-    if (0 == status) {
-      readMeshIface->report_error("MBCN:: Problem getting x coord array.");
-deformed_arrays, 
+&deformed_arrays, &
-      return MB_FAILURE;
-    }
@@ -2122 +2172 @@
-    if (0 == status) {
-      readMeshIface->report_error("MBCN:: Problem getting y coord array.");
-deformed_arrays, 
+&deformed_arrays, &
-      return MB_FAILURE;
-    }
@@ -2130 +2180 @@
-      if (0 == status) {
-        readMeshIface->report_error("MBCN:: Problem getting z coord array.");
-deformed_arrays, 
+&deformed_arrays, &
-        return MB_FAILURE;
-      }
@@ -2136 +2186 @@
-
-    //c. match node_num_map for DB and exodus file.
-numberNodes_loading
+init_numberNodes
-    {
-      NcBool found = 0;
@@ -2153 +2203 @@
-      if(!found)
-      {
-
-
-
-
-
+
+
+
+
-      for(int j = 1;j <= numberNodes_loading ; j++)
-      {
@@ -2182 +2231 @@
-    }
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    if (NULL == ncFile || !ncFile->is_valid())
-    {
-
-
+
-      return MB_FAILURE;
-    }
@@ -2194 +2257 @@
-    if (NULL == coords || !coords->is_valid()) {
-      readMeshIface->report_error("MBCN:: Problem getting coords variable.");
-
-
-
-numberNodes_loading
+do_delete(ptr1, ptr2, &deformed_arrays, &orig_coords, arrays); 
+
+
+init_numberNodes
-    if (0 == status) {
-      readMeshIface->report_error("MBCN:: Problem saving x coord array.");
-deformed_arrays, 
+&deformed_arrays, &
-      return MB_FAILURE;
-    }
@@ -2206 +2269 @@
-    if (0 == status) {
-      readMeshIface->report_error("MBCN:: Problem getting y coord array.");
-deformed_arrays, 
-
-
-
-numberNodes_loading
+&deformed_arrays, &
+
+
+
+init_numberNodes
-    if (0 == status) {
-      readMeshIface->report_error("MBCN:: Problem saving y coord array.");
-deformed_arrays, 
+&deformed_arrays, &
-      return MB_FAILURE;
-    }
@@ -2222 +2285 @@
-      if (0 == status) {
-        readMeshIface->report_error("MBCN:: Problem getting y coord array.");
-deformed_arrays, 
-
-
-
-numberNodes_loading
+&deformed_arrays, &
+
+
+
+init_numberNodes
-      if (0 == status) {
-        readMeshIface->report_error("MBCN:: Problem saving z coord array.");
-deformed_arrays, 
+&deformed_arrays, &
-        return MB_FAILURE;
-      }
@@ -2253 +2316 @@
- 
-void ReadNCDF::do_delete(int *ptr1, int *ptr2,
-
-
+*
+*
-                      std::vector<double*> arrays)
-{
-  delete ptr1;
-
+
+
-  delete [] arrays[0];
-  delete [] arrays[1];
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-  if(numberDimensions_loading == 3 )
-  { 
-    delete [] arrays[2];
-
-
+
+
+
+
-  }
-}