Changeset 18363

Timestamp:

08/11/14 14:11:35 (11 years ago)

Author:

Mathieu Morlighem

Message:

CHG: do not update results, use ug to get local min and max instead of inputs

Location:

issm/trunk-jpl/src/c

Files:

• classes/Elements/Element.cpp (modified) (1 diff)
• classes/Elements/Element.h (modified) (1 diff)
• classes/FemModel.cpp (modified) (2 diffs)
• classes/FemModel.h (modified) (1 diff)
• solutionsequences/solutionsequence_fct.cpp (modified) (2 diffs)

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

@@ -724 +724 @@
 }
 /*}}}*/
-void       Element::GetInputLocalMinMaxOnNodes(IssmDouble* min,IssmDouble* max,int input_enum){/*{{{*/
-
-        Input* input = GetInput(input_enum);
-        if(!input){
-                _error_("Input "<<EnumToStringx(input_enum)<<" not found");
-        }
-
+void       Element::GetInputLocalMinMaxOnNodes(IssmDouble* min,IssmDouble* max,IssmDouble* ug){/*{{{*/
+
+
+        /*Get number of nodes for this element*/
         int numnodes = this->GetNumberOfNodes();
-        IssmDouble input_min = input->Min();
-        IssmDouble input_max = input->Max();
+
+        /*Some checks to avoid segmentation faults*/
+        _assert_(ug);
+        _assert_(numnodes>0);
+        _assert_(nodes);
+
+        /*Get element minimum/maximum*/
+        IssmDouble input_min = ug[nodes[0]->GetDof(0,GsetEnum)];
+        IssmDouble input_max = input_min;
+        for(int i=1;i<numnodes;i++){
+                if(ug[nodes[i]->GetDof(0,GsetEnum)] < input_min) input_min = ug[nodes[i]->GetDof(0,GsetEnum)];
+                if(ug[nodes[i]->GetDof(0,GsetEnum)] > input_max) input_max = ug[nodes[i]->GetDof(0,GsetEnum)];
+        }
+
+
+        /*Second loop to reassign min and max with local extrema*/
         for(int i=0;i<numnodes;i++){
                 if(min[nodes[i]->GetDof(0,GsetEnum)]>input_min) min[nodes[i]->GetDof(0,GsetEnum)] = input_min;

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

@@ -85 +85 @@
                 void       GetInputListOnVertices(IssmDouble* pvalue,int enumtype);
                 void       GetInputListOnVertices(IssmDouble* pvalue,int enumtype,IssmDouble defaultvalue);
-                void       GetInputLocalMinMaxOnNodes(IssmDouble* min,IssmDouble* max,int input_enum);
+                void       GetInputLocalMinMaxOnNodes(IssmDouble* min,IssmDouble* max,IssmDouble* ug);
                 void       GetInputValue(bool* pvalue,int enum_type);
                 void       GetInputValue(int* pvalue,int enum_type);

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

@@ -1125 +1125 @@
 
 }/*}}}*/
-void FemModel::GetInputLocalMinMaxOnNodesx(IssmDouble** pmin,IssmDouble** pmax,int input_enum){/*{{{*/
+void FemModel::GetInputLocalMinMaxOnNodesx(IssmDouble** pmin,IssmDouble** pmax,IssmDouble* ug){/*{{{*/
 
         /*Get vector sizes for current configuration*/
@@ -1144 +1144 @@
         for(int i=0;i<this->elements->Size();i++){
                 Element* element=dynamic_cast<Element*>(this->elements->GetObjectByOffset(i));
-                element->GetInputLocalMinMaxOnNodes(uLmin_local,uLmax_local,input_enum);
+                element->GetInputLocalMinMaxOnNodes(uLmin_local,uLmax_local,ug);
         }
 

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

@@ -61 +61 @@
 
                 /*Modules*/ 
-                void GetInputLocalMinMaxOnNodesx(IssmDouble** pmin,IssmDouble** pmax,int input_enum);
+                void GetInputLocalMinMaxOnNodesx(IssmDouble** pmin,IssmDouble** pmax,IssmDouble* ug);
                 void MassFluxx(IssmDouble* presponse);
                 void MaxAbsVxx(IssmDouble* presponse);

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

@@ -390 +390 @@
         VecToMPISerial(&ml_serial  ,Ml_petsc,IssmComm::GetComm());
 
-        /*Push uL to elements*/
-        InputUpdateFromSolutionx(femmodel,u_serial);
-
         /*Anti diffusive fluxes*/
         Vec         Fbar            = NULL;
@@ -399 +396 @@
         IssmDouble *ulmin           = NULL;
         IssmDouble *ulmax           = NULL;
-        femmodel->GetInputLocalMinMaxOnNodesx(&ulmin,&ulmax,ThicknessEnum);
+        femmodel->GetInputLocalMinMaxOnNodesx(&ulmin,&ulmax,u_serial);
         CreateRis(&Ri_plus_serial,&Ri_minus_serial,Mc_petsc,D_petsc,ml_serial,u,u_serial,udot_serial,ulmin,ulmax,deltat);
         CreateFbar(&Fbar,Ri_plus_serial,Ri_minus_serial,Mc_petsc,D_petsc,udot_serial,u_serial,u);