Changeset 4058

Timestamp:

06/19/10 16:31:11 (15 years ago)

Author:

Eric.Larour

Message:

All parallel solutions now compile

Location:

issm/trunk/src/c

Files:

• modules/Qmux/SpawnCoreSerial.cpp (modified) (2 diffs)
• solutions/balancedthickness.cpp (modified) (2 diffs)
• solutions/balancedthickness2.cpp (modified) (2 diffs)
• solutions/balancedvelocities.cpp (modified) (3 diffs)
• solutions/prognostic2.cpp (modified) (2 diffs)
• solutions/steadystate.cpp (modified) (1 diff)
• solutions/thermal.cpp (modified) (1 diff)
• solutions/transient2d.cpp (modified) (3 diffs)
• solutions/transient3d.cpp (modified) (3 diffs)

issm/trunk/src/c/modules/Qmux/SpawnCoreSerial.cpp

@@ -19 +19 @@
 #include "../../include/include.h"
 
-void SpawnCoreSerial(double* responses, int numresponses, double* variables, char** variables_descriptors,int numvariables, mxArray* modelint counter){
+void SpawnCoreSerial(double* responses, int numresponses, double* variables, char** variables_descriptors,int numvariables, mxArray* femmodel, int counter){
 
         int i;
@@ -52 +52 @@
 
         //call SpwanCore matlab routine.
-        array[0]=model;
+        array[0]=femmodel;
         array[2]=mxvariables;
         array[3]=mxvariabledescriptors;

issm/trunk/src/c/solutions/balancedthickness.cpp

@@ -66 +66 @@
 
         /*add outputfilename in parameters: */
-        femmodel->parameters->AddObject(new StringParam(OutputFileNameEnum,outputfilename);
+        femmodel->parameters->AddObject(new StringParam(OutputFileNameEnum,outputfilename));
         
         /*get parameters: */
         femmodel->parameters->FindParam(&qmu_analysis,QmuAnalysisEnum);
-        femmodel->parameters->FindParam(&control_analysis,ControlAnalysisEnum);
         femmodel->parameters->FindParam(&waitonlock,WaitOnLockEnum);
 
@@ -81 +80 @@
                 _printf_("call computational core:\n");
                 MPI_Barrier(MPI_COMM_WORLD); start_core=MPI_Wtime( );
-                balancedthickness_core(model);
+                balancedthickness_core(femmodel);
                 MPI_Barrier(MPI_COMM_WORLD); finish_core=MPI_Wtime( );
 
                 _printf_("write results to disk:\n");
-                OutputResults(femmodel->elements, femmodel->loads, femmodel->nodes, femmodel->vertices, femmodel->materials, femmodel->parameters, outputfilename);
-        }
-
+                OutputResults(femmodel->elements, femmodel->loads, femmodel->nodes, femmodel->vertices, femmodel->materials, femmodel->parameters);
         }
         else{

issm/trunk/src/c/solutions/balancedthickness2.cpp

@@ -68 +68 @@
 
         /*add outputfilename in parameters: */
-        femmodel->parameters->AddObject(new StringParam(OutputFileNameEnum,outputfilename);
+        femmodel->parameters->AddObject(new StringParam(OutputFileNameEnum,outputfilename));
 
         MPI_Barrier(MPI_COMM_WORLD); finish_init=MPI_Wtime();
@@ -82 +82 @@
 
                 _printf_("write results to disk:\n");
-                OutputResults(femmodel->elements, femmodel->loads, femmodel->nodes, femmodel->vertices, femmodel->materials, femmodel->parameters, outputfilename);
+                OutputResults(femmodel->elements, femmodel->loads, femmodel->nodes, femmodel->vertices, femmodel->materials, femmodel->parameters);
 
         }

issm/trunk/src/c/solutions/balancedvelocities.cpp

@@ -22 +22 @@
         FILE* fid=NULL;
         char* inputfilename=NULL;
-        char* outputfilename=NULL;
         bool   qmu_analysis;
         char* lockname=NULL;
+        char* outputfilename=NULL;
         bool  waitonlock=false;
 
@@ -67 +67 @@
 
         /*add outputfilename in parameters: */
-        femmodel->parameters->AddObject(new StringParam(OutputFileNameEnum,outputfilename);
+        femmodel->parameters->AddObject(new StringParam(OutputFileNameEnum,outputfilename));
         
         /*get parameters: */
         femmodel->parameters->FindParam(&qmu_analysis,QmuAnalysisEnum);
-        femmodel->parameters->FindParam(&control_analysis,ControlAnalysisEnum);
         femmodel->parameters->FindParam(&waitonlock,WaitOnLockEnum);
 
@@ -86 +85 @@
 
                 _printf_("write results to disk:\n");
-                OutputResults(femmodel->elements, femmodel->loads, femmodel->nodes, femmodel->vertices, femmodel->materials, femmodel->parameters, outputfilename);
+                OutputResults(femmodel->elements, femmodel->loads, femmodel->nodes, femmodel->vertices, femmodel->materials, femmodel->parameters);
 
         }

issm/trunk/src/c/solutions/prognostic2.cpp

@@ -36 +36 @@
 
         int analyses[1]={Prognostic2AnalysisEnum};
-        int solution_type=Prognosti2cAnalysisEnum;
+        int solution_type=Prognostic2AnalysisEnum;
 
         MODULEBOOT();
@@ -69 +69 @@
         femmodel->parameters->AddObject(new StringParam(OutputFileNameEnum,outputfilename));
 
-        /*recover parameters: */
-        model->FindParam(&waitonlock,WaitOnLockEnum);
-        model->FindParam(&qmu_analysis,QmuAnalysisEnum);
-
+        /*get parameters: */
+        femmodel->parameters->FindParam(&qmu_analysis,QmuAnalysisEnum);
+        femmodel->parameters->FindParam(&waitonlock,WaitOnLockEnum);
 
         MPI_Barrier(MPI_COMM_WORLD); finish_init=MPI_Wtime();

issm/trunk/src/c/solutions/steadystate.cpp

@@ -73 +73 @@
         femmodel->parameters->AddObject(new StringParam(OutputFileNameEnum,outputfilename));
 
-        /*recover parameters: */
-        model->FindParam(&waitonlock,WaitOnLockEnum);
-        model->FindParam(&control_analysis,ControlAnalysisEnum);
-        model->FindParam(&qmu_analysis,QmuAnalysisEnum);
+        /*get parameters: */
+        femmodel->parameters->FindParam(&qmu_analysis,QmuAnalysisEnum);
+        femmodel->parameters->FindParam(&control_analysis,ControlAnalysisEnum);
+        femmodel->parameters->FindParam(&waitonlock,WaitOnLockEnum);
 
         MPI_Barrier(MPI_COMM_WORLD); finish_init=MPI_Wtime();

issm/trunk/src/c/solutions/thermal.cpp

@@ -38 +38 @@
 
         int analyses[2]={ThermalAnalysisEnum,MeltingAnalysisEnum};
-        int solution_type=ThermalSolutionEnum;
+        int solution_type=ThermalAnalysisEnum;
 
         MODULEBOOT();

issm/trunk/src/c/solutions/transient2d.cpp

@@ -36 +36 @@
 
         int analyses[2]={DiagnosticHorizAnalysisEnum,PrognosticAnalysisEnum};
-        int solution_type=TransientAnalysisEnum;
+        int solution_type=Transient2DAnalysisEnum;
 
         MODULEBOOT();
@@ -68 +68 @@
         /*get parameters: */
         femmodel->parameters->FindParam(&qmu_analysis,QmuAnalysisEnum);
-        femmodel->parameters->FindParam(&control_analysis,ControlAnalysisEnum);
         femmodel->parameters->FindParam(&waitonlock,WaitOnLockEnum);
 
@@ -79 +78 @@
                 _printf_("call computational core:\n");
                 MPI_Barrier(MPI_COMM_WORLD); start_core=MPI_Wtime( );
-                transient2d_core(model);
+                transient2d_core(femmodel);
                 MPI_Barrier(MPI_COMM_WORLD); finish_core=MPI_Wtime( );
         

issm/trunk/src/c/solutions/transient3d.cpp

@@ -36 +36 @@
 
         int analyses[8]={DiagnosticHorizAnalysisEnum,DiagnosticVertAnalysisEnum,DiagnosticStokesAnalysisEnum,DiagnosticHutterAnalysisEnum,SlopeAnalysisEnum,PrognosticAnalysisEnum,ThermalAnalysisEnum,MeltingAnalysisEnum};
-        int solution_type=TransientAnalysisEnum;
+        int solution_type=Transient3DAnalysisEnum;
 
         MODULEBOOT();
@@ -68 +68 @@
         /*get parameters: */
         femmodel->parameters->FindParam(&qmu_analysis,QmuAnalysisEnum);
-        femmodel->parameters->FindParam(&control_analysis,ControlAnalysisEnum);
         femmodel->parameters->FindParam(&waitonlock,WaitOnLockEnum);
 
@@ -79 +78 @@
                 _printf_("call computational core:\n");
                 MPI_Barrier(MPI_COMM_WORLD); start_core=MPI_Wtime( );
-                transient3d_core(model);
+                transient3d_core(femmodel);
                 MPI_Barrier(MPI_COMM_WORLD); finish_core=MPI_Wtime( );