Changeset 13216 for issm/trunk-jpl/src/c/classes/objects/Elements/Tria.h

Timestamp:

08/31/12 17:23:24 (13 years ago)

Author:

Eric.Larour

Message:

NEW: large change to the code, to adapt to ADOLC requirements.

This change relates to the introduction of template classes and functions for the
Option.h abstract class. This is needed, because we want to make the Matlab
API independent from the libCore objects, which are dependent on the IssmDouble*
ADOLC type (adouble), when the Matlab API is dependent on the IssmPDouble* type (double).

To make them independent, we need to be able to specify at run time Options, Matrix and
Vector objects that hold either IssmDouble or IssmPDouble objects. The only way to do
that is through the use of templated classes for Option.h, Matrix and Vector.

The change gets rid of a lot of useless code (especially in the classes/objects/Options
directory), by introducing template versions of the same code.

The bulk of the changes to src/modules and src/mex modules is to adapt to this
new runtime declaration of templated Matrix, Vector and Option objects.

File:

• issm/trunk-jpl/src/c/classes/objects/Elements/Tria.h (modified) (7 diffs)

issm/trunk-jpl/src/c/classes/objects/Elements/Tria.h

@@ -71 +71 @@
                 /*}}}*/
                 /*Element virtual functions definitions: {{{*/
-                void   AverageOntoPartition(Vector* partition_contributions,Vector* partition_areas,IssmDouble* vertex_response,IssmDouble* qmu_part);
-                void   ComputeBasalStress(Vector* sigma_b);
-                void   ComputeStrainRate(Vector* eps);
+                void   AverageOntoPartition(Vector<IssmDouble>* partition_contributions,Vector<IssmDouble>* partition_areas,IssmDouble* vertex_response,IssmDouble* qmu_part);
+                void   ComputeBasalStress(Vector<IssmDouble>* sigma_b);
+                void   ComputeStrainRate(Vector<IssmDouble>* eps);
                 void   ComputeStressTensor();
                 void   Configure(Elements* elements,Loads* loads,DataSet* nodes,Materials* materials,Parameters* parameters);
                 void   SetCurrentConfiguration(Elements* elements,Loads* loads,DataSet* nodes,Materials* materials,Parameters* parameters);
-                void   CreateKMatrix(Matrix* Kff, Matrix* Kfs,Vector* df);
-                void   CreatePVector(Vector* pf);
-                void   CreateJacobianMatrix(Matrix* Jff);
+                void   CreateKMatrix(Matrix<IssmDouble>* Kff, Matrix<IssmDouble>* Kfs,Vector<IssmDouble>* df);
+                void   CreatePVector(Vector<IssmDouble>* pf);
+                void   CreateJacobianMatrix(Matrix<IssmDouble>* Jff);
                 void   Delta18oParameterization(void);
                 int    GetNodeIndex(Node* node);
@@ -88 +88 @@
                 bool   IsNodeOnShelfFromFlags(IssmDouble* flags);
                 bool   IsOnWater(); 
-                void   GetSolutionFromInputs(Vector* solution);
-                void   GetVectorFromInputs(Vector* vector, int name_enum);
-                void   GetVectorFromResults(Vector* vector,int offset,int enum_in,int interp);
+                void   GetSolutionFromInputs(Vector<IssmDouble>* solution);
+                void   GetVectorFromInputs(Vector<IssmDouble>* vector, int name_enum);
+                void   GetVectorFromResults(Vector<IssmDouble>* vector,int offset,int enum_in,int interp);
                 void   InputArtificialNoise(int enum_type,IssmDouble min, IssmDouble max);
                 bool   InputConvergence(IssmDouble* eps, int* enums,int num_enums,int* criterionenums,IssmDouble* criterionvalues,int num_criterionenums);
@@ -103 +103 @@
                 void   MigrateGroundingLine(IssmDouble* oldfloating,IssmDouble* sheet_ungrounding);
                 int    NodalValue(IssmDouble* pvalue, int index, int natureofdataenum,bool process_units);
-                void   PotentialSheetUngrounding(Vector* potential_sheet_ungrounding);
+                void   PotentialSheetUngrounding(Vector<IssmDouble>* potential_sheet_ungrounding);
                 void   PositiveDegreeDay(IssmDouble* pdds,IssmDouble* pds,IssmDouble signorm);
                 void   RequestedOutput(int output_enum,int step,IssmDouble time);
@@ -114 +114 @@
                 IssmDouble SurfaceArea(void);
                 void   Update(int index, IoModel* iomodel,int analysis_counter,int analysis_type);
-                int    UpdatePotentialSheetUngrounding(IssmDouble* vertices_potentially_ungrounding,Vector* vec_nodes_on_iceshelf,IssmDouble* nodes_on_iceshelf);
+                int    UpdatePotentialSheetUngrounding(IssmDouble* vertices_potentially_ungrounding,Vector<IssmDouble>* vec_nodes_on_iceshelf,IssmDouble* nodes_on_iceshelf);
                 IssmDouble TimeAdapt();
                 int*   GetHorizontalNeighboorSids(void);
-                void   SmearFunction(Vector* smearedvector,IssmDouble (*WeightFunction)(IssmDouble distance,IssmDouble radius),IssmDouble radius);
+                void   SmearFunction(Vector<IssmDouble>* smearedvector,IssmDouble (*WeightFunction)(IssmDouble distance,IssmDouble radius),IssmDouble radius);
 
                 #ifdef _HAVE_RESPONSES_
@@ -141 +141 @@
                 IssmDouble DragCoefficientAbsGradient(bool process_units,int weight_index);
                 void   GradientIndexing(int* indexing,int control_index);
-                void   Gradj(Vector* gradient,int control_type,int control_index);
-                void   GradjBGradient(Vector* gradient,int weight_index,int control_index);
-                void   GradjZGradient(Vector* gradient,int weight_index,int control_index);
-                void   GradjBMacAyeal(Vector* gradient,int control_index);
-                void   GradjZMacAyeal(Vector* gradient,int control_index);
-                void   GradjDragMacAyeal(Vector* gradient,int control_index);
-                void   GradjDragStokes(Vector* gradient,int control_index);
-                void   GradjDragGradient(Vector* gradient,int weight_index,int control_index);
-                void   GradjDhDtBalancedthickness(Vector* gradient,int control_index);
-                void   GradjVxBalancedthickness(Vector* gradient,int control_index);
-                void   GradjVyBalancedthickness(Vector* gradient,int control_index);
-                void   GetVectorFromControlInputs(Vector* gradient,int control_enum,int control_index,const char* data);
+                void   Gradj(Vector<IssmDouble>* gradient,int control_type,int control_index);
+                void   GradjBGradient(Vector<IssmDouble>* gradient,int weight_index,int control_index);
+                void   GradjZGradient(Vector<IssmDouble>* gradient,int weight_index,int control_index);
+                void   GradjBMacAyeal(Vector<IssmDouble>* gradient,int control_index);
+                void   GradjZMacAyeal(Vector<IssmDouble>* gradient,int control_index);
+                void   GradjDragMacAyeal(Vector<IssmDouble>* gradient,int control_index);
+                void   GradjDragStokes(Vector<IssmDouble>* gradient,int control_index);
+                void   GradjDragGradient(Vector<IssmDouble>* gradient,int weight_index,int control_index);
+                void   GradjDhDtBalancedthickness(Vector<IssmDouble>* gradient,int control_index);
+                void   GradjVxBalancedthickness(Vector<IssmDouble>* gradient,int control_index);
+                void   GradjVyBalancedthickness(Vector<IssmDouble>* gradient,int control_index);
+                void   GetVectorFromControlInputs(Vector<IssmDouble>* gradient,int control_enum,int control_index,const char* data);
                 void   SetControlInputsFromVector(IssmDouble* vector,int control_enum,int control_index);
-                void   ControlInputGetGradient(Vector* gradient,int enum_type,int control_index);
+                void   ControlInputGetGradient(Vector<IssmDouble>* gradient,int enum_type,int control_index);
                 void   ControlInputScaleGradient(int enum_type,IssmDouble scale);
                 void   ControlInputSetGradient(IssmDouble* gradient,int enum_type,int control_index);
@@ -212 +212 @@
                 ElementVector* CreatePVectorDiagnosticHutter(void);
                 ElementMatrix* CreateJacobianDiagnosticMacayeal(void);
-                void      GetSolutionFromInputsDiagnosticHoriz(Vector* solution);
-                void      GetSolutionFromInputsDiagnosticHutter(Vector* solution);
+                void      GetSolutionFromInputsDiagnosticHoriz(Vector<IssmDouble>* solution);
+                void      GetSolutionFromInputsDiagnosticHutter(Vector<IssmDouble>* solution);
                 void      InputUpdateFromSolutionDiagnosticHoriz( IssmDouble* solution);
                 void      InputUpdateFromSolutionDiagnosticHutter( IssmDouble* solution);
@@ -232 +232 @@
                 ElementVector* CreatePVectorHydrology(void);
                 void      CreateHydrologyWaterVelocityInput(void);
-                void      GetSolutionFromInputsHydrology(Vector* solution);
+                void      GetSolutionFromInputsHydrology(Vector<IssmDouble>* solution);
                 void      InputUpdateFromSolutionHydrology(IssmDouble* solution);
                 #endif