Changeset 21341 for issm/trunk/src/c/classes/Options/OptionUtilities.cpp

Timestamp:

11/04/16 13:48:43 (8 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 21337

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/c (modified) (1 prop)
• src/c/classes/Options/OptionUtilities.cpp (modified) (2 diffs)

issm/trunk/src/c

@@ -5 +5 @@
 *.obj
 *.exe
-issm
-kriging
 appscan.*
 ouncemake*
@@ -19 +17 @@
 *.dirstamp
 .libs
+issm
+kriging
+issm_slr

@@ -5 +5 @@
 *.obj
 *.exe
-issm
-kriging
 appscan.*
 ouncemake*
@@ -19 +17 @@
 *.dirstamp
 .libs
+issm
+kriging
+issm_slr

issm/trunk/src/c/classes/Options/OptionUtilities.cpp

@@ -51 +51 @@
         return(index);
 }/*}}}*/
+int IndexFromRowWiseDims(int* dims, int* size, int ndims) {/*{{{*/
+
+        int   i;
+        int   index=0;
+
+        /*check for any dimension too large  */
+        for (i=0; i<ndims; i++){
+                if (dims[i] >= size[i]) _error_("Dimension " << i << " of " << dims[i] << " exceeds size of " << size[i] << ".");
+        }
+
+        /*calculate the index  */
+        for (i=0; i<ndims; i++) {
+                index*=size[i];
+                index+=dims[i];
+        }
+
+        return(index);
+}/*}}}*/
 int RowWiseDimsFromIndex(int* dims, int index, int* size, int ndims) {/*{{{*/
 
@@ -69 +87 @@
         return(0);
 }/*}}}*/
-int IndexFromRowWiseDims(int* dims, int* size, int ndims) {/*{{{*/
-
-        int   i;
-        int   index=0;
-
-        /*check for any dimension too large  */
-        for (i=0; i<ndims; i++){
-                if (dims[i] >= size[i]) _error_("Dimension " << i << " of " << dims[i] << " exceeds size of " << size[i] << ".");
-        }
-
-        /*calculate the index  */
-        for (i=0; i<ndims; i++) {
-                index*=size[i];
-                index+=dims[i];
-        }
-
-        return(index);
-}/*}}}*/
 int StringFromDims(char* cstr, int* dims, int ndims) {/*{{{*/
 

@@ -5 +5 @@
 *.obj
 *.exe
-issm
-kriging
 appscan.*
 ouncemake*
@@ -19 +17 @@
 *.dirstamp
 .libs
+issm
+kriging
+issm_slr