Changeset 22558 for issm/trunk-jpl/src/c/toolkits/objects/Vector.h

Timestamp:

03/18/18 14:28:54 (7 years ago)

Author:

Mathieu Morlighem

Message:

CHG: better handling of toolkits, now remove option toolkit from options so that mkl does not get confused

File:

• issm/trunk-jpl/src/c/toolkits/objects/Vector.h (modified) (3 diffs)

issm/trunk-jpl/src/c/toolkits/objects/Vector.h

@@ -98 +98 @@
                 void InitCheckAndSetType(void){ /*{{{*/
 
-                        char* toolkittype=NULL;
-
                         #ifdef _HAVE_PETSC_
                         pvector=NULL;
@@ -106 +104 @@
 
                         /*retrieve toolkittype: */
-                        toolkittype=ToolkitOptions::GetToolkitType();
+                        char* toolkittype=ToolkitOptions::GetToolkitType();
+                        _assert_(toolkittype); 
 
                         /*set vector type: */
-                        if (strcmp(toolkittype,"petsc")==0){
+                        if(strcmp(toolkittype,"petsc")==0){
                                 #ifdef _HAVE_PETSC_
                                 type=PetscVecType; 
@@ -120 +119 @@
                                 type=IssmVecType;
                         }
-                        else _error_("unknow toolkit type ");
+                        else{
+                                _error_("unknow toolkit type ");
+                        }
 
                         /*Free ressources: */