Changeset 6207

Timestamp:

10/08/10 14:36:04 (14 years ago)

Author:

Eric.Larour

Message:

Fixed major bug: penalty_lock not being initialized correctly.

File:

• issm/trunk/src/c/objects/Loads/Riftfront.cpp (modified) (6 diffs)

issm/trunk/src/c/objects/Loads/Riftfront.cpp

@@ -48 +48 @@
         int    riftfront_matpar_id;
         int    riftfront_type;
-        double riftfront_fill;
+        int    riftfront_fill;
         double riftfront_friction;
         double riftfront_fractionincrement;
@@ -85 +85 @@
         this->counter=0;
         this->prestable=0;
-        this->penalty_lock=0;
+        this->penalty_lock=iomodel->penalty_lock;
         this->material_converged=0;
         this->normal[0]=*(iomodel->riftinfo+RIFTINFOSIZE*i+4);
@@ -102 +102 @@
 
         this->inputs->AddInput(new IntInput(TypeEnum,riftfront_type));
-        this->inputs->AddInput(new DoubleInput(FillEnum,riftfront_fill));
+        this->inputs->AddInput(new IntInput(FillEnum,riftfront_fill));
         this->inputs->AddInput(new DoubleInput(FrictionEnum,riftfront_friction));
         this->inputs->AddInput(new DoubleInput(FractionIncrementEnum,riftfront_fractionincrement));
@@ -129 +129 @@
 /*FUNCTION Riftfront::Echo {{{1*/
 void Riftfront::Echo(void){
+
+        Input* input=NULL;
+        int fill;
+        double friction,fractionincrement;
+
+        
+        /*recover some inputs first: */
+        input=(Input*)this->inputs->GetInput(FillEnum); input->GetParameterValue(&fill);
+        input=(Input*)this->inputs->GetInput(FrictionEnum); input->GetParameterValue(&friction);
+        input=(Input*)this->inputs->GetInput(FractionIncrementEnum); input->GetParameterValue(&fractionincrement);
+
         printf("Riftfront:\n");
         printf("   id: %i\n",id);
@@ -137 +148 @@
         printf("   parameters: %p\n",parameters);
         printf("   inputs: %p\n",inputs);
-        
         printf("   internal parameters: \n");
-        printf("      penalty_lock: %i\n",penalty_lock);
-        printf("      active: %s\n",active ? "true":"false");
-        printf("      frosen: %s\n",frozen ? "true":"false");
-        printf("      counter: %i\n",counter);
-        printf("      prestable: %s\n",prestable ? "true":"false");
-        printf("      material_converged: %s\n",material_converged ? "true":"false");
-        printf("      normal: %g|%g\n",normal[0],normal[1]);
-        printf("      length: %g\n",length);
-        printf("      fraction: %g\n",fraction);
+        printf("   normal: %g|%g\n",normal[0],normal[1]);
+        printf("   length: %g\n",length);
+        printf("   penalty_lock: %i\n",penalty_lock);
+        printf("   active: %s\n",active ? "true":"false");
+        printf("   counter: %i\n",counter);
+        printf("   prestable: %s\n",prestable ? "true":"false");
+        printf("   material_converged: %s\n",material_converged ? "true":"false");
+        printf("   fill: %i\n",fill);
+        printf("   friction: %i\n",friction);
+        printf("   fraction: %i\n",fraction);
+        printf("   fractionincrement: %i\n",fractionincrement);
+        printf("   frozen: %s\n",frozen ? "true":"false");
                 
 }
@@ -576 +589 @@
         double      pressure_melange;
         double      pressure_water;
-        double      fill;
+        int         fill;
         bool        shelf;