Changeset 16817

Timestamp:

11/18/13 11:03:54 (11 years ago)

Author:

bdef

Message:

CHG : clean up and change in the way we treat inactive nodes for the epl thickness computation

Location:

issm/trunk-jpl/src/c

Files:

• classes/Elements/Element.h (modified) (1 diff)
• classes/Elements/Penta.cpp (modified) (1 diff)
• classes/Elements/Penta.h (modified) (1 diff)
• classes/Elements/Seg.h (modified) (1 diff)
• classes/Elements/Tria.cpp (modified) (2 diffs)
• classes/Elements/Tria.h (modified) (1 diff)
• classes/FemModel.cpp (modified) (1 diff)
• solutionsequences/solutionsequence_hydro_nonlinear.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/classes/Elements/Element.h

@@ -202 +202 @@
                 virtual void HydrologyEPLGetActive(Vector<IssmDouble>* active)=0;
                 virtual void ComputeEPLThickness(void)=0;
-                virtual void UpdateConstraintsL2ProjectionEPL(void)=0;
                 #endif
 

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

@@ -9728 +9728 @@
 }
 /*}}}*/
-/*FUNCTION Penta::UpdateConstraintsL2ProjectionEPL{{{*/
-void  Penta::UpdateConstraintsL2ProjectionEPL(void){
-
-        IssmDouble activeEpl[NUMVERTICES];
-
-
-        if(!IsOnBed()){
-                for(int i=0;i<this->NumberofNodes();i++)this->nodes[i]->Deactivate();
-        }
-        else{
-                GetInputListOnVertices(&activeEpl[0],HydrologydcMaskEplactiveEnum);
-                for(int i=0;i<3;i++){
-                        if(!reCast<bool>(activeEpl[i])){
-                                this->nodes[i]->Deactivate();
-                        }
-                        else{
-                                this->nodes[i]->Activate();
-                        }
-                }
-        }
-}
-/*}}}*/
 #endif
 

issm/trunk-jpl/src/c/classes/Elements/Penta.h

@@ -354 +354 @@
                 void           HydrologyEPLGetMask(Vector<IssmDouble>* vec_mask);
                 void           ComputeEPLThickness(void);
-                void           UpdateConstraintsL2ProjectionEPL(void);
                 #endif
 

issm/trunk-jpl/src/c/classes/Elements/Seg.h

@@ -180 +180 @@
                 void UpdateConstraintsExtrudeFromBase(){_error_("not implemented");};
                 void UpdateConstraintsExtrudeFromTop(){_error_("not implemented");};
-                void UpdateConstraintsL2ProjectionEPL(){_error_("not implemented");};
 
 #ifdef _HAVE_RESPONSES_

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

@@ -2884 +2884 @@
 }
 /*}}}*/
-/*FUNCTION Tria::UpdateConstraintsL2ProjectionEPL{{{*/
-void  Tria::UpdateConstraintsL2ProjectionEPL(void){
-
-        IssmDouble activeEpl[NUMVERTICES];
- 
-        GetInputListOnVertices(&activeEpl[0],HydrologydcMaskEplactiveEnum);
-        for(int i=0;i<NUMVERTICES;i++){
-                if(!reCast<bool>(activeEpl[i])){
-                        this->nodes[i]->Deactivate();
-                }
-                else{
-                        this->nodes[i]->Activate();
-                }
-        }
-}
-/*}}}*/
+
 #ifdef _HAVE_RESPONSES_
 /*FUNCTION Tria::AverageOntoPartition {{{*/
@@ -7033 +7018 @@
                 GetInputListOnVertices(&bed[0],BedEnum);
                 
-                for(int i=0;i<numdof;i++){
+                if(!this->AnyActive()){
                         /*Keeping thickness to initial value if EPL is not active*/
-                        /* if(activeEpl[i]==0.0){ */
-                        /*      thickness[i]=init_thick; */
-                        /* } */
-                        /* else{ */
-                                /*Compute first the effective pressure in the EPL*/
-                                EPL_N=gravity*((rho_ice*ice_thickness[i])-(rho_water*(eplhead[i]-bed[i])));
-                                if(EPL_N<0.0)EPL_N=0.0;
-                                /*Get then the gradient of EPL heads*/
-                                EPLgrad = epl_slopeX[i]+epl_slopeY[i];
-                                
-                                /*And proceed to the real thing*/
-                                thickness[i] = old_thickness[i]*(1+((rho_water*gravity*dt)/(rho_ice*latentheat))*epl_conductivity*pow(EPLgrad,2.0)-2.0*(A*dt/(pow(n,n)))*(pow(EPL_N,n)));
-                                //}
+                        for(int i=0;i<numdof;i++){ 
+                                thickness[i]=init_thick;
+                        }
+                }
+                else{
+                        for(int i=0;i<numdof;i++){ 
+                                        /*Compute first the effective pressure in the EPL*/
+                                        EPL_N=gravity*((rho_ice*ice_thickness[i])-(rho_water*(eplhead[i]-bed[i])));
+                                        if(EPL_N<0.0)EPL_N=0.0;
+                                        /*Get then the gradient of EPL heads*/
+                                        EPLgrad = epl_slopeX[i]+epl_slopeY[i];
+                                        
+                                        /*And proceed to the real thing*/
+                                        thickness[i] = old_thickness[i]*(1+((rho_water*gravity*dt)/(rho_ice*latentheat))*epl_conductivity*pow(EPLgrad,2.0)-2.0*(A*dt/(pow(n,n)))*(pow(EPL_N,n)));
+                        }
                 }
                 this->inputs->AddInput(new TriaInput(HydrologydcEplThicknessEnum,thickness,P1Enum));

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

@@ -346 +346 @@
                 void           HydrologyEPLGetMask(Vector<IssmDouble>* vec_mask);
                 void           ComputeEPLThickness(void);
-                void           UpdateConstraintsL2ProjectionEPL(void);
                 bool           AllActive(void);
                 bool           AnyActive(void);

issm/trunk-jpl/src/c/classes/FemModel.cpp

@@ -1461 +1461 @@
         /*Update dof indexings*/
         this->UpdateConstraintsx();
-
-        /* for(int i=0;i<elements->Size();i++){ */
-        /*      Element* element=dynamic_cast<Element*>(elements->GetObjectByOffset(i)); */
-        /*      element->UpdateConstraintsL2ProjectionEPL(); */
-        /* } */
-
-}
-/*}}}*/#endif
+}
+/*}}}*/
+#endif

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

@@ -139 +139 @@
                                 solutionsequence_linear(femmodel);
 
+                                femmodel->HydrologyEPLThicknessx();
+
                                 femmodel->SetCurrentConfiguration(HydrologyDCEfficientAnalysisEnum);
-                                femmodel->HydrologyEPLThicknessx();
+                                //                              femmodel->HydrologyEPLThicknessx();
                                 //updating mask after the computation of the epl thickness (Allow to close too thin EPL)
                                 femmodel->HydrologyEPLupdateDomainx();