Changeset 24313 for issm/trunk/src/c/modules/ParseToolkitsOptionsx/ParseToolkitsOptionsx.cpp

Timestamp:

11/01/19 12:01:57 (5 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 24310

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/c (modified) (1 prop)
• src/c/modules/ParseToolkitsOptionsx/ParseToolkitsOptionsx.cpp (modified) (4 diffs)

issm/trunk/src/c

@@ -5 +5 @@
 *.obj
 *.exe
+*.mod
 appscan.*
 ouncemake*
@@ -14 +15 @@
 probe.results
 stXXXX*
-*.deps
-*.dirstamp
+.deps
+.dirstamp
 .libs
 issm
@@ -21 +22 @@
 issm_slr
 issm_ocean
-lnb_param.mod
-lovenb_sub.mod
-model.mod
-util.mod
+issm_dakota

@@ -5 +5 @@
 *.obj
 *.exe
+*.mod
 appscan.*
 ouncemake*
@@ -14 +15 @@
 probe.results
 stXXXX*
-*.deps
-*.dirstamp
+.deps
+.dirstamp
 .libs
 issm
@@ -21 +22 @@
 issm_slr
 issm_ocean
-lnb_param.mod
-lovenb_sub.mod
-model.mod
-util.mod
+issm_dakota

issm/trunk/src/c/modules/ParseToolkitsOptionsx/ParseToolkitsOptionsx.cpp

@@ -22 +22 @@
         char word1[1000];
         char word2[1000];
-        int my_rank;
-        int i;
 
         /*intermediary: */
-        int         *analyses     = NULL;
-        char       **strings      = NULL;
-        char        *string       = NULL;
-        char       **toolkits     = NULL;
-        char        *toolkit      = NULL;
-        char        *newstring    = NULL;
-        char        *catstring    = NULL;
-        int          numanalyses;
-        int          stringlength,toolkitlength;
+        int   *analyses     = NULL;
+        char **strings      = NULL;
+        char  *string       = NULL;
+        char **toolkits     = NULL;
+        char  *toolkit      = NULL;
+        char  *newstring    = NULL;
+        char  *catstring    = NULL;
+        int    numanalyses;
+        int    stringlength,toolkitlength;
 
         /*Get my_rank:*/
-        my_rank=IssmComm::GetRank();
+        int my_rank=IssmComm::GetRank();
 
         if(my_rank==0){
@@ -59 +57 @@
                 strings  = xNew<char*>(numanalyses);
                 toolkits = xNew<char*>(numanalyses);
-                for(i=0;i<numanalyses;i++) strings[i]  = NULL;
-                for(i=0;i<numanalyses;i++) toolkits[i] = NULL;
+                for(int i=0;i<numanalyses;i++) strings[i]  = NULL;
+                for(int i=0;i<numanalyses;i++) toolkits[i] = NULL;
 
                 /*Go back to beginning of file:*/
@@ -119 +117 @@
         }
         ISSM_MPI_Bcast(analyses,numanalyses,ISSM_MPI_INT,0,IssmComm::GetComm());
-        for(i=0;i<numanalyses;i++){
+        for(int i=0;i<numanalyses;i++){
                 char* toolkit=toolkits[i];
                 if(my_rank==0){
@@ -147 +145 @@
 
         /*Clean up and return*/
-        for(i=0;i<numanalyses;i++) xDelete<char>(strings[i]);
-        for(i=0;i<numanalyses;i++) xDelete<char>(toolkits[i]);
+        for(int i=0;i<numanalyses;i++) xDelete<char>(strings[i]);
+        for(int i=0;i<numanalyses;i++) xDelete<char>(toolkits[i]);
         xDelete<char*>(strings);
         xDelete<char*>(toolkits);

@@ -5 +5 @@
 *.obj
 *.exe
+*.mod
 appscan.*
 ouncemake*
@@ -14 +15 @@
 probe.results
 stXXXX*
-*.deps
-*.dirstamp
+.deps
+.dirstamp
 .libs
 issm
@@ -21 +22 @@
 issm_slr
 issm_ocean
-lnb_param.mod
-lovenb_sub.mod
-model.mod
-util.mod
+issm_dakota