Added StructualParam1.mo, removed print from Inst.

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

Author: Peter Aronsson

Compiler/Inst.rml

@@ -810,7 +810,6 @@ relation inst_classdef: (Env, Mod, Prefix, Connect.Sets, ClassInf.State,
 	list_append(alg,alg2) => alg' &
 	list_append(initalg,initalg2) => initalg' &
 	(*3. Instantiate components *)
-	print "ready to instantiate components\n" &
 	inst_element_list(env4, mods, pre, csets, ci_state1, compelts'', 
 			  inst_dims, impl, packimpl)
 	  => (dae1,env5, csets1, ci_state2, tys) &

Compiler/SimCodegen.rml

@@ -416,7 +416,9 @@ relation generate_ode_header: () => string =
 
   rule	Util.string_append_list(
 	[
-	 " void functionODE(/*insert stuff here*/) {"
+	 "void functionODE(double *x, double *xd, double *y, double *p, \n",
+	 "                  int nx, int ny, int np, double *time)\n",
+	 "{\n"
 	 ]) => res
 	------------------------
 	generate_ode_header() => res
@@ -432,7 +434,7 @@ relation generate_ode_footer: () => string =
 
   rule	Util.string_append_list(
 	[
-	 " void functionODE("
+	 "}"
 
 	 ]) => res
 	------------------------

Compiler/modpar/Codegen.cpp

@@ -541,11 +541,13 @@ void  Codegen::generateParallelMPIGlobals()
   m_cstreamFunc  << "extern int rank;" << endl;
   m_cstreamFunc  << "extern double x[];" << endl;
   m_cstreamFunc  << "extern double xd[];" << endl;
+  m_cstreamFunc  << "extern \"C\" {" << endl;
   m_cstreamFunc  <<  "void hybrd_(void (int, double *, double*, int)," << endl
-		 << "int, double*,double*,double,int, " << endl
-		 << "int,int,double,double*,int,double, " << endl 
-		 << "int,int*,int*,double *,double*,double*, " << endl 
-		 << "int, double*,double*,double*,double*,double*);" << endl;
+		 << "int n, double* x,double* fvec,double xtol,int maxfev, " << endl
+		 << "int ml,int mu,double epsfcn,double* diag,int mode, double factor, " << endl 
+		 << "int nprint,int* info,int* nfev,double* fjac,int ldfjac,double* r, " << endl 
+		 << "int lr, double* qtf,double* wa1,double* wa2,double* wa3,double* wa4);" << endl;
+  m_cstreamFunc << "}" << endl;
   m_cstream << "/* MPI Global variables */" << endl;
   m_cstream << "MPI_Status status;" << endl;
   m_cstream << "MPI_Request request;" << endl;