Changeset 18930 for issm/trunk-jpl/src/c/analyses/L2ProjectionEPLAnalysis.cpp

Timestamp:

12/04/14 10:34:36 (10 years ago)

Author:

seroussi

Message:

CHG: minor ordering

File:

• issm/trunk-jpl/src/c/analyses/L2ProjectionEPLAnalysis.cpp (modified) (4 diffs)

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

@@ -6 +6 @@
 
 /*Model processing*/
+void L2ProjectionEPLAnalysis::CreateConstraints(Constraints* constraints,IoModel* iomodel){/*{{{*/
+
+        /*No constraints*/
+}/*}}}*/
+void L2ProjectionEPLAnalysis::CreateLoads(Loads* loads, IoModel* iomodel){/*{{{*/
+
+        /*No loads*/
+}/*}}}*/
+void L2ProjectionEPLAnalysis::CreateNodes(Nodes* nodes,IoModel* iomodel){/*{{{*/
+        /*Now, do we really want DC?*/
+        int  hydrology_model;
+        iomodel->Constant(&hydrology_model,HydrologyModelEnum);
+        if(hydrology_model!=HydrologydcEnum) return;
+
+        /*Do we want an efficient layer*/
+        bool isefficientlayer;
+        iomodel->Constant(&isefficientlayer,HydrologydcIsefficientlayerEnum);
+        if(!isefficientlayer) return;
+
+        if(iomodel->domaintype==Domain3DEnum){
+                iomodel->FetchData(1,MeshVertexonbaseEnum);
+        }
+        else if(iomodel->domaintype==Domain2DverticalEnum){
+                iomodel->FetchData(1,MeshVertexonbaseEnum);
+        }
+        ::CreateNodes(nodes,iomodel,L2ProjectionEPLAnalysisEnum,P1Enum);
+        iomodel->DeleteData(1,MeshVertexonbaseEnum);
+}/*}}}*/
 int  L2ProjectionEPLAnalysis::DofsPerNode(int** doflist,int domaintype,int approximation){/*{{{*/
         return 1;
-}/*}}}*/
-void L2ProjectionEPLAnalysis::UpdateParameters(Parameters* parameters,IoModel* iomodel,int solution_enum,int analysis_enum){/*{{{*/
 }/*}}}*/
 void L2ProjectionEPLAnalysis::UpdateElements(Elements* elements,IoModel* iomodel,int analysis_counter,int analysis_type){/*{{{*/
@@ -41 +67 @@
         }
 }/*}}}*/
-void L2ProjectionEPLAnalysis::CreateNodes(Nodes* nodes,IoModel* iomodel){/*{{{*/
-        /*Now, do we really want DC?*/
-        int  hydrology_model;
-        iomodel->Constant(&hydrology_model,HydrologyModelEnum);
-        if(hydrology_model!=HydrologydcEnum) return;
-
-        /*Do we want an efficient layer*/
-        bool isefficientlayer;
-        iomodel->Constant(&isefficientlayer,HydrologydcIsefficientlayerEnum);
-        if(!isefficientlayer) return;
-
-        if(iomodel->domaintype==Domain3DEnum){
-                iomodel->FetchData(1,MeshVertexonbaseEnum);
-        }
-        else if(iomodel->domaintype==Domain2DverticalEnum){
-                iomodel->FetchData(1,MeshVertexonbaseEnum);
-        }
-        ::CreateNodes(nodes,iomodel,L2ProjectionEPLAnalysisEnum,P1Enum);
-        iomodel->DeleteData(1,MeshVertexonbaseEnum);
-}/*}}}*/
-void L2ProjectionEPLAnalysis::CreateConstraints(Constraints* constraints,IoModel* iomodel){/*{{{*/
-
-        /*No constraints*/
-}/*}}}*/
-void L2ProjectionEPLAnalysis::CreateLoads(Loads* loads, IoModel* iomodel){/*{{{*/
-
-        /*No loads*/
+void L2ProjectionEPLAnalysis::UpdateParameters(Parameters* parameters,IoModel* iomodel,int solution_enum,int analysis_enum){/*{{{*/
 }/*}}}*/
 
@@ -226 +226 @@
         return pe;
 }/*}}}*/
-void L2ProjectionEPLAnalysis::GetSolutionFromInputs(Vector<IssmDouble>* solution,Element* element){/*{{{*/
+void           L2ProjectionEPLAnalysis::GetSolutionFromInputs(Vector<IssmDouble>* solution,Element* element){/*{{{*/
            _error_("not implemented yet");
 }/*}}}*/
-void L2ProjectionEPLAnalysis::GradientJ(Vector<IssmDouble>* gradient,Element* element,int control_type,int control_index){/*{{{*/
+void           L2ProjectionEPLAnalysis::GradientJ(Vector<IssmDouble>* gradient,Element* element,int control_type,int control_index){/*{{{*/
         _error_("Not implemented yet");
 }/*}}}*/
-void L2ProjectionEPLAnalysis::InputUpdateFromSolution(IssmDouble* solution,Element* element){/*{{{*/
+void           L2ProjectionEPLAnalysis::InputUpdateFromSolution(IssmDouble* solution,Element* element){/*{{{*/
         int inputenum,domaintype;
 
@@ -250 +250 @@
         }
 }/*}}}*/
-void L2ProjectionEPLAnalysis::UpdateConstraints(FemModel* femmodel){/*{{{*/
+void           L2ProjectionEPLAnalysis::UpdateConstraints(FemModel* femmodel){/*{{{*/
         /*Default, do nothing*/
         return;