Changeset 15006

Timestamp:

05/10/13 08:17:11 (12 years ago)

Author:

bdef

Message:

BUG: Adding a SedimentHeadOld to deal with nonlinear iterations

Location:

issm/trunk-jpl/src/c

Files:

• analyses/hydrology_core.cpp (modified) (2 diffs)
• classes/objects/Elements/Tria.cpp (modified) (6 diffs)
• modules/ModelProcessorx/HydrologyDCInefficient/UpdateElementsHydrologyDCInefficient.cpp (modified) (1 diff)
• solutionsequences/solutionsequence_hydro_nonlinear.cpp (modified) (4 diffs)

issm/trunk-jpl/src/c/analyses/hydrology_core.cpp

@@ -63 +63 @@
 
                         /*transfer water column thickness to old water column thickness: */
+                        
                         InputDuplicatex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,WatercolumnEnum,WaterColumnOldEnum);
 
@@ -78 +79 @@
 
                 else if (hydrology_model==HydrologydcEnum){
+                                InputDuplicatex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,SedimentHeadEnum,SedimentHeadOldEnum);
                         femmodel->parameters->FindParam(&isefficientlayer,HydrologydcIsefficientlayerEnum);
+                        
                         if(VerboseSolution()) _pprintLine_("   computing water head");
                         solutionsequence_hydro_nonlinear(femmodel);

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

@@ -2075 +2075 @@
                                 name==GradientEnum ||
                                 name==OldGradientEnum ||
-                 name==ConvergedEnum ||
+                                name==ConvergedEnum ||
+                                name==SedimentHeadOldEnum ||
+                                name==SedimentHeadEnum ||
                                 name==BasisIntegralEnum ||
                                 name==QmuVxEnum ||
@@ -6023 +6025 @@
                 }
         }
-
         /*Clean up and return*/
         delete gauss;
@@ -6165 +6166 @@
 
         if(reCast<bool,IssmDouble>(dt)){
-                old_wh_input=inputs->GetInput(SedimentHeadEnum); _assert_(old_wh_input);
+                old_wh_input=inputs->GetInput(SedimentHeadOldEnum); _assert_(old_wh_input);
         }
 
         /* Start  looping on the number of gaussian points: */
         gauss=new GaussTria(2);
+        
         for(int ig=gauss->begin();ig<gauss->end();ig++){
 
@@ -6190 +6192 @@
                 }
         }
-
         /*Clean up and return*/
         delete gauss;
@@ -6340 +6341 @@
         this->inputs->GetInputValue(&converged,ConvergedEnum);
         GetInputListOnVertices(&intbasis[0],BasisIntegralEnum);
-        
+
         if(converged){
                 this->parameters->FindParam(&dt,TimesteppingTimeStepEnum);
@@ -6357 +6358 @@
 
         /*Add input to the element: */
+
         this->inputs->AddInput(new TriaP1Input(SedimentHeadEnum,values));
         this->inputs->AddInput(new TriaP1Input(SedimentHeadResidualEnum,residual));
+        if(converged)this->inputs->AddInput(new TriaP1Input(SedimentHeadOldEnum,values));
 
         /*Free ressources:*/

issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCInefficient/UpdateElementsHydrologyDCInefficient.cpp

@@ -43 +43 @@
         iomodel->FetchDataToInput(elements,BasalforcingsMeltingRateEnum);
         iomodel->FetchDataToInput(elements,SedimentHeadEnum);
+        /*      iomodel->FetchDataToInput(elements,SedimentHeadOldEnum);*/
 
         /*Free data: */

issm/trunk-jpl/src/c/solutionsequences/solutionsequence_hydro_nonlinear.cpp

@@ -15 +15 @@
         Vector<IssmDouble>* uf_old=NULL; 
         Vector<IssmDouble>* ys=NULL; 
-        IssmDouble sediment_kmax;
+        IssmDouble sediment_kmax,time;
 
         /*intermediary: */
@@ -37 +37 @@
         converged=false;
 
+        femmodel->parameters->FindParam(&time,TimeEnum);
         for(;;){
-                
-                /*Computing the transfer term
-                        
-
-                 */
-
-                
-
                 /*First layer*/
                 femmodel->SetCurrentConfiguration(HydrologyDCInefficientAnalysisEnum);
@@ -53 +46 @@
                 femmodel->parameters->SetParam(HydrologySedimentEnum,HydrologyLayerEnum);
                 for(;;){
+
                         femmodel->SystemMatricesx(&Kff, &Kfs, &pf,&df, &sediment_kmax);
                         CreateNodalConstraintsx(&ys,femmodel->nodes,HydrologyDCInefficientAnalysisEnum);
@@ -75 +69 @@
                         if(converged){
                                 femmodel->parameters->SetParam(sediment_kmax,HydrologySedimentKmaxEnum);
-
                                 InputUpdateFromConstantx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,converged,ConvergedEnum);
                                 InputUpdateFromSolutionx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,ug);