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

Timestamp:

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

Author:

seroussi

Message:

CHG: minor ordering

File:

• issm/trunk-jpl/src/c/analyses/MeltingAnalysis.cpp (modified) (3 diffs)

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

@@ -6 +6 @@
 
 /*Model processing*/
+void MeltingAnalysis::CreateConstraints(Constraints* constraints,IoModel* iomodel){/*{{{*/
+        /*No Constraints*/
+}/*}}}*/
+void MeltingAnalysis::CreateLoads(Loads* loads, IoModel* iomodel){/*{{{*/
+
+        /*if 2d: Error*/
+        if(iomodel->domaintype==Domain2DhorizontalEnum) _error_("2d meshes not supported yet");
+
+        //create penalties for nodes: no node can have a temperature over the melting point
+        iomodel->FetchData(1,MeshVertexonbaseEnum);
+        CreateSingleNodeToElementConnectivity(iomodel);
+
+        for(int i=0;i<iomodel->numberofvertices;i++){
+                if(iomodel->my_vertices[i]){
+                        if (reCast<int>(iomodel->Data(MeshVertexonbaseEnum)[i])){
+                                loads->AddObject(new Pengrid(iomodel->loadcounter+i+1,i,iomodel,MeltingAnalysisEnum));
+                        }
+                }
+        }
+        iomodel->DeleteData(1,MeshVertexonbaseEnum);
+
+}/*}}}*/
+void MeltingAnalysis::CreateNodes(Nodes* nodes,IoModel* iomodel){/*{{{*/
+
+        if(iomodel->domaintype==Domain3DEnum) iomodel->FetchData(2,MeshVertexonbaseEnum,MeshVertexonsurfaceEnum);
+        ::CreateNodes(nodes,iomodel,MeltingAnalysisEnum,P1Enum);
+        iomodel->DeleteData(2,MeshVertexonbaseEnum,MeshVertexonsurfaceEnum);
+}/*}}}*/
 int  MeltingAnalysis::DofsPerNode(int** doflist,int domaintype,int approximation){/*{{{*/
         return 1;
-}/*}}}*/
-void MeltingAnalysis::UpdateParameters(Parameters* parameters,IoModel* iomodel,int solution_enum,int analysis_enum){/*{{{*/
 }/*}}}*/
 void MeltingAnalysis::UpdateElements(Elements* elements,IoModel* iomodel,int analysis_counter,int analysis_type){/*{{{*/
@@ -39 +65 @@
         iomodel->FetchDataToInput(elements,PressureEnum);
 }/*}}}*/
-void MeltingAnalysis::CreateNodes(Nodes* nodes,IoModel* iomodel){/*{{{*/
-
-        if(iomodel->domaintype==Domain3DEnum) iomodel->FetchData(2,MeshVertexonbaseEnum,MeshVertexonsurfaceEnum);
-        ::CreateNodes(nodes,iomodel,MeltingAnalysisEnum,P1Enum);
-        iomodel->DeleteData(2,MeshVertexonbaseEnum,MeshVertexonsurfaceEnum);
-}/*}}}*/
-void MeltingAnalysis::CreateConstraints(Constraints* constraints,IoModel* iomodel){/*{{{*/
-        /*No Constraints*/
-}/*}}}*/
-void MeltingAnalysis::CreateLoads(Loads* loads, IoModel* iomodel){/*{{{*/
-
-        /*if 2d: Error*/
-        if(iomodel->domaintype==Domain2DhorizontalEnum) _error_("2d meshes not supported yet");
-
-        //create penalties for nodes: no node can have a temperature over the melting point
-        iomodel->FetchData(1,MeshVertexonbaseEnum);
-        CreateSingleNodeToElementConnectivity(iomodel);
-
-        for(int i=0;i<iomodel->numberofvertices;i++){
-                if(iomodel->my_vertices[i]){
-                        if (reCast<int>(iomodel->Data(MeshVertexonbaseEnum)[i])){
-                                loads->AddObject(new Pengrid(iomodel->loadcounter+i+1,i,iomodel,MeltingAnalysisEnum));
-                        }
-                }
-        }
-        iomodel->DeleteData(1,MeshVertexonbaseEnum);
-
+void MeltingAnalysis::UpdateParameters(Parameters* parameters,IoModel* iomodel,int solution_enum,int analysis_enum){/*{{{*/
 }/*}}}*/
 
@@ -126 +126 @@
         return NULL;
 }/*}}}*/
-void MeltingAnalysis::GetSolutionFromInputs(Vector<IssmDouble>* solution,Element* element){/*{{{*/
+void           MeltingAnalysis::GetSolutionFromInputs(Vector<IssmDouble>* solution,Element* element){/*{{{*/
            _error_("not implemented yet");
 }/*}}}*/
-void MeltingAnalysis::GradientJ(Vector<IssmDouble>* gradient,Element* element,int control_type,int control_index){/*{{{*/
+void           MeltingAnalysis::GradientJ(Vector<IssmDouble>* gradient,Element* element,int control_type,int control_index){/*{{{*/
         _error_("Not implemented yet");
 }/*}}}*/
-void MeltingAnalysis::InputUpdateFromSolution(IssmDouble* solution,Element* element){/*{{{*/
+void           MeltingAnalysis::InputUpdateFromSolution(IssmDouble* solution,Element* element){/*{{{*/
         element->InputUpdateFromSolutionOneDof(solution,BasalforcingsGroundediceMeltingRateEnum);
 }/*}}}*/
-void MeltingAnalysis::UpdateConstraints(FemModel* femmodel){/*{{{*/
+void           MeltingAnalysis::UpdateConstraints(FemModel* femmodel){/*{{{*/
         /*Default, do nothing*/
         return;