Changeset 4057 for issm/trunk/src/c/objects/Elements/Penta.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/objects/Elements/Penta.cpp (modified) (2 diffs)

issm/trunk/src/c/objects/Elements/Penta.cpp

@@ -5316 +5316 @@
 /*}}}*/
 /*FUNCTION Penta::InputConvergence(int* pconverged, double* eps, int* enums,int num_enums,int* criterionenums,double* criterionvalues,int num_criterionenums){{{1*/
-void  Penta::InputConvergence(int* pconverged,double* eps, int* enums,int num_enums,int* criterionenums,double* criterionvalues,int num_criterionenums){a
-
+void  Penta::InputConvergence(int* pconverged,double* eps, int* enums,int num_enums,int* criterionenums,double* criterionvalues,int num_criterionenums){
+
+        int     i;
         Input** new_inputs=NULL;
         Input** old_inputs=NULL;
@@ -5326 +5327 @@
         
         for(i=0;i<num_enums/2;i++){
-                new_inputs[i]=(Input*)this->inputs->GetInput(new_enums[2*i+0]);
-                old_inputs[i]=(Input*)this->inputs->GetInput(old_enums[2*i+1]);
-                if(!new_inputs[i])ISSMERROR("%s%s"," could not find input with enum ",EnumAsString(new_enums[2*i+0]));
-                if(!old_inputs[i])ISSMERROR("%s%s"," could not find input with enum ",EnumAsString(old_enums[2*i+0]));
+                new_inputs[i]=(Input*)this->inputs->GetInput(enums[2*i+0]);
+                old_inputs[i]=(Input*)this->inputs->GetInput(enums[2*i+1]);
+                if(!new_inputs[i])ISSMERROR("%s%s"," could not find input with enum ",EnumAsString(enums[2*i+0]));
+                if(!old_inputs[i])ISSMERROR("%s%s"," could not find input with enum ",EnumAsString(enums[2*i+0]));
         }
 
         /*ok, we've got the inputs (new and old), now loop throught the number of criterions and fill the eps array:*/
         for(i=0;i<num_criterionenums;i++){
-                IsInputConverged(eps+i,new_inputs,old_inputs,num_enums/2,,criterionenums[i]);
+                IsInputConverged(eps+i,new_inputs,old_inputs,num_enums/2,criterionenums[i]);
                 if(eps[i]>criterionvalues[i]) converged=0; 
         }