Changeset 4880 for issm/trunk/src/c/objects/Elements/Beam.cpp

Timestamp:

07/29/10 11:26:26 (15 years ago)

Author:

Mathieu Morlighem

Message:

now input convergence returns number of elements above or below criterion

File:

• issm/trunk/src/c/objects/Elements/Beam.cpp (modified) (3 diffs)

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

@@ -407 +407 @@
 /*}}}*/
 /*FUNCTION Beam::InputConvergence{{{1*/
-void  Beam::InputConvergence(int* pconverged,double* eps, int* enums,int num_enums,int* criterionenums,double* criterionvalues,int num_criterionenums){
-
-        int     i;
+bool Beam::InputConvergence(double* eps, int* enums,int num_enums,int* criterionenums,double* criterionvalues,int num_criterionenums){
+
+        int i;
         Input** new_inputs=NULL;
         Input** old_inputs=NULL;
-        int     converged=1;
+        bool    converged=true;
 
         new_inputs=(Input**)xmalloc(num_enums/2*sizeof(Input*)); //half the enums are for the new inputs
         old_inputs=(Input**)xmalloc(num_enums/2*sizeof(Input*)); //half the enums are for the old inputs
-        
+
         for(i=0;i<num_enums/2;i++){
                 new_inputs[i]=(Input*)this->inputs->GetInput(enums[2*i+0]);
@@ -427 +427 @@
         for(i=0;i<num_criterionenums;i++){
                 IsInputConverged(eps+i,new_inputs,old_inputs,num_enums/2,criterionenums[i]);
-                if(eps[i]>criterionvalues[i]) converged=0; 
+                if(eps[i]>criterionvalues[i]) converged=false; 
         }
 
@@ -434 +434 @@
         xfree((void**)&old_inputs);
 
-        /*Assign output pointers:*/
-        *pconverged=converged;
+        /*Return output*/
+        return converged;
 
 }