Changeset 15276

Timestamp:

06/17/13 16:23:06 (12 years ago)

Author:

bdef

Message:

CHG: So far the last working version of the hydrological Code (Still some differencies with ELmer/Ice results)

Location:

issm/trunk-jpl/src/c

Files:

• classes/Elements/Tria.cpp (modified) (3 diffs)
• solutionsequences/solutionsequence_hydro_nonlinear.cpp (modified) (3 diffs)

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

@@ -6526 +6526 @@
                         GetInputListOnVertices(&sed_head[0],SedimentHeadEnum); 
                         GetInputListOnVertices(&epl_head[0],EplHeadEnum);
-
+                        
                         this->parameters->FindParam(&leakage,HydrologydcLeakageFactorEnum);
 
@@ -6534 +6534 @@
                         for(int i=0;i<numdof;i++){
                                 if(activeEpl[i]==0.0)continue;
-
+                                
                                 eplstoring[i]=matpar->GetEplStoring();          
                                 sedstoring[i]=matpar->GetSedimentStoring();
-
+                                
                                 if(sed_head[i]>epl_head[i]){
                                         wh_trans=sed_trans*sedstoring[i]*(epl_head[i]-sed_head[i])/(leakage*sed_thick);                         
@@ -6547 +6547 @@
                                                 wh_trans=0.0;
                                         }
-                                        //                                      if((sed_head[i]+(wh_trans/sedstoring[i]))>h_max){
-                                        //(h_max-sed_head[i])*eplstoring[i];
-                                        //}
                                 }
                                 /*Assign output pointer*/

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

@@ -44 +44 @@
         hydrocount=1;
 
-        /*Iteration on the two layers + transfer*/
+        /*Iteration on the two layers*/
         femmodel->SetCurrentConfiguration(HydrologyDCInefficientAnalysisEnum);
         GetSolutionFromInputsx(&ug_sed, femmodel->elements, femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials, femmodel->parameters);
@@ -115 +115 @@
                         /*Iteration on the EPL layer*/
                         for(;;){
-                                //                              femmodel->HydrologyTransferx();
+                                femmodel->HydrologyTransferx();
                                 femmodel->SystemMatricesx(&Kff, &Kfs, &pf,&df,NULL);
                                 CreateNodalConstraintsx(&ys,femmodel->nodes,HydrologyDCEfficientAnalysisEnum);
@@ -127 +127 @@
                                 Mergesolutionfromftogx(&ug_epl,uf,ys,femmodel->nodes,femmodel->parameters); delete ys;
                                 InputUpdateFromSolutionx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,ug_epl);
-                                femmodel->HydrologyEPLupdateDomainx();
+                                //femmodel->HydrologyEPLupdateDomainx();
                                 ConstraintsStatex(&constraints_converged,&num_unstable_constraints, femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters);