- moved all f2c code to math-support

 - moved nonlinearSolver interface to solver
 - fixed testsuite


git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@13758 f25d12d1-65f4-0310-ae8a-bbce733d8d8e

SimulationRuntime/c/Makefile.common

@@ -16,7 +16,6 @@ RUNTIME_HEADERS = ./f2c.h \
 ./omc_inline.h \
 ./math-support/blaswrap.h \
 ./math-support/matrix.h \
-./math-support/nonlinearSystem.h \
 ./meta/gc/common.h \
 ./meta/gc/gc.h \
 ./meta/gc/generational.h \
@@ -34,6 +33,7 @@ RUNTIME_HEADERS = ./f2c.h \
 ./simulation/simulation_runtime.h \
 ./simulation/solver/delay.h \
 ./simulation/solver/model_help.h \
+./simulation/solver/nonlinearSystem.h \
 ./simulation/solver/simulation_inline_solver.h \
 ./simulation/results/simulation_result.h \
 ./util/base_array.h \
@@ -93,10 +93,10 @@ $(UTILOBJSPATH):%.o: %.c $(UTILHFILESPATH) $(COMMON_HEADERS)
 	$(CC) -c $(CFLAGS) -o $@ $< -I$(UTILPATH) -I$(METAPATH)
 
 $(MATHOBJSPATH):%.o: %.c $(MATHHFILESPATH) $(COMMON_HEADERS)
-	$(CC) -c $(CFLAGS) -o $@ $< -I$(MATHPATH) -I$(UTILPATH)
+	$(CC) -c $(CFLAGS) $(FPMATHFORTRAN) -o $@ $< -I$(MATHPATH) -I$(UTILPATH)
 
 $(SOLVEROBJSPATH):%.o: %.c $(SOLVERHFILESPATH) $(INITIALIZATIONHFILESPATH) $(COMMON_HEADERS)
-	$(CC) -c $(CFLAGS) $(FPMATHFORTRAN) -o $@ $< -I$(SOLVERPATH) -I$(INITIALIZATIONPATH) -I$(SIMPATH) -I$(MATHPATH) -I$(UTILPATH)
+	$(CC) -c $(CFLAGS) -o $@ $< -I$(SOLVERPATH) -I$(INITIALIZATIONPATH) -I$(SIMPATH) -I$(MATHPATH) -I$(UTILPATH)
 
 $(INITIALIZATIONOBJSPATH):%.o: %.c $(SOLVERHFILESPATH) $(INITIALIZATIONHFILESPATH) $(COMMON_HEADERS)
 	$(CC) -c $(CFLAGS) -o $@ $< -I$(SOLVERPATH) -I$(INITIALIZATIONPATH) -I$(SIMPATH) -I$(MATHPATH) -I$(UTILPATH)

SimulationRuntime/c/math-support/CMakeLists.txt

@@ -3,12 +3,12 @@
 
 # Quellen und Header
 SET(math_support_sources  bigden.c biglag.c dgesv_aux.c dogleg.c dpmpar.c 
+                          daux.c ddassl.c ddasrt.c dlamch.c dlinkp.c
                           enorm.c fdjac1.c hybrd.c hybrd1.c hybrj.c lsame.c 
-						  nelmead.c newuoa.c newuob.c nonlinearSystem.c 
-						  nonlinearSolverHybrd.c qform.c  qrfac.c r1mpyq.c 
-						  r1updt.c trsapp.c update.c)
+			  nelmead.c newuoa.c newuob.c  qform.c  qrfac.c r1mpyq.c 
+                          r1updt.c trsapp.c update.c)
 
-SET(math_support_headers  blaswrap.h matrix.h nonlinearSolverHybrd.h nonlinearSystem.h) 
+SET(math_support_headers blaswrap.h matrix.h) 
 
 # Library util
 ADD_LIBRARY(math-support ${math_support_sources} ${math_support_headers})

SimulationRuntime/c/simulation/solver/CMakeLists.txt

@@ -4,22 +4,21 @@
 ADD_SUBDIRECTORY(initialization)
 
 # Quellen und Header
-SET(solver_sources  daux.c
-                    ddasrt.c
-					ddassl.c
-					dassl.c
-					delay.c
-					dlamch.c
-					dlinpk.c
-					events.c
-					model_help.c
-					solver_main.c)
+SET(solver_sources  dassl.c
+                    delay.c
+                    events.c
+                    model_help.c
+                    nonlinearSystem.c
+                    nonlinearSolverHybrd.c
+                    solver_main.c)
 
 SET(solver_headers  dassl.h
                     delay.h 
-					events.h 
-					model_help.h 
-					solver_main.h)				 
+                    events.h
+                    model_help.h 
+                    nonlinearSolverHybrd.h
+                    nonlinearSystem.h
+                    solver_main.h)				 
 
 # Library util
 ADD_LIBRARY(solver ${solver_sources} ${solver_headers})