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

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)

File:

• issm/trunk-jpl/src/c/classes/Elements/Tria.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*/