Changeset 24011

Timestamp:

06/12/19 07:55:52 (6 years ago)

Author:

Mathieu Morlighem

Message:

CHG: trying to fix Winnie's bug (Toolkits symbol not found)

Location:

issm/trunk-jpl/src

Files:

• c/toolkits/ToolkitOptions.cpp (modified) (2 diffs)
• c/toolkits/ToolkitOptions.h (modified) (1 diff)
• wrappers/BamgMesher/BamgMesher.h (modified) (1 diff)
• wrappers/matlab/include/wrapper_macros.h (modified) (1 diff)

issm/trunk-jpl/src/c/toolkits/ToolkitOptions.cpp

@@ -23 +23 @@
         sprintf(toolkitoptions,"%s",options);
 }/*}}}*/
+void  ToolkitOptions::Init(){ /*{{{*/
+        toolkittype    = NULL;
+        toolkitoptions = NULL;
+}/*}}}*/
 char* ToolkitOptions::GetToolkitType(){  /*{{{*/
 
-        _assert_(toolkittype); 
+        if(toolkittype==NULL) _error_("toolkittype not set (may be a mex?)");
         char* toolkittype_out = xNew<char>(strlen(toolkittype)+1); 
         sprintf(toolkittype_out,"%s",toolkittype);
@@ -45 +49 @@
 
         /*First, because tokenizing destroys a string, copy what we have: */
-        _assert_(tokenlist);
+        if(tokenlist==NULL) _error_("tokenlist not set (may be a mex?)");
         tokenlistcopy= xNew<char>(strlen(tokenlist)+1); 
         sprintf(tokenlistcopy,"%s",tokenlist);

issm/trunk-jpl/src/c/toolkits/ToolkitOptions.h

@@ -15 +15 @@
 
         public:
-                static void Init(const char* type_in,const char* options);
+                static void  Init(const char* type_in,const char* options);
+                static void  Init(void);
                 static char* GetToolkitType(void);
                 static char* GetToolkitOptionValue(const char* option);

issm/trunk-jpl/src/wrappers/BamgMesher/BamgMesher.h

@@ -17 +17 @@
 #endif
 
-#include "../bindings.h"
 #include "../../c/main/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/shared/shared.h"
+#include "../bindings.h"
 
 #undef __FUNCT__ 

issm/trunk-jpl/src/wrappers/matlab/include/wrapper_macros.h

@@ -19 +19 @@
  * will be trapped*/
 #define MODULEBOOT(); try{ \
-        IssmComm::SetComm();
+        IssmComm::SetComm(); \
+        ToolkitOptions::Init();
 
 #define MODULEEND(); }\