Changeset 14969

Timestamp:

05/08/13 15:52:52 (12 years ago)

Author:

bdef

Message:

BUG: still working on the residual value

Location:

issm/trunk-jpl/src/c

Files:

• classes/objects/Elements/Tria.cpp (modified) (6 diffs)
• solvers/solver_hydro_nonlinear.cpp (modified) (2 diffs)

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

@@ -1914 +1914 @@
                 }
                 /*Add input to the element: */
-                this->inputs->AddInput(new TriaP1Input(BasisIntegralEnum,values));
-                
+                this->inputs->AddInput(new TriaP1Input(name,values));
                 /*Free ressources:*/
                 xDelete<int>(doflist);
+                return;
+
         default:
         
@@ -6190 +6191 @@
                 /*Loading term*/
                 water_input->GetInputValue(&water_load,gauss);
-                if(this->id==1) printf("Qin %e \n ", water_load);
                 scalar = Jdet*gauss->weight*water_load;
                 if(reCast<bool,IssmDouble>(dt)) scalar = scalar*dt;
@@ -6248 +6248 @@
                 /*Loading term*/
                 residual_input->GetInputValue(&residual_load,gauss);
-                if(this->id==1) printf("Qres %e \n ", residual_load);
                 scalar = Jdet*gauss->weight*residual_load;
                 if(reCast<bool,IssmDouble>(dt)) scalar = scalar*dt;
@@ -6354 +6353 @@
         this->inputs->GetInputValue(&converged,ConvergedEnum);
         GetInputListOnVertices(&intbasis[0],BasisIntegralEnum);
-
-        if(this->id==1) printf("val %e \n ", values[1]);
         
         if(converged){
@@ -6372 +6369 @@
                 }
                 if(this->id==1){
-                        printf("res  %e val %e h-max %e Stor %e \n ", residual[1], values[1], h_max, sediment_storing);
+                        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);
                 }
@@ -6463 +6460 @@
 
         GetDofList(&doflist,NoneApproximationEnum,GsetEnum);
+        GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES);
 
         /* Start looping on the number of gaussian points: */

issm/trunk-jpl/src/c/solvers/solver_hydro_nonlinear.cpp

@@ -33 +33 @@
         /*Recover parameters: */
         femmodel->parameters->FindParam(&isefficientlayer,HydrologydcIsefficientlayerEnum);
+        femmodel->SetCurrentConfiguration(HydrologyDCInefficientAnalysisEnum);//FIXME
+        femmodel->BasisIntegralsx();
         hydro_maxiter=100;
         count=1;
@@ -38 +40 @@
 
         for(;;){
+                
+                /*Computing the transfer term
+                        
+
+                 */
+
+                
 
                 /*First layer*/