Changeset 17303

Timestamp:

02/19/14 09:09:41 (11 years ago)

Author:

seroussi

Message:

CHG: cleaned analytical solutions code

Location:

issm/trunk-jpl/src/c

Files:

• Makefile.am (modified) (1 diff)
• analyses/StressbalanceAnalysis.cpp (modified) (2 diffs)
• shared/FSanalyticals/FSanalytical1.cpp (deleted)
• shared/FSanalyticals/FSanalytical2.cpp (deleted)
• shared/FSanalyticals/FSanalytical3.cpp (deleted)
• shared/FSanalyticals/fsanalyticals.cpp (added)
• shared/FSanalyticals/fsanalyticals.h (modified) (2 diffs)

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

@@ -178 +178 @@
                                         ./shared/LatLong/Xy2llx.cpp\
                                         ./shared/FSanalyticals/fsanalyticals.h\
-                                        ./shared/FSanalyticals/FSanalytical1.cpp\
-                                        ./shared/FSanalyticals/FSanalytical2.cpp\
-                                        ./shared/FSanalyticals/FSanalytical3.cpp\
+                                        ./shared/FSanalyticals/fsanalyticals.cpp\
                                         ./shared/Enum/Enum.h\
                                         ./shared/Enum/EnumDefinitions.h\

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

@@ -6 +6 @@
 #include "../solutionsequences/solutionsequences.h"
 
-//#define FSANALYTICAL 5
+//#define FSANALYTICAL 1
 
 /*Model processing*/
@@ -2978 +2978 @@
                 y_coord=element->GetYcoord(gauss);
                 if(dim==3) z_coord=element->GetZcoord(gauss);
-
-                #if FSANALYTICAL == 1
-                        forcex=fx1(x_coord,y_coord,z_coord);
-                        forcey=fy1(x_coord,y_coord,z_coord);
-                        forcez=fz1(x_coord,y_coord,z_coord);
-                #elif FSANALYTICAL == 2
-                        forcex=fx2(x_coord,y_coord,z_coord);
-                        forcey=fy2(x_coord,y_coord,z_coord);
-                        forcez=fz2(x_coord,y_coord,z_coord);
-                #elif FSANALYTICAL == 3
-                        forcex=fx3(x_coord,y_coord);
-                        forcey=fy3(x_coord,y_coord);
-                #elif FSANALYTICAL == 4
-                        forcex=fx4(x_coord,y_coord,z_coord);
-                        forcey=fy4(x_coord,y_coord,z_coord);
-                        forcez=fz4(x_coord,y_coord,z_coord);
-                #elif FSANALYTICAL == 5
-                        forcex=fx5(x_coord,y_coord,z_coord);
-                        forcey=fy5(x_coord,y_coord,z_coord);
-                        forcez=fz5(x_coord,y_coord,z_coord);
-                #else 
-                        _error_("FS analytical not implemented yet");
-                #endif
+                else z_coord=0.;
+
+                forcex=fx(x_coord,y_coord,z_coord,FSANALYTICAL);
+                forcey=fy(x_coord,y_coord,z_coord,FSANALYTICAL);
+                forcez=fz(x_coord,y_coord,z_coord,FSANALYTICAL);
 
                 for(i=0;i<vnumnodes;i++){

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

@@ -8 +8 @@
 #include "../Numerics/types.h"
 
-IssmDouble fx1(IssmDouble x_coord, IssmDouble y_coord, IssmDouble z_coord);
-IssmDouble fy1(IssmDouble x_coord, IssmDouble y_coord, IssmDouble z_coord);
-IssmDouble fz1(IssmDouble x_coord, IssmDouble y_coord, IssmDouble z_coord);
-IssmDouble fx2(IssmDouble x_coord, IssmDouble y_coord, IssmDouble z_coord);
-IssmDouble fy2(IssmDouble x_coord, IssmDouble y_coord, IssmDouble z_coord);
-IssmDouble fz2(IssmDouble x_coord, IssmDouble y_coord, IssmDouble z_coord);
-IssmDouble fx3(IssmDouble x_coord, IssmDouble y_coord);
-IssmDouble fy3(IssmDouble x_coord, IssmDouble y_coord);
+IssmDouble fx(IssmDouble x_coord, IssmDouble y_coord, IssmDouble z_coord, int FSANALYTICAL);
+IssmDouble fy(IssmDouble x_coord, IssmDouble y_coord, IssmDouble z_coord, int FSANALYTICAL);
+IssmDouble fz(IssmDouble x_coord, IssmDouble y_coord, IssmDouble z_coord, int FSANALYTICAL);
+IssmDouble fx1(IssmDouble x_coord, IssmDouble y_coord);
+IssmDouble fy1(IssmDouble x_coord, IssmDouble y_coord);
+IssmDouble fx2(IssmDouble x_coord, IssmDouble y_coord);
+IssmDouble fy2(IssmDouble x_coord, IssmDouble y_coord);
+IssmDouble fx3(IssmDouble x_coord, IssmDouble y_coord, IssmDouble z_coord);
+IssmDouble fy3(IssmDouble x_coord, IssmDouble y_coord, IssmDouble z_coord);
+IssmDouble fz3(IssmDouble x_coord, IssmDouble y_coord, IssmDouble z_coord);
 IssmDouble fx4(IssmDouble x_coord, IssmDouble y_coord, IssmDouble z_coord);
 IssmDouble fy4(IssmDouble x_coord, IssmDouble y_coord, IssmDouble z_coord);
@@ -22 +24 @@
 IssmDouble fy5(IssmDouble x_coord, IssmDouble y_coord, IssmDouble z_coord);
 IssmDouble fz5(IssmDouble x_coord, IssmDouble y_coord, IssmDouble z_coord);
+IssmDouble fx6(IssmDouble x_coord, IssmDouble y_coord, IssmDouble z_coord);
+IssmDouble fy6(IssmDouble x_coord, IssmDouble y_coord, IssmDouble z_coord);
+IssmDouble fz6(IssmDouble x_coord, IssmDouble y_coord, IssmDouble z_coord);
 
 #endif //ifndef _SHARED_ANALYTICALS_H_