Changeset 17351

Timestamp:

02/26/14 09:45:36 (11 years ago)

Author:

bdef

Message:

BUG: fixing analysis related bug in hydrology

Location:

issm/trunk-jpl/src/c

Files:

• analyses/HydrologyDCEfficientAnalysis.cpp (modified) (5 diffs)
• solutionsequences/solutionsequence_hydro_nonlinear.cpp (modified) (4 diffs)

issm/trunk-jpl/src/c/analyses/HydrologyDCEfficientAnalysis.cpp

@@ -48 +48 @@
                 }
         }
-
         iomodel->FetchDataToInput(elements,ThicknessEnum);
-        iomodel->FetchDataToInput(elements,SurfaceEnum);
         iomodel->FetchDataToInput(elements,BedEnum);
         iomodel->FetchDataToInput(elements,MaskIceLevelsetEnum);
         iomodel->FetchDataToInput(elements,MeshElementonbedEnum);
-        iomodel->FetchDataToInput(elements,MeshElementonsurfaceEnum);
         iomodel->FetchDataToInput(elements,EplHeadEnum);
         iomodel->FetchDataToInput(elements,SedimentHeadEnum);
@@ -60 +57 @@
         iomodel->FetchDataToInput(elements,HydrologydcSedimentTransmitivityEnum);
 
-        //      iomodel->FetchDataToInput(elements,HydrologydcMaskEplactiveNodeEnum);
+        iomodel->FetchDataToInput(elements,HydrologydcMaskEplactiveNodeEnum);
         
         elements->InputDuplicate(HydrologydcEplInitialThicknessEnum,HydrologydcEplThicknessEnum);
@@ -131 +128 @@
 
         /*Check that all nodes are active, else return empty matrix*/
-        if(!basalelement->AllActive()) {
+        if(!basalelement->AllActive()) { /*This could probably replaced by active elt mask*/
         if(meshtype!=Mesh2DhorizontalEnum){
                         basalelement->DeleteMaterials(); 
@@ -327 +324 @@
         
         IssmDouble* eplHeads    = xNew<IssmDouble>(numnodes);
-        IssmDouble* eplOldHeads    = xNew<IssmDouble>(numnodes); 
-
-        /*Get previous water head*/
-        basalelement->GetInputListOnNodes(&eplOldHeads[0],EplHeadEnum);
 
         /*Use the dof list to index into the solution vector: */
@@ -347 +340 @@
         if(meshtype!=Mesh2DhorizontalEnum){basalelement->DeleteMaterials(); delete basalelement;};
 } /*}}}*/
+
 void HydrologyDCEfficientAnalysis::UpdateConstraints(FemModel* femmodel){/*{{{*/
         /*Default, do nothing*/

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

@@ -137 +137 @@
                                 delete analysis;
                         }
-                        
                         sedconverged=false;
                         
@@ -175 +174 @@
                         EplConv=1.0;
 
+
                         for(;;){
                                 eplconverged=false;
@@ -181 +181 @@
 
                                 /* {{{ *//*Retriev the EPL head slopes and compute EPL Thickness*/
-                                        if(VerboseSolution()) _printf0_("computing EPL Head slope...\n");
-                                        femmodel->SetCurrentConfiguration(L2ProjectionEPLAnalysisEnum);
-                                        femmodel->UpdateConstraintsL2ProjectionEPLx();
-                                        femmodel->parameters->SetParam(EplHeadSlopeXEnum,InputToL2ProjectEnum);
-                                        solutionsequence_linear(femmodel);
-                                        femmodel->parameters->SetParam(EplHeadSlopeYEnum,InputToL2ProjectEnum);
-                                        solutionsequence_linear(femmodel);
-                                        femmodel->SetCurrentConfiguration(HydrologyDCEfficientAnalysisEnum);
-                                        femmodel->HydrologyEPLThicknessx();
-                                        
-                                        //updating mask after the computation of the epl thickness (Allow to close too thin EPL)
-                                        femmodel->HydrologyEPLupdateDomainx();
-
-                                        HydrologyDCInefficientAnalysis* analysis = new HydrologyDCInefficientAnalysis();
-                                        analysis->ElementizeEplMask(femmodel);
-                                        delete analysis;
-                                        /* }}} */
+                                if(VerboseSolution()) _printf0_("computing EPL Head slope...\n");
+                                femmodel->SetCurrentConfiguration(L2ProjectionEPLAnalysisEnum);
+                                femmodel->UpdateConstraintsL2ProjectionEPLx();
+                                femmodel->parameters->SetParam(EplHeadSlopeXEnum,InputToL2ProjectEnum);
+                                solutionsequence_linear(femmodel);
+                                femmodel->parameters->SetParam(EplHeadSlopeYEnum,InputToL2ProjectEnum);
+                                solutionsequence_linear(femmodel);
+                                femmodel->SetCurrentConfiguration(HydrologyDCEfficientAnalysisEnum);
+                                femmodel->HydrologyEPLThicknessx();
+                                
+                                //updating mask after the computation of the epl thickness (Allow to close too thin EPL)
+                                femmodel->HydrologyEPLupdateDomainx();
+                                
+                                HydrologyDCInefficientAnalysis* analysis = new HydrologyDCInefficientAnalysis();
+                                analysis->ElementizeEplMask(femmodel);
+                                delete analysis;
+                                /* }}} */
                                         
                                 if(VerboseSolution()) _printf0_("Building EPL Matrix...\n");
@@ -283 +283 @@
         }
         /* }}} */
+        if(isefficientlayer)InputUpdateFromSolutionx(femmodel,ug_epl);
+        femmodel->SetCurrentConfiguration(HydrologyDCInefficientAnalysisEnum);
         InputUpdateFromSolutionx(femmodel,ug_sed);
-        if(isefficientlayer)InputUpdateFromSolutionx(femmodel,ug_epl);
         /*Free ressources: */
         delete ug_epl;