Changeset 7661 for issm/trunk

Timestamp:

03/18/11 15:55:05 (14 years ago)

Author:

jschierm

Message:

KML: added creation of nodal connectivity table to KMLMeshWrite.

File:

• issm/trunk/src/mex/KMLMeshWrite/KMLMeshWrite.cpp (modified) (3 diffs)

issm/trunk/src/mex/KMLMeshWrite/KMLMeshWrite.cpp

@@ -110 +110 @@
         if (verbose) printf("Checking inputs:\n");
 
-        if (nodecon)
-                nnodes=mncon;
-        else
-                for (i=0; i<melem*nelem; i++)
-                        if (elem[i] > nnodes)
-                                nnodes=elem[i];
+        for (i=0; i<melem*nelem; i++)
+                if (elem[i] > nnodes)
+                        nnodes=elem[i];
         if (verbose) printf("  nnodes =%d\n",nnodes);
         if (part)
@@ -123 +120 @@
         if (verbose) printf("  nparts =%d\n",nparts);
 
+        if      (nodecon && (mncon != nnodes))
+                _error_("Nodal connectivity table, if supplied, must be supplied for all nodes.");
+        else if (!nodecon)
+                mncon=nnodes;
         if ((llat != nnodes) || (llng != nnodes) || (llat != llng))
                 _error_("Latitude and longitude vectors must be supplied for all nodes.");
@@ -128 +129 @@
                 _error_("Partitioning vector, if supplied, must be supplied for all nodes.");
         if (data && !((mdata == nnodes) || (mdata == melem)))
-                _error_("Data vector, if supplied, must be supplied for all nodes or all elements.");
+                _error_("Data matrix, if supplied, must be supplied for all nodes or all elements.");
         if (cmap && (ncmap != 3))
-                _error_("Colormap vector, if supplied, must have three columns for rgb.");
+                _error_("Colormap matrix, if supplied, must have three columns for rgb.");
 
         if (!strlen(filnam))