Changeset 15722

Timestamp:

08/06/13 11:05:38 (12 years ago)

Author:

seroussi

Message:

CHG: finite element interpolation can vary inside a solution

File:

• issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHoriz/UpdateElementsDiagnosticHoriz.cpp (modified) (5 diffs)

issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHoriz/UpdateElementsDiagnosticHoriz.cpp

@@ -17 +17 @@
 
         int    materials_type,finiteelement,temp;
+        int    approximation;
+        int*   finiteelement_list=NULL;
         bool   isSSA,isL1L2,isHO,isFS,iscoupling;
         bool   control_analysis;
@@ -29 +31 @@
         iomodel->Constant(&dakota_analysis,QmuIsdakotaEnum);
         iomodel->Constant(&materials_type,MaterialsEnum);
+
+        /*Fetch data needed and allocate vectors: */
+        iomodel->FetchData(1,FlowequationElementEquationEnum);
+        finiteelement_list=xNewZeroInit<int>(iomodel->numberofelements);
 
         /*Now, is the flag macayaealHO on? otherwise, do nothing: */
@@ -77 +83 @@
                         }
                 }
+                for(int i=0;i<iomodel->numberofelements;i++){
+                        finiteelement_list[i]=finiteelement;
+                }
         }
         else{
                 if(isFS){
-                        finiteelement = MINIEnum;
+                        for(int i=0;i<iomodel->numberofelements;i++){
+                                approximation=reCast<int>(iomodel->Data(FlowequationElementEquationEnum)[i]);
+                                if(approximation==FSApproximationEnum || approximation==HOFSApproximationEnum || approximation==SSAFSApproximationEnum){
+                                        finiteelement_list[i]=MINIcondensedEnum;
+                                }
+                                else{
+                                        finiteelement_list[i]=P1Enum;
+                                }
+                        }
                 }
                 else{
                         finiteelement = P1Enum;
+                        for(int i=0;i<iomodel->numberofelements;i++){
+                                finiteelement_list[i]=finiteelement;
+                        }
                 }
-
         }
-
-        /*Fetch data needed: */
-        iomodel->FetchData(1,FlowequationElementEquationEnum);
 
         /*Update elements: */
@@ -96 +112 @@
                 if(iomodel->my_elements[i]){
                         Element* element=(Element*)elements->GetObjectByOffset(counter);
-                        element->Update(i,iomodel,analysis_counter,analysis_type,finiteelement);
+                        element->Update(i,iomodel,analysis_counter,analysis_type,finiteelement_list[i]);
                         counter++;
                 }
@@ -157 +173 @@
         /*Free data: */
         iomodel->DeleteData(1,FlowequationElementEquationEnum);
+        xDelete<int>(finiteelement_list);
 }