Changeset 22844

Timestamp:

06/15/18 07:10:30 (7 years ago)

Author:

bdef

Message:

BUG: fixing toolkits to be able to run from nc models

File:

• issm/trunk-jpl/src/c/modules/ParseToolkitsOptionsx/ParseToolkitsOptionsx.cpp (modified) (5 diffs)

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

@@ -1 +1 @@
 /*!\file ParseToolkitsOptionsx
- * * \brief: parse options present in a petsc file, and create petsc options 
- * objects accordingly. This will be used to drive the behaviour of Toolkits for 
+ * * \brief: parse options present in a petsc file, and create petsc options
+ * objects accordingly. This will be used to drive the behaviour of Toolkits for
  * each analysis type.
  */
@@ -59 +59 @@
                 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(i=0;i<numanalyses;i++) strings[i]  = NULL;
+                for(i=0;i<numanalyses;i++) toolkits[i] = NULL;
 
                 /*Go back to beginning of file:*/
@@ -66 +66 @@
                 numanalyses=0;
                 while( fgets(line, sizeof line, fid)){
-
                         /*skip comments and empty lines: */
                         if ((line[0]=='%') || (line[0]=='\n') || (line[0]==' ') || (line[0]=='\t') || (line[0]=='\r'))continue;
@@ -80 +79 @@
                                 sscanf(line,"-%s %s",&word1[0],&word2[0]);
                                 if(strcmp(word1,"toolkit")!=0) _error_("toolkit option does not follow analysis");
-                                toolkit=xNew<char>((strlen(word2)+1)); 
+                                toolkit=xNew<char>((strlen(word2)+1));
                                 xMemCpy<char>(toolkit,word2,(strlen(word2)+1));
                                 toolkits[numanalyses-1]=toolkit;
@@ -88 +87 @@
                                 /*this is an option corresponding to analysis numanalyses-1. Add it to the already existing options*/
                                 if(strings[numanalyses-1]==NULL){
-                                        string=xNew<char>((strlen(line)+1)); 
+                                        string=xNew<char>((strlen(line)+1));
                                         xMemCpy<char>(string,line,(strlen(line)+1));