Changeset 17111

Timestamp:

01/14/14 14:30:53 (11 years ago)

Author:

seroussi

Message:

NEW: adding analytical functions framework for FS tests

Location:

issm/trunk-jpl/src/c

Files:

• Makefile.am (modified) (1 diff)
• analyses/StressbalanceAnalysis.cpp (modified) (3 diffs)
• analyses/StressbalanceAnalysis.h (modified) (1 diff)
• shared/FSanalyticals (added)
• shared/FSanalyticals/fsanalyticals.h (added)
• shared/FSanalyticals/fx.cpp (added)
• shared/FSanalyticals/fy.cpp (added)
• shared/FSanalyticals/fz.cpp (added)
• shared/shared.h (modified) (1 diff)

issm/trunk-jpl/src/c/Makefile.am

@@ -177 +177 @@
                                         ./shared/LatLong/Ll2xyx.cpp\
                                         ./shared/LatLong/Xy2llx.cpp\
+                                        ./shared/FSanalyticals/fsanalyticals.h\
+                                        ./shared/FSanalyticals/fx.cpp\
+                                        ./shared/FSanalyticals/fy.cpp\
+                                        ./shared/FSanalyticals/fz.cpp\
                                         ./shared/Enum/Enum.h\
                                         ./shared/Enum/EnumDefinitions.h\

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

@@ -2719 +2719 @@
         return Ke;
 }/*}}}*/
+#ifdef FSANALYTICAL
 ElementVector* StressbalanceAnalysis::CreatePVectorFS(Element* element){/*{{{*/
-
-        #ifdef FSANALYTICAL
-        ElementVector* pe=CreatePVectorFSAnalytical(element);
-
-        #else
-        /*compute all load vectors for this element*/
-        ElementVector* pe1=CreatePVectorFSViscous(element);
-        ElementVector* pe2=CreatePVectorFSShelf(element);
-        ElementVector* pe3=CreatePVectorFSFront(element);
-        ElementVector* pe =new ElementVector(pe1,pe2,pe3);
-
-        /*clean-up and return*/
-        delete pe1;
-        delete pe2;
-        delete pe3;
-        #endif
-
-        return pe;
-}/*}}}*/
-ElementVector* StressbalanceAnalysis::CreatePVectorFSAnalytical(Element* element){/*{{{*/
 
         bool        analytical_solution=0;
@@ -2779 +2760 @@
                 element->NodalFunctionsVelocity(vbasis,gauss);
 
-                forcex=1.0; forcey=1.0; forcez=1.0;
-//              forcex->fx(x_coord,y_coord,z_coord);
-//              forcex->fy(x_coord,y_coord,z_coord);
-//              forcex->fz(x_coord,y_coord,z_coord);
+                x_coord=element->GetXcoord(gauss);
+                y_coord=element->GetYcoord(gauss);
+                z_coord=element->GetZcoord(gauss);
+
+                forcex=fx(x_coord,y_coord,z_coord);
+                forcey=fy(x_coord,y_coord,z_coord);
+                forcez=fz(x_coord,y_coord,z_coord);
 
                 for(i=0;i<vnumnodes;i++){
@@ -2801 +2785 @@
         return pe;
 }/*}}}*/
+#else
+ElementVector* StressbalanceAnalysis::CreatePVectorFS(Element* element){/*{{{*/
+
+        /*compute all load vectors for this element*/
+        ElementVector* pe1=CreatePVectorFSViscous(element);
+        ElementVector* pe2=CreatePVectorFSShelf(element);
+        ElementVector* pe3=CreatePVectorFSFront(element);
+        ElementVector* pe =new ElementVector(pe1,pe2,pe3);
+
+        /*clean-up and return*/
+        delete pe1;
+        delete pe2;
+        delete pe3;
+
+        return pe;
+}/*}}}*/
+#endif
 ElementVector* StressbalanceAnalysis::CreatePVectorFSViscous(Element* element){/*{{{*/
 

issm/trunk-jpl/src/c/analyses/StressbalanceAnalysis.h

@@ -69 +69 @@
                 ElementMatrix* CreateKMatrixFSFriction(Element* element);
                 ElementVector* CreatePVectorFS(Element* element);
-                ElementVector* CreatePVectorFSAnalytical(Element* element);
                 ElementVector* CreatePVectorFSViscous(Element* element);
                 ElementVector* CreatePVectorFSShelf(Element* element);

issm/trunk-jpl/src/c/shared/shared.h

@@ -6 +6 @@
 #define _SHARED_H_
 
+#include "./FSanalyticals/fsanalyticals.h"
 #include "./MemOps/MemOps.h"
 #include "./Bamg/shared.h"