Include dgesv in static source FMU external code

OpenModelica · Oct 27, 2015 · 0f589ef · 0f589ef
1 parent 7c902c1
commit 0f589ef
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 11 deletions.
diff --git a/3rdParty b/3rdParty
diff --git a/Compiler/Script/CevalScriptBackend.mo b/Compiler/Script/CevalScriptBackend.mo
@@ -2644,7 +2644,7 @@ algorithm
               "CC="+System.getCCompiler(),
               "CFLAGS="+quote+System.getCFlags()+quote,
               "CPPFLAGS=",
-              "LDFLAGS="+quote+System.getLDFlags()+" "+(if staticSourceCodeFMU then System.getRTLibsFMU() /*TODO: Should not be needed, once we remove the need for lapack/expat*/ else System.getRTLibsSim()) + quote,
+              "LDFLAGS="+quote+System.getLDFlags()+" "+(if staticSourceCodeFMU then "" else System.getRTLibsSim()) + quote,
               "FMIPLATFORM="+System.modelicaPlatform(),
               "DLLEXT="+System.getDllExt(),
               "LD="+quote+System.getLinker()+quote,

diff --git a/Compiler/Template/CodegenC.tpl b/Compiler/Template/CodegenC.tpl
@@ -1007,7 +1007,6 @@ template simulationFileHeader(SimCode simCode)
     #include "simulation/solver/nonlinearSystem.h"
     #include "simulation/solver/mixedSystem.h"
 
-    #include <assert.h>
     #include <string.h>
 
     #include "<%fileNamePrefix%>_functions.h"

diff --git a/Compiler/Template/CodegenFMU.tpl b/Compiler/Template/CodegenFMU.tpl
@@ -1006,7 +1006,7 @@ match platform
   <%\t%>$(LD) -o <%modelNamePrefix%>$(DLLEXT) $(MAINOBJ) $(OFILES) $(RUNTIMEFILES) <%dirExtra%> <%libsPos1%> <%libsPos2%> $(LDFLAGS)
   <%\t%>mkdir -p ../binaries/$(FMIPLATFORM)
   <%\t%>cp <%fileNamePrefix%>$(DLLEXT) <%fileNamePrefix%>_FMU.libs ../binaries/$(FMIPLATFORM)/
-  <%\t%>rm -f <%fileNamePrefix%>.def <%fileNamePrefix%>.o <%fileNamePrefix%>$(DLLEXT) $(OFILES) $(RUNTIMEFILES)
+  <%\t%>rm -f <%fileNamePrefix%>.def <%fileNamePrefix%>.o <%fileNamePrefix%>$(DLLEXT) $(MAINOBJ) $(OFILES) $(RUNTIMEFILES)
   <%\t%>cd .. && rm -f ../<%fileNamePrefix%>.fmu && zip -r ../<%fileNamePrefix%>.fmu *
 
   >>

diff --git a/SimulationRuntime/c/Makefile.common b/SimulationRuntime/c/Makefile.common
@@ -24,6 +24,7 @@ builddir = ../../build
 
 CDASKRDIR=$(top_builddir)/3rdParty/Cdaskr/solver/
 CMINPACKDIR=$(top_builddir)/3rdParty/CMinpack/
+LAPACKDIR=$(top_builddir)/3rdParty/dgesv/
 
 RUNTIME_HEADERS = \
 ./omc_inline.h \
@@ -252,8 +253,18 @@ sourcedist:
 
 sourcedist_internal:
 	mkdir -p $(builddir_inc)/c/external_solvers external_solvers
-	cp $(CMINPACK_OBJS:%=$(CMINPACKDIR)/%.c) "external_solvers/"
-	cp "$(CMINPACKDIR)/minpack.h" "$(CMINPACKDIR)/cminpack.h" "$(builddir_inc)/c/external_solvers"
+	cp \
+	 $(CMINPACK_OBJS:%=$(CMINPACKDIR)/%.c) \
+	 $(LAPACK_OBJS:%=$(LAPACKDIR)/lapack/%.c) \
+	 $(BLAS_OBJS:%=$(LAPACKDIR)/blas/%.c) \
+	 $(LIBF2C_OBJS:%=$(LAPACKDIR)/libf2c/%.c) \
+	 "./external_solvers/"
+	cp \
+	 "$(CMINPACKDIR)/minpack.h" "$(CMINPACKDIR)/cminpack.h" \
+	 "$(LAPACKDIR)/include/blaswrap.h" \
+	 "$(LAPACKDIR)/include/clapack.h" \
+	 "$(LAPACKDIR)/include/f2c.h" \
+	 "$(builddir_inc)/c/external_solvers"
 	cd $(builddir_inc)/c/ && mkdir -p $(ALL_PATHS)
 	(D=`pwd` && cd $(builddir_inc)/c/ $(FMI_ME_OBJS:%.o= && (OMCFILE=% && cp $$D/$$OMCFILE.c $$OMCFILE.c)))
 	cp Makefile.objs $(builddir_inc)/c/

diff --git a/SimulationRuntime/c/Makefile.objs b/SimulationRuntime/c/Makefile.objs
@@ -121,11 +121,18 @@ FMIOBJSPATH = $(FMI_OBJS:%=$(FMIPATH)%)
 
 ALL_OBJS = $(METAOBJSPATH) $(UTILOBJSPATH) $(MATHOBJSPATH) $(SOLVEROBJSPATH) $(INITIALIZATIONOBJSPATH) $(OPTIMIZATIONOBJSPATH) $(RESULTSOBJSPATH) $(SIMOBJSPATH) $(SIMOBJSPATHC) meta/meta_modelica_catch$(OBJ_EXT)
 
+# External solvers needed by FMI for ME
 CMINPACK_OBJS = enorm_ hybrj_ dpmpar_ qrfac_ qform_ dogleg_ r1updt_ r1mpyq_
+LAPACK_OBJS = dgesv dgetrf dlamch dtrtrs ilaenv ilazlr xerbla zlarfb zlarft zungbr zunglq dgetf2 dgetrs dlaswp ieeeck ilazlc iparmq zlacgv zlarf zung2r zungl2 zungqr
+BLAS_OBJS = dgemm dger dscal dswap dtrsm idamax lsame zcopy zgemm zgemv zgerc zscal ztrmm ztrmv
+LIBF2C_OBJS = d_cnjg i_len i_nint pow_di s_cmp s_copy
 # Only objects needed for FMI for Modelica Exchange
 FMI_ME_OBJS = $(UTILOBJSPATH) $(MATHOBJSPATH) $(SIMOBJSPATHC) $(SOLVEROBJSPATH) $(INITIALIZATIONOBJSPATH) \
   ./meta/meta_modelica_catch$(OBJ_EXT) \
-  $(CMINPACK_OBJS:%=./external_solvers/%$(OBJ_EXT))
+  $(CMINPACK_OBJS:%=./external_solvers/%$(OBJ_EXT)) \
+  $(LAPACK_OBJS:%=./external_solvers/%$(OBJ_EXT)) \
+  $(BLAS_OBJS:%=./external_solvers/%$(OBJ_EXT)) \
+  $(LIBF2C_OBJS:%=./external_solvers/%$(OBJ_EXT)) \
 
 ALL_HEADERS = $(METAHFILESPATH) $(UTILHFILESPATH) $(MATHHFILESPATH) $(SOLVERHFILESPATH) $(INITIALIZATIONHFILESPATH) $(OPTIMIZATIONHFILESPATH) $(RESULTSHFILESPATH) $(SIMHFILESPATH)
 ALL_PATHS = $(METAPATH) $(FMIPATH) $(UTILPATH) $(MATHPATH) $(SOLVERPATH) $(INITIALIZATIONPATH) $(OPTIMIZATIONPATH) $(RESULTSPATH) $(SIMPATH) linearization/

diff --git a/SimulationRuntime/fmi/export/fmi1/fmu1_model_interface.c b/SimulationRuntime/fmi/export/fmi1/fmu1_model_interface.c
@@ -355,9 +355,9 @@ fmiStatus fmiSetContinuousStates(fmiComponent c, const fmiReal x[], size_t nx)
     fmiValueReference vr = vrStates[i];
     if (comp->loggingOn) comp->functions.logger(c, comp->instanceName, fmiOK, "log",
         "fmiSetContinuousStates: #r%d#=%.16g", vr, x[i]);
-    assert(vr>=0 && vr<NUMBER_OF_REALS);
-    if (setReal(comp, vr, x[i]) != fmiOK) // to be implemented by the includer of this file
+    if (vr<0 || vr>=NUMBER_OF_REALS || setReal(comp, vr, x[i]) != fmiOK) { // to be implemented by the includer of this file
       return fmiError;
+    }
   }
 #endif
   return fmiOK;

diff --git a/SimulationRuntime/fmi/export/fmi2/fmu2_model_interface.c b/SimulationRuntime/fmi/export/fmi2/fmu2_model_interface.c
@@ -805,9 +805,9 @@ fmi2Status fmi2SetContinuousStates(fmi2Component c, const fmi2Real x[], size_t n
   for (i = 0; i < nx; i++) {
     fmi2ValueReference vr = vrStates[i];
     FILTERED_LOG(comp, fmi2OK, LOG_FMI2_CALL, "fmi2SetContinuousStates: #r%d# = %.16g", vr, x[i])
-    assert(vr >= 0 && vr < NUMBER_OF_REALS);
-    if (setReal(comp, vr, x[i]) != fmi2OK) // to be implemented by the includer of this file
+    if (vr < 0 || vr >= NUMBER_OF_REALS|| setReal(comp, vr, x[i]) != fmi2OK) { // to be implemented by the includer of this file
       return fmi2Error;
+    }
   }
 #endif
   comp->_need_update = 1;