[cppRuntime] use C- codegen as default in OMC C-Api library

Author: niklwors

OMCompiler/SimulationRuntime/cpp/Core/ReduceDAE/com/ModelicaCompiler.cpp

@@ -33,7 +33,7 @@ _model(model)
   std::cout << "Intialize OMC, use gcc" << std::endl;
 
 
-  status = InitOMC(&_omcPtr,"gcc",omhome,"");
+  status = InitOMC(&_omcPtr,"gcc",omhome);
   if(status > 0)
   {
     std::cout << "..ok" << std::endl;

OMCompiler/SimulationRuntime/cpp/omcWrapper/omcCAPI/include/OMC.h

@@ -19,13 +19,15 @@ extern "C"
     *  \param [out] omcPtr  pointer to allocated omc instance
     *  \return returns a status flag
     */
-   int OMC_DLL InitOMC(data** omcDataPtr, const char* compiler, const char* openModelicaHome, const char* zeromqOptions);
+   int OMC_DLL InitOMC(data** omcDataPtr, const char* compiler, const char* openModelicaHome);
    /**
     *  \brief returns the version of the OpenModelica compiler (omc) instance
     *  \param [in] omcPtr Pointer to omc instance
     *  \param [out] version string of omc instance
     *  \return returns a status flag
     */
+   int OMC_DLL InitOMCWithZeroMQ(data** omcDataPtr, const char* compiler,  const char* codetarget, const char* openModelicaHome, const char* zeromqOptions);	
+	
    int OMC_DLL GetOMCVersion(data* omcData, char** result);
 
    /**

OMCompiler/SimulationRuntime/cpp/omcWrapper/omcCAPI/src/OMC.cpp

@@ -38,8 +38,23 @@ extern "C" {
     // initialize garbage collector
     mmc_GC_init();
   }
+  int OMC_DLL InitOMCWithZeroMQ(data** omcDataPtr, const char* compiler, const char* codetarget,const char* openModelicaHome, const char* zeromqOptions)
+  {
+	InitOMC(omcDataPtr, compiler,openModelicaHome);
+	OMCData* omcData = *omcDataPtr;
+	std::string options = "--simCodeTarget=Cpp --target=" + std::string(compiler) + std::string(zeromqOptions);
 
-  int InitOMC(OMCData** omcDataPtr, const char* compiler, const char* openModelicaHome, const char* zeromqOptions)
+    if (SetCommandLineOptions(omcData, options.c_str()) == -1)
+    {
+        char* errorMsg = 0;
+        GetError(omcData, &errorMsg);
+      std::cout << "could not set OpenModelica options: " << options <<" "<< *errorMsg  <<std::endl;
+      return -1;
+    }
+   return 1;
+	  
+  }
+  int InitOMC(OMCData** omcDataPtr, const char* compiler, const char* openModelicaHome/*, const char* zeromqOptions*/)
   {
     // alloc omcData
     OMCData* omcData = new OMCData((threadData_t*)GC_malloc_uncollectable(sizeof(threadData_t)));
@@ -75,7 +90,7 @@ extern "C" {
     std::cout << "set OpenModelica home path " << set_openmodelica_home << result << std::endl;
      */
 
-    std::string options = "+d=execstat --simCodeTarget=Cpp --target=" + std::string(compiler) + " "+ std::string(zeromqOptions);
+    std::string options = "+d=execstat"; /* --simCodeTarget=Cpp --target=" + std::string(compiler) + " "+ std::string(zeromqOptions);*/
 
 
 

OMCompiler/SimulationRuntime/cpp/omcWrapper/omcZeroMQ/src/omc.cpp

@@ -27,7 +27,7 @@
 using std::string;
 OMCData* omc;
 
-int initOMC(OMCData** omc, string compiler, string openmodelicaHome, string zeroMQOptions);
+int initOMCWithZeroMQ(OMCData** omc, string compiler,string codetarget, string openmodelicaHome, string zeroMQOptions);
 string getVersion(OMCData* omc);
 
 // Short alias for this namespace
@@ -128,7 +128,7 @@ int main(int argc, const char* argv[])
 
 
         //intitalize omc with above options
-        status = initOMC(&omc, "msvc15", openmodelica_home_path, zeromqOptions);
+        status = initOMCWithZeroMQ(&omc, "msvc15","cpp", openmodelica_home_path, zeromqOptions);
         if (!status)
             throw std::invalid_argument("Could not iniitialize omc");
 
@@ -160,7 +160,7 @@ int main(int argc, const char* argv[])
 }
 
 
-int initOMC(OMCData** omc, string compiler, string openmodelicaHome, string zeroMQOptions)
+int initOMCWithZeroMQ(OMCData** omc, string compiler,string codetarget, string openmodelicaHome, string zeroMQOptions)
 {
 
     int status = 0;
@@ -176,7 +176,7 @@ int initOMC(OMCData** omc, string compiler, string openmodelicaHome, string zero
     char* change_dir_results = 0, * mkDirResults = 0, * version = 0, * errorMsg2 = 0, * simulateResult = 0, * clear = 0;
 
     // if you send in 1 here it will crash on Windows, i need do debug more why this happens
-    status = InitOMC(omc, compiler.c_str(), openmodelicaHome.c_str(), zeroMQOptions.c_str());
+    status = InitOMCWithZeroMQ(omc, compiler.c_str(), codetarget.c_str(),openmodelicaHome.c_str(), zeroMQOptions.c_str());
 
 
     return status;