Changeset 4057 for issm/trunk/src/c/modules/InputConvergencex/InputConvergencex.cpp

Timestamp:

06/18/10 20:48:42 (15 years ago)

Author:

Eric.Larour

Message:

Diagnostic solution now compiles in parallel! yeehah!

File:

• issm/trunk/src/c/modules/InputConvergencex/InputConvergencex.cpp (modified) (4 diffs)

issm/trunk/src/c/modules/InputConvergencex/InputConvergencex.cpp

@@ -8 +8 @@
 #include "../../EnumDefinitions/EnumDefinitions.h"
 
-int InputConvergencex(DataSet* elements,DataSet* nodes,DataSet* vertices,DataSet* loads,DataSet* materials,Parameters* parameters,int enums, int num_enums, int criterionenums, double* criterionvalues,int num_criterionenums){
+int InputConvergencex(DataSet* elements,DataSet* nodes,DataSet* vertices,DataSet* loads,DataSet* materials,Parameters* parameters,int* enums, int num_enums, int* criterionenums, double* criterionvalues,int num_criterionenums){
 
         /*intermediary:*/
@@ -17 +17 @@
         extern int  my_rank;
         int         rank_allowed;
+        Element*    element=NULL;
+        int         verbose=0;
 
         /*First, configure our datasets: */
@@ -24 +26 @@
         parameters->Configure(elements,loads, nodes,vertices, materials,parameters);
 
+        /*retrieve parameters: */
+        parameters->FindParam(&verbose,VerboseEnum);
+        
         /*allocate dynamic memory: */
         eps=(double*)xmalloc(num_criterionenums*sizeof(double));
@@ -29 +34 @@
         /*Go through elements, and ask them to do the job: */
         for(i=0;i<elements->Size();i++){
-                Element* element=(Element*)elements->GetObjectByOffset(i);
+                element=(Element*)elements->GetObjectByOffset(i);
                 element->InputConvergence(&converged,eps,enums,num_enums,criterionenums,criterionvalues,num_criterionenums);
                 if(!converged)break;