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

Timestamp:

11/12/13 18:04:16 (11 years ago)

Author:

bdef

Message:

NEW: There is now an initial thickness for the EPL

File:

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

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

@@ -2166 +2166 @@
                                 name==EplHeadEnum ||
                                 name==HydrologydcEplThicknessOldEnum ||
+                                name==HydrologydcEplInitialThicknessEnum ||
                                 name==HydrologydcEplThicknessEnum ||
                                 name==HydrologydcMaskEplactiveEnum ||
@@ -7370 +7371 @@
         const int   numdof         = NDOF1 *NUMVERTICES;
         bool        isefficientlayer;
-        IssmDouble  n,A,dt;
+        IssmDouble  n,A,dt,init_thick;
         IssmDouble  rho_water,rho_ice;
         IssmDouble  gravity,latentheat,EPLgrad;
@@ -7386 +7387 @@
         if(isefficientlayer){
                 /*For now, assuming just one way to compute EPL thickness*/
-                rho_water  = matpar->GetRhoWater();
-                rho_ice    = matpar->GetRhoIce();
-                gravity    = matpar->GetG();
-                latentheat = matpar->GetLatentHeat();
-                n          = material->GetN();
-                A          = material->GetAbar();
+                rho_water        = matpar->GetRhoWater();
+                rho_ice          = matpar->GetRhoIce();
+                gravity          = matpar->GetG();
+                latentheat       = matpar->GetLatentHeat();
+                epl_conductivity = matpar->GetEplConductivity();
+                init_thick       = matpar->GetEplInitialThickness();
+                n                = material->GetN();
+                A                = material->GetAbar();
                 
                 GetInputListOnVertices(&activeEpl[0],HydrologydcMaskEplactiveEnum);
@@ -7401 +7404 @@
                 GetInputListOnVertices(&bed[0],BedEnum);
                 
-                epl_conductivity = matpar->GetEplConductivity();
-                
                 for(int i=0;i<numdof;i++){
                         /*Keeping thickness to 1 if EPL is not active*/
                         if(activeEpl[i]==0.0){
-                                thickness[i]=1.0;
+                                thickness[i]=init_thick;
                         }
                         else{