Changeset 14970

Timestamp:

05/08/13 16:14:43 (12 years ago)

Author:

bdef

Message:

BUG: Residual computation is now OK

File:

• issm/trunk-jpl/src/c/classes/objects/Elements/Tria.cpp (modified) (4 diffs)

issm/trunk-jpl/src/c/classes/objects/Elements/Tria.cpp

@@ -6251 +6251 @@
                 if(reCast<bool,IssmDouble>(dt)) scalar = scalar*dt;
                 for(int i=0;i<numdof;i++) pe->values[i]+=scalar*basis[i];
-
+                
                 /*Transient term*/
                 if(reCast<bool,IssmDouble>(dt)){
@@ -6336 +6336 @@
         IssmDouble  residual[numdof];
         IssmDouble  intbasis[numdof];   
-        IssmDouble  sediment_storing;
         IssmDouble  penalty_factor, dt;
         IssmDouble  kmax, kappa, h_max;
@@ -6358 +6357 @@
                 this->parameters->FindParam(&kmax,HydrologySedimentKmaxEnum);
                 this->parameters->FindParam(&penalty_factor,HydrologydcPenaltyFactorEnum);
-                sediment_storing=matpar->GetSedimentStoring();
                 kappa=kmax*pow(10.,penalty_factor);
                 
@@ -6364 +6362 @@
                         this->GetHydrologyDCInefficientHmax(&h_max,nodes[i]);
                         if(values[i]>h_max)
-                                residual[i]=kappa*(values[i]-h_max)*sediment_storing/(dt*intbasis[i]);
+                                residual[i]=kappa*(values[i]-h_max)/(dt*intbasis[i]);
                         else
                                 residual[i]=0.0;
-                }
-                if(this->id==1){
-                        printf("res  %e val %e h-max %e Stor %e intbasis %e\n ", residual[1], values[1], h_max, sediment_storing, intbasis[1]);
-                        printf("kappa %e kmax %e pen %e dt %e \n", kappa, kmax,penalty_factor,dt);
                 }
         }