Changeset 17626

Timestamp:

04/02/14 13:20:50 (11 years ago)

Author:

Mathieu Morlighem

Message:

CHG: trying to make _DEVELOPMENT_ variable defined

Location:

issm/trunk-jpl/src/c/analyses

Files:

• LevelsetAnalysis.cpp (modified) (2 diffs)
• LevelsetAnalysis.h (modified) (1 diff)

issm/trunk-jpl/src/c/analyses/LevelsetAnalysis.cpp ¶

@@ +1 @@
+#ifdef HAVE_CONFIG_H
+   #include <config.h>
+#else
+#error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!"
+#endif
 #include "./LevelsetAnalysis.h"
 #include "../toolkits/toolkits.h"
@@ -297 +302 @@
                 delete gauss;
         }
-        else
-                for(i=0;i<numnodes;i++) 
-                        pe->values[i]=0.; 
+
         return pe;
 }/*}}}*/

issm/trunk-jpl/src/c/analyses/LevelsetAnalysis.h ¶

@@ -10 +10 @@
 
 class LevelsetAnalysis: public Analysis{
-        
-public:
-        /*Model processing*/
-        int  DofsPerNode(int** doflist,int meshtype,int approximation);
-        void UpdateParameters(Parameters* parameters,IoModel* iomodel,int solution_enum,int analysis_enum);
-        void UpdateElements(Elements* elements,IoModel* iomodel,int analysis_counter,int analysis_type);
-        void CreateNodes(Nodes* nodes,IoModel* iomodel);
-        void CreateConstraints(Constraints* constraints,IoModel* iomodel);
-        void CreateLoads(Loads* loads, IoModel* iomodel);
 
-        /*Finite element Analysis*/
-        void           Core(FemModel* femmodel);
-        ElementVector* CreateDVector(Element* element);
-        ElementMatrix* CreateJacobianMatrix(Element* element);
-        ElementMatrix* CreateKMatrix(Element* element);
-        ElementVector* CreatePVector(Element* element);
-        void GetSolutionFromInputs(Vector<IssmDouble>* solution,Element* element);
-        void InputUpdateFromSolution(IssmDouble* solution,Element* element);
-        void UpdateConstraints(FemModel* femmodel);
-        void GetB(IssmDouble* B,Element* element,IssmDouble* xyz_list,Gauss* gauss);
-        void GetBprime(IssmDouble* Bprime,Element* element,IssmDouble* xyz_list,Gauss* gauss);
-        void SetDistanceOnIntersectedElements(FemModel* femmodel);
-        void SetDistanceToZeroLevelsetElement(Vector<IssmDouble>* vec_signed_dist, Element* element);
-        IssmDouble GetDistanceToStraight(IssmDouble* q, IssmDouble* s0, IssmDouble* s1);
+        public:
+                /*Model processing*/
+                int  DofsPerNode(int** doflist,int meshtype,int approximation);
+                void UpdateParameters(Parameters* parameters,IoModel* iomodel,int solution_enum,int analysis_enum);
+                void UpdateElements(Elements* elements,IoModel* iomodel,int analysis_counter,int analysis_type);
+                void CreateNodes(Nodes* nodes,IoModel* iomodel);
+                void CreateConstraints(Constraints* constraints,IoModel* iomodel);
+                void CreateLoads(Loads* loads, IoModel* iomodel);
+
+                /*Finite element Analysis*/
+                void           Core(FemModel* femmodel);
+                ElementVector* CreateDVector(Element* element);
+                ElementMatrix* CreateJacobianMatrix(Element* element);
+                ElementMatrix* CreateKMatrix(Element* element);
+                ElementVector* CreatePVector(Element* element);
+                void GetSolutionFromInputs(Vector<IssmDouble>* solution,Element* element);
+                void InputUpdateFromSolution(IssmDouble* solution,Element* element);
+                void UpdateConstraints(FemModel* femmodel);
+                void GetB(IssmDouble* B,Element* element,IssmDouble* xyz_list,Gauss* gauss);
+                void GetBprime(IssmDouble* Bprime,Element* element,IssmDouble* xyz_list,Gauss* gauss);
+                void SetDistanceOnIntersectedElements(FemModel* femmodel);
+                void SetDistanceToZeroLevelsetElement(Vector<IssmDouble>* vec_signed_dist, Element* element);
+                IssmDouble GetDistanceToStraight(IssmDouble* q, IssmDouble* s0, IssmDouble* s1);
 };
 #endif