Changeset 16534

Timestamp:

10/23/13 15:43:20 (11 years ago)

Author:

Mathieu Morlighem

Message:

NEW: added analyses class so that the code becomes physics oriented

Location:

issm/trunk-jpl/src/c

Files:

• CMakeLists.txt (modified) (1 diff)
• Makefile.am (modified) (11 diffs)
• analyses (added)
• analyses/AdjointBalancethicknessAnalysis.cpp (added)
• analyses/AdjointBalancethicknessAnalysis.h (added)
• analyses/AdjointHorizAnalysis.cpp (added)
• analyses/AdjointHorizAnalysis.h (added)
• analyses/Analysis.h (added)
• analyses/BalancethicknessAnalysis.cpp (added)
• analyses/BalancethicknessAnalysis.h (added)
• analyses/BalancethicknessSoftAnalysis.cpp (added)
• analyses/BalancethicknessSoftAnalysis.h (added)
• analyses/BalancevelocityAnalysis.cpp (added)
• analyses/BalancevelocityAnalysis.h (added)
• analyses/DamageEvolutionAnalysis.cpp (added)
• analyses/DamageEvolutionAnalysis.h (added)
• analyses/EnthalpyAnalysis.cpp (added)
• analyses/EnthalpyAnalysis.h (added)
• analyses/EnumToAnalysis.cpp (added)
• analyses/EnumToAnalysis.h (added)
• analyses/ExtrudeFromBaseAnalysis.cpp (added)
• analyses/ExtrudeFromBaseAnalysis.h (added)
• analyses/ExtrudeFromTopAnalysis.cpp (added)
• analyses/ExtrudeFromTopAnalysis.h (added)
• analyses/FreeSurfaceBaseAnalysis.cpp (added)
• analyses/FreeSurfaceBaseAnalysis.h (added)
• analyses/FreeSurfaceTopAnalysis.cpp (added)
• analyses/FreeSurfaceTopAnalysis.h (added)
• analyses/GiaAnalysis.cpp (added)
• analyses/GiaAnalysis.h (added)
• analyses/HydrologyDCEfficientAnalysis.cpp (added)
• analyses/HydrologyDCEfficientAnalysis.h (added)
• analyses/HydrologyDCInefficientAnalysis.cpp (added)
• analyses/HydrologyDCInefficientAnalysis.h (added)
• analyses/HydrologyShreveAnalysis.cpp (added)
• analyses/HydrologyShreveAnalysis.h (added)
• analyses/L2ProjectionBaseAnalysis.cpp (added)
• analyses/L2ProjectionBaseAnalysis.h (added)
• analyses/MasstransportAnalysis.cpp (added)
• analyses/MasstransportAnalysis.h (added)
• analyses/MeltingAnalysis.cpp (added)
• analyses/MeltingAnalysis.h (added)
• analyses/MeshdeformationAnalysis.cpp (added)
• analyses/MeshdeformationAnalysis.h (added)
• analyses/SmoothedSurfaceSlopeXAnalysis.cpp (added)
• analyses/SmoothedSurfaceSlopeXAnalysis.h (added)
• analyses/SmoothedSurfaceSlopeYAnalysis.cpp (added)
• analyses/SmoothedSurfaceSlopeYAnalysis.h (added)
• analyses/StressbalanceAnalysis.cpp (added)
• analyses/StressbalanceAnalysis.h (added)
• analyses/StressbalanceSIAAnalysis.cpp (added)
• analyses/StressbalanceSIAAnalysis.h (added)
• analyses/StressbalanceVerticalAnalysis.cpp (added)
• analyses/StressbalanceVerticalAnalysis.h (added)
• analyses/ThermalAnalysis.cpp (added)
• analyses/ThermalAnalysis.h (added)
• analyses/analyses.h (added)
• classes/Node.cpp (modified) (10 diffs)
• classes/Node.h (modified) (2 diffs)
• cores/cores.h (modified) (1 diff)
• modules/ModelProcessorx/DistributeNumDofs.cpp (deleted)
• modules/ModelProcessorx/ModelProcessorx.h (modified) (1 diff)
• shared/Enum/Synchronize.sh (modified) (1 diff)

issm/trunk-jpl/src/c/CMakeLists.txt

@@ -167 +167 @@
                                         ./toolkits/ToolkitOptions.cpp
                                         ./modules/ModelProcessorx/ModelProcessorx.cpp
-                                        ./modules/ModelProcessorx/DistributeNumDofs.cpp
                                         ./modules/ModelProcessorx/ElementsAndVerticesPartitioning.cpp
                                         ./modules/ModelProcessorx/NodesPartitioning.cpp

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

@@ -242 +242 @@
                                         ./modules/ModelProcessorx/ModelProcessorx.h\
                                         ./modules/ModelProcessorx/ModelProcessorx.cpp\
-                                        ./modules/ModelProcessorx/DistributeNumDofs.cpp\
                                         ./modules/ModelProcessorx/ElementsAndVerticesPartitioning.cpp\
                                         ./modules/ModelProcessorx/NodesPartitioning.cpp\
@@ -338 +337 @@
                                         ./main/EnvironmentInit.cpp\
                                         ./main/EnvironmentFinalize.cpp\
+                                        ./analyses/EnumToAnalysis.h\
+                                        ./analyses/EnumToAnalysis.cpp\
+                                        ./analyses/Analysis.h\
                                         ./solutionsequences/solutionsequence_linear.cpp\
                                         ./solutionsequences/solutionsequence_nonlinear.cpp\
@@ -394 +396 @@
                                                                 ./modules/ModelProcessorx/ExtrudeFromTop/CreateConstraintsExtrudeFromTop.cpp\
                                                                 ./modules/ModelProcessorx/ExtrudeFromTop/CreateLoadsExtrudeFromTop.cpp\
+                                                                ./analyses/ExtrudeFromBaseAnalysis.h\
+                                                                ./analyses/ExtrudeFromBaseAnalysis.cpp\
+                                                                ./analyses/ExtrudeFromTopAnalysis.h\
+                                                                ./analyses/ExtrudeFromTopAnalysis.cpp\
+                                                                ./analyses/MasstransportAnalysis.h\
+                                                                ./analyses/MasstransportAnalysis.cpp\
+                                                                ./analyses/FreeSurfaceBaseAnalysis.h\
+                                                                ./analyses/FreeSurfaceBaseAnalysis.cpp\
+                                                                ./analyses/FreeSurfaceTopAnalysis.h\
+                                                                ./analyses/FreeSurfaceTopAnalysis.cpp\
                                                                 ./cores/masstransport_core.cpp\
                                                                 ./cores/extrudefrombase_core.cpp\
@@ -414 +426 @@
                                            ./modules/PostprocessingEnthalpyx/PostprocessingEnthalpyx.h\
                                            ./modules/PostprocessingEnthalpyx/PostprocessingEnthalpyx.cpp\
+                                                ./analyses/ThermalAnalysis.h\
+                                                ./analyses/ThermalAnalysis.cpp\
+                                                ./analyses/EnthalpyAnalysis.h\
+                                                ./analyses/EnthalpyAnalysis.cpp\
+                                                ./analyses/MeltingAnalysis.h\
+                                                ./analyses/MeltingAnalysis.cpp\
                                            ./cores/thermal_core.cpp\
                                            ./solutionsequences/solutionsequence_thermal_nonlinear.cpp
@@ -467 +485 @@
                                           ./cores/adjointbalancethickness_core.cpp\
                                           ./cores/AdjointCorePointerFromSolutionEnum.cpp\
+                                          ./analyses/AdjointBalancethicknessAnalysis.h\
+                                          ./analyses/AdjointBalancethicknessAnalysis.cpp\
+                                          ./analyses/AdjointHorizAnalysis.h\
+                                          ./analyses/AdjointHorizAnalysis.cpp\
                                           ./solutionsequences/solutionsequence_adjoint_linear.cpp
 
@@ -486 +508 @@
                                                         ./modules/ModelProcessorx/HydrologyDCEfficient/CreateLoadsHydrologyDCEfficient.cpp \
                                                         ./modules/ModelProcessorx/HydrologyDCEfficient/CreateParametersHydrologyDCEfficient.cpp \
+                                                        ./analyses/HydrologyDCEfficientAnalysis.h\
+                                                        ./analyses/HydrologyDCEfficientAnalysis.cpp\
+                                                        ./analyses/HydrologyDCInefficientAnalysis.h\
+                                                        ./analyses/HydrologyDCInefficientAnalysis.cpp\
+                                                        ./analyses/HydrologyShreveAnalysis.h\
+                                                        ./analyses/HydrologyShreveAnalysis.cpp\
                                                         ./cores/hydrology_core.cpp\
                                                         ./solutionsequences/solutionsequence_hydro_nonlinear.cpp
@@ -503 +531 @@
                                               ./modules/ModelProcessorx/StressbalanceSIA/CreateConstraintsStressbalanceSIA.cpp \
                                                         ./modules/ModelProcessorx/StressbalanceSIA/CreateLoadsStressbalanceSIA.cpp \
+                                                        ./analyses/StressbalanceAnalysis.h\
+                                                        ./analyses/StressbalanceAnalysis.cpp\
+                                                        ./analyses/StressbalanceSIAAnalysis.h\
+                                                        ./analyses/StressbalanceSIAAnalysis.cpp\
+                                                        ./analyses/StressbalanceVerticalAnalysis.h\
+                                                        ./analyses/StressbalanceVerticalAnalysis.cpp\
                                                         ./cores/stressbalance_core.cpp\
                                                         ./solutionsequences/solutionsequence_stokescoupling_nonlinear.cpp
@@ -515 +549 @@
                                                  ./modules/ModelProcessorx/Balancevelocity/CreateConstraintsBalancevelocity.cpp\
                                                  ./modules/ModelProcessorx/Balancevelocity/CreateLoadsBalancevelocity.cpp\
+                                                 ./analyses/BalancevelocityAnalysis.h\
+                                                 ./analyses/BalancevelocityAnalysis.cpp\
+                                                 ./analyses/SmoothedSurfaceSlopeXAnalysis.h\
+                                                 ./analyses/SmoothedSurfaceSlopeXAnalysis.cpp\
+                                                 ./analyses/SmoothedSurfaceSlopeYAnalysis.h\
+                                                 ./analyses/SmoothedSurfaceSlopeYAnalysis.cpp\
+                                                 ./analyses/BalancethicknessAnalysis.h\
+                                                 ./analyses/BalancethicknessAnalysis.cpp\
+                                                 ./analyses/BalancethicknessSoftAnalysis.h\
+                                                 ./analyses/BalancethicknessSoftAnalysis.cpp\
                                                  ./cores/balancethickness_core.cpp \
                                                  ./cores/balancevelocity_core.cpp \
@@ -528 +572 @@
                                           ./modules/ModelProcessorx/L2ProjectionTop/CreateConstraintsL2ProjectionTop.cpp\
                                           ./modules/ModelProcessorx/L2ProjectionTop/CreateLoadsL2ProjectionTop.cpp\
+                                          ./analyses/L2ProjectionBaseAnalysis.h\
+                                          ./analyses/L2ProjectionBaseAnalysis.cpp\
                                           ./cores/surfaceslope_core.cpp\
                                           ./cores/bedslope_core.cpp
@@ -536 +582 @@
                                           ./modules/ModelProcessorx/MeshDeformation/CreateConstraintsMeshDeformation.cpp\
                                           ./modules/ModelProcessorx/MeshDeformation/CreateLoadsMeshDeformation.cpp\
+                                          ./analyses/MeshdeformationAnalysis.h\
+                                          ./analyses/MeshdeformationAnalysis.cpp\
                                           ./cores/meshdeformation_core.cpp
 #}}}
 #Gia sources  {{{
 gia_sources =  ./cores/gia_core.cpp\
+                                        ./analyses/GiaAnalysis.h\
+                                        ./analyses/GiaAnalysis.cpp\
                                         ./modules/ModelProcessorx/Gia/UpdateElementsGia.cpp\
                                         ./modules/ModelProcessorx/Gia/CreateNodesGia.cpp \
@@ -558 +608 @@
 #Damage sources  {{{
 damage_sources =  ./cores/damage_core.cpp\
-                                        ./modules/ModelProcessorx/Damage/UpdateElementsDamage.cpp\
-                                        ./modules/ModelProcessorx/Damage/CreateNodesDamage.cpp \
-                                        ./modules/ModelProcessorx/Damage/CreateConstraintsDamage.cpp\
-                                        ./modules/ModelProcessorx/Damage/CreateParametersDamage.cpp\
-                                        ./modules/ModelProcessorx/Damage/CreateLoadsDamage.cpp\
-                                        ./solutionsequences/solutionsequence_damage_nonlinear.cpp
+                                                ./analyses/DamageEvolutionAnalysis.h\
+                                                ./analyses/DamageEvolutionAnalysis.cpp\
+                                                ./modules/ModelProcessorx/Damage/UpdateElementsDamage.cpp\
+                                                ./modules/ModelProcessorx/Damage/CreateNodesDamage.cpp \
+                                                ./modules/ModelProcessorx/Damage/CreateConstraintsDamage.cpp\
+                                                ./modules/ModelProcessorx/Damage/CreateParametersDamage.cpp\
+                                                ./modules/ModelProcessorx/Damage/CreateLoadsDamage.cpp\
+                                                ./solutionsequences/solutionsequence_damage_nonlinear.cpp
 
 #}}}

issm/trunk-jpl/src/c/classes/Node.cpp

@@ -13 +13 @@
 #include "shared/shared.h"
 #include "modules/ModelProcessorx/ModelProcessorx.h"
+#include "../analyses/analyses.h"
 /*}}}*/
 
@@ -21 +22 @@
 }
 /*}}}*/
-/*FUNCTION Node::Node(int node_id,int node_sid,int node_lid,int io_index, IoModel* iomodel,int analysis_type,int approximation) {{{*/
-Node::Node(int node_id,int node_sid,int node_lid,int io_index, IoModel* iomodel,int analysis_type,int in_approximation){
+/*FUNCTION Node::Node(int node_id,int node_sid,int node_lid,int io_index, IoModel* iomodel,int analysis_enum,int approximation) {{{*/
+Node::Node(int node_id,int node_sid,int node_lid,int io_index, IoModel* iomodel,int analysis_enum,int in_approximation){
 
         /*Intermediary*/
         int k,l;
+        int *doftypes = NULL;
 
         /*id: */
@@ -31 +33 @@
         this->sid           = node_sid;
         this->lid           = node_lid;
-        this->analysis_type = analysis_type;
+        this->analysis_enum = analysis_enum;
 
         /*Initialize coord_system: Identity matrix by default*/
@@ -39 +41 @@
         /*indexing:*/
         this->indexingupdate = true;
-        DistributeNumDofs(&this->indexing,analysis_type,in_approximation,iomodel->meshtype); //number of dofs per node
-
-        if(analysis_type==StressbalanceAnalysisEnum)
+
+        Analysis* analysis = EnumToAnalysis(analysis_enum);
+        int numdofs        = analysis->DofsPerNode(&doftypes,iomodel->meshtype,in_approximation);
+        indexing.Init(numdofs,doftypes);
+        xDelete<int>(doftypes);
+        delete analysis;
+
+        if(analysis_enum==StressbalanceAnalysisEnum)
          this->approximation=in_approximation;
         else
@@ -48 +55 @@
         /*Stressbalance Horiz*/
         #ifdef _HAVE_STRESSBALANCE_
-        if(analysis_type==StressbalanceAnalysisEnum){
+        if(analysis_enum==StressbalanceAnalysisEnum){
 
                 /*Coordinate system provided, convert to coord_system matrix*/
@@ -85 +92 @@
         /*2d solutions in 3d, we need to constrain all the nodes that are not on base*/
         if(
-                                analysis_type==FreeSurfaceBaseAnalysisEnum || 
-                                analysis_type==MasstransportAnalysisEnum || 
-                                analysis_type==MeltingAnalysisEnum || 
-                                analysis_type==L2ProjectionBaseAnalysisEnum || 
-                                analysis_type==BalancethicknessAnalysisEnum ||
-                                analysis_type==HydrologyDCInefficientAnalysisEnum ||
-                                analysis_type==DamageEvolutionAnalysisEnum || 
-                                analysis_type==HydrologyDCEfficientAnalysisEnum
+                                analysis_enum==FreeSurfaceBaseAnalysisEnum || 
+                                analysis_enum==MasstransportAnalysisEnum || 
+                                analysis_enum==MeltingAnalysisEnum || 
+                                analysis_enum==L2ProjectionBaseAnalysisEnum || 
+                                analysis_enum==BalancethicknessAnalysisEnum ||
+                                analysis_enum==HydrologyDCInefficientAnalysisEnum ||
+                                analysis_enum==DamageEvolutionAnalysisEnum || 
+                                analysis_enum==HydrologyDCEfficientAnalysisEnum
                                 ){
                 if(iomodel->meshtype==Mesh3DEnum || iomodel->meshtype==Mesh2DverticalEnum){
@@ -103 +110 @@
         }
         if(
-                                analysis_type==FreeSurfaceTopAnalysisEnum ||
-                                analysis_type==L2ProjectionTopAnalysisEnum
+                                analysis_enum==FreeSurfaceTopAnalysisEnum ||
+                                analysis_enum==L2ProjectionTopAnalysisEnum
                                 ){
                 if(iomodel->meshtype==Mesh3DEnum || iomodel->meshtype==Mesh2DverticalEnum){
@@ -130 +137 @@
         _printf_("   id : " << id << "\n");
         _printf_("   sid: " << sid << "\n");
-        _printf_("   analysis_type: " << EnumToStringx(analysis_type) << "\n");
+        _printf_("   analysis_enum: " << EnumToStringx(analysis_enum) << "\n");
         _printf_("   approximation: " << EnumToStringx(approximation) << "\n");
         _printf_("   indexingupdate: " << indexingupdate << "\n");
@@ -143 +150 @@
         _printf_("   id: " << id << "\n");
         _printf_("   sid: " << sid << "\n");
-        _printf_("   analysis_type: " << EnumToStringx(analysis_type) << "\n");
+        _printf_("   analysis_enum: " << EnumToStringx(analysis_enum) << "\n");
         _printf_("   approximation: " << EnumToStringx(approximation) << "\n");
         _printf_("   indexingupdate: " << indexingupdate << "\n");
@@ -367 +374 @@
 #endif
 /*FUNCTION Node::InAnalysis{{{*/
-bool Node::InAnalysis(int in_analysis_type){
-        if (in_analysis_type==this->analysis_type) return true;
+bool Node::InAnalysis(int in_analysis_enum){
+        if (in_analysis_enum==this->analysis_enum) return true;
         else return false;
 }

issm/trunk-jpl/src/c/classes/Node.h

@@ -36 +36 @@
                 bool         indexingupdate;
                 DofIndexing  indexing;
-                int          analysis_type;
+                int          analysis_enum;
                 IssmDouble   coord_system[3][3];
 
                 /*Node constructors, destructors*/
                 Node();
-                Node(int node_id,int node_sid,int node_lid,int io_index, IoModel* iomodel,int analysis_type,int approximation_in);
+                Node(int node_id,int node_sid,int node_lid,int io_index, IoModel* iomodel,int analysis_enum,int approximation_in);
                 ~Node();
 
@@ -59 +59 @@
                 void  GetCoordinateSystem(IssmDouble* coord_system_out);
 #endif
-                bool  InAnalysis(int analysis_type);
+                bool  InAnalysis(int analysis_enum);
                 int   GetApproximation();
                 int   GetNumberOfDofs(int approximation_enum,int setenum);

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

@@ -3 +3 @@
  */
 
-#ifndef _ANALYSES_H_
-#define _ANALYSES_H_
+#ifndef _CORES_H_
+#define _CORES_H_
 
 /*forward declarations: */

issm/trunk-jpl/src/c/modules/ModelProcessorx/ModelProcessorx.h

@@ -170 +170 @@
 void UpdateCounters(IoModel* iomodel,Nodes** pnodes,Loads** ploads, Constraints** pconstraints);
 
-/*Distribution of dofs: */
-void DistributeNumDofs(DofIndexing* index,int analysis_type,int node_type,int mesh_type);
-
 #endif

issm/trunk-jpl/src/c/shared/Enum/Synchronize.sh

@@ -104 +104 @@
 END
 #}}}
+##Build EnumToAnalysis.cpp {{{
+##Header
+#cat <<END > $ISSM_DIR/src/c/analyses/EnumToAnalysis.cpp
+#/*
+#* \file EnumToAnalysis.cpp
+#* \brief: output class depending on enum
+#*
+#*   WARNING: DO NOT MODIFY THIS FILE
+#*            this file has been automatically generated by Synchronize.sh
+#*            Please read README for more information
+#*/
+#
+##include "./analyses.h"
+##include "../shared/shared.h"
+#
+#Analysis* EnumToAnalysis(int analysis_enum){
+#
+#       switch(analysis_enum){
+#END
+##core
+#cat temp | grep [a-z]Analysis | \
+#       grep -v DefaultAnalysis | grep -v FlaimAnalysis | grep -v SurfaceSlopeAnalysis | grep -v BedSlopeAnalysis | \
+#       awk '{print "\t\t#ifdef _HAVE_"toupper(substr($1,1,length($1)-12))"_\n\t\t" "case " $1" : return new " substr($1,1,length($1)-4) "();\n\t\t#endif"}' \
+#               >> $ISSM_DIR/src/c/analyses/EnumToAnalysis.cpp
+#
+##Footer
+#cat <<END >> $ISSM_DIR/src/c/analyses/EnumToAnalysis.cpp
+#default : _error_("enum provided not supported ("<<EnumToStringx(analysis_enum)<<")");
+#       }
+#}
+#END
+##}}}
 #Build EnumDefinitions.py{{{
 cat <<END > $ISSM_DIR/src/m/enum/EnumDefinitions.py