Changeset 19009

Timestamp:

01/15/15 18:06:35 (10 years ago)

Author:

bdef

Message:

CHG: change in the solution sequecence for a better gestion of the epl colapse

Location:

issm/trunk-jpl/src/c

Files:

• classes/FemModel.cpp (modified) (4 diffs)
• classes/FemModel.h (modified) (1 diff)
• solutionsequences/solutionsequence_hydro_nonlinear.cpp (modified) (5 diffs)

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

@@ -1871 +1871 @@
 /*}}}*/
 #endif
-void FemModel::HydrologyEPLupdateDomainx(void){ /*{{{*/
+void FemModel::HydrologyEPLupdateDomainx(IssmDouble* pEplcount){ /*{{{*/
 
         Vector<IssmDouble>* mask                                                        = NULL;
@@ -1933 +1933 @@
         ISSM_MPI_Bcast(&sum_counter,1,ISSM_MPI_INT,0,IssmComm::GetComm());                
         counter=sum_counter;
+        *pEplcount = counter;
         if(VerboseSolution()) _printf0_("   Number of active nodes in EPL layer: "<< counter <<"\n");
 
@@ -1940 +1941 @@
 }
 /*}}}*/
-void FemModel::UpdateConstraintsL2ProjectionEPLx(void){ /*{{{*/
+void FemModel::UpdateConstraintsL2ProjectionEPLx(IssmDouble* pL2count){ /*{{{*/
 
         Vector<IssmDouble>* active        = NULL;
@@ -1978 +1979 @@
         ISSM_MPI_Bcast(&sum_counter,1,ISSM_MPI_INT,0,IssmComm::GetComm());                
         counter=sum_counter;
+        *pL2count = counter;
         if(VerboseSolution()) _printf0_("   Number of active nodes L2 Projection: "<< counter <<"\n");
 }

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

@@ -107 +107 @@
                 void UpdateConstraintsExtrudeFromBasex();
                 void UpdateConstraintsExtrudeFromTopx();
-                void HydrologyEPLupdateDomainx(void);
-                //              void HydrologyEPLThicknessx(void);
-                void UpdateConstraintsL2ProjectionEPLx(void);
+                void HydrologyEPLupdateDomainx(IssmDouble* pEplcount);
+                void UpdateConstraintsL2ProjectionEPLx(IssmDouble* pL2count);
 };
 

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

@@ -46 +46 @@
         IssmDouble ndu_sed,nu_sed;
         IssmDouble ndu_epl,nu_epl;
-
+        IssmDouble ThickCount,L2Count;
+        
         /*Recover parameters: */
         femmodel->SetCurrentConfiguration(HydrologyDCInefficientAnalysisEnum);
@@ -157 +158 @@
                         femmodel->SetCurrentConfiguration(HydrologyDCEfficientAnalysisEnum);
                         /*updating mask*/
-                        femmodel->HydrologyEPLupdateDomainx();
+                        femmodel->HydrologyEPLupdateDomainx(&ThickCount);
                         inefanalysis->ElementizeEplMask(femmodel);
                         InputUpdateFromConstantx(femmodel,true,ResetPenaltiesEnum);
@@ -169 +170 @@
                                 /*{{{*//*Retrieve the EPL head slopes and compute EPL Thickness*/
                                 if(VerboseSolution()) _printf0_("computing EPL Head slope...\n");
-                                //                              inefanalysis->ElementizeEplMask(femmodel);
+                                //inefanalysis->ElementizeEplMask(femmodel);
                                 femmodel->SetCurrentConfiguration(L2ProjectionEPLAnalysisEnum);
-                                femmodel->UpdateConstraintsL2ProjectionEPLx();
+                                femmodel->UpdateConstraintsL2ProjectionEPLx(&L2Count);
                                 inefanalysis->ElementizeEplMask(femmodel);
                                 femmodel->parameters->SetParam(EplHeadSlopeXEnum,InputToL2ProjectEnum);
@@ -181 +182 @@
                                 effanalysis->ComputeEPLThickness(femmodel);
                                 //updating mask after the computation of the epl thickness (Allow to close too thin EPL)
-                                femmodel->HydrologyEPLupdateDomainx();
+                                femmodel->HydrologyEPLupdateDomainx(&ThickCount);
                                 inefanalysis->ElementizeEplMask(femmodel);
                                 /*}}}*/
@@ -213 +214 @@
                                         _error_("   maximum number of EPL iterations (" << hydro_maxiter << ") exceeded");
                                 }
+                                //If there is some colapse go through sediment again
+                                if(ThickCount<L2Count)eplconverged=true;
                                 eplcount++;