Changeset 1814

Timestamp:

08/24/09 17:42:21 (16 years ago)

Author:

Eric.Larour

Message:

Brachning back from issm.controlstatic, by hand

File:

• issm/trunk/src/c/parallel/parallel.h (modified) (2 diffs)

issm/trunk/src/c/parallel/parallel.h

@@ -11 +11 @@
 Vec GradJCompute(ParameterInputs* inputs,FemModel* femmodel);
 
-void diagnostic_core(DataSet* results,FemModel* fems, ParameterInputs* inputs);
-void prognostic_core(DataSet* results,FemModel* fems, ParameterInputs* inputs);
-void control_core(DataSet* results,FemModel* fems, ParameterInputs* inputs);
+void diagnostic_core(DataSet* results,Model* model, ParameterInputs* inputs);
+void prognostic_core(DataSet* results,Model* model, ParameterInputs* inputs);
+void control_core(DataSet* results,Model* model, ParameterInputs* inputs);
 
-void thermal_core(DataSet* results,FemModel* fems, ParameterInputs* inputs);
+void thermal_core(DataSet* results,Model* model, ParameterInputs* inputs);
 void thermal_core_nonlinear(Vec* ptg,double* pmelting_offset,FemModel* fem,ParameterInputs* inputs,int analysis_type,int sub_analysis_type);
 
-void thermalstatic_core(DataSet* results,FemModel* fems, ParameterInputs* inputs);
+void thermalstatic_core(DataSet* results,Model* model, ParameterInputs* inputs);
 
-void diagnostic_core_nonlinear(Vec* pug,Mat* pK_ff0,Mat* pK_fs0, DataSet* input_loads, FemModel* fem,ParameterInputs* inputs,int analysis_type,int sub_analysis_type);
+void diagnostic_core_nonlinear(Vec* pug,Mat* pK_ff0,Mat* pK_fs0, FemModel* fem,ParameterInputs* inputs,int analysis_type,int sub_analysis_type);
 void diagnostic_core_linear(Vec* ppg,FemModel* fem,ParameterInputs* inputs,int  analysis_type,int sub_analysis_type);
 void convergence(int* pconverged, Mat K_ff,Vec p_f,Vec u_f,Vec u_f_old,DataSet* parameters);
 
-void transient_core(DataSet* results,FemModel* fems, ParameterInputs* inputs);
-void transient_core_2d(DataSet* results,FemModel* fems, ParameterInputs* inputs);
-void transient_core_3d(DataSet* results,FemModel* fems, ParameterInputs* inputs);
+void transient_core(DataSet* results,Model* model, ParameterInputs* inputs);
+void transient_core_2d(DataSet* results,Model* model, ParameterInputs* inputs);
+void transient_core_3d(DataSet* results,Model* model, ParameterInputs* inputs);
 
 //int GradJOrth(WorkspaceParams* workspaceparams);
@@ -43 +43 @@
 void WriteLockFile(char* filename);
 
-void ControlInitialization(FemModel** pmodel, FemModel* fems, ParameterInputs* inputs);
-void ControlTemporaryResults(FemModel* fems,double* param_g,double* J,int n,ParameterInputs* inputs);
+void ControlInitialization(Model* model, ParameterInputs* inputs);
+void ControlTemporaryResults(Model* model,double* param_g,double* J,int n,ParameterInputs* inputs);
 
 void CreateFemModel(FemModel* femmodel,ConstDataHandle MODEL,int analysis_type,int sub_analysis_type);
 //int BatchDebug(Mat* Kgg,Vec* pg,FemModel* femmodel,char* filename);
-void ProcessResults(DataSet** presults,FemModel* fems,int analysis_type);
+void ProcessResults(DataSet** presults,Model* model,int analysis_type);
 
 #endif