Changeset 13216 for issm/trunk-jpl/src/c/classes/objects/Elements/Penta.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/Penta.h (modified) (7 diffs)

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

@@ -74 +74 @@
                 /*}}}*/
                 /*Element virtual functions definitions: {{{*/
-                void   AverageOntoPartition(Vector* partition_contributions,Vector* partition_areas,IssmDouble* vertex_response,IssmDouble* qmu_part);
+                void   AverageOntoPartition(Vector<IssmDouble>* partition_contributions,Vector<IssmDouble>* partition_areas,IssmDouble* vertex_response,IssmDouble* qmu_part);
                 void   BasalFrictionCreateInput(void);
-                void   ComputeBasalStress(Vector* sigma_b);
-                void   ComputeStrainRate(Vector* eps);
+                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);
                 void   DeleteResults(void);
                 int    GetNodeIndex(Node* node);
-                void   GetSolutionFromInputs(Vector* solution);
+                void   GetSolutionFromInputs(Vector<IssmDouble>* solution);
                 IssmDouble GetZcoord(GaussPenta* gauss);
-                void   GetVectorFromInputs(Vector* vector,int name_enum);
-                void   GetVectorFromResults(Vector* vector,int offset,int name_enum,int interp);
+                void   GetVectorFromInputs(Vector<IssmDouble>* vector,int name_enum);
+                void   GetVectorFromResults(Vector<IssmDouble>* vector,int offset,int name_enum,int interp);
                 
                 int    Sid();
@@ -103 +103 @@
                 void   InputToResult(int enum_type,int step,IssmDouble time);
                 void   MigrateGroundingLine(IssmDouble* old_floating_ice,IssmDouble* sheet_ungrounding);
-                void   PotentialSheetUngrounding(Vector* potential_sheet_ungrounding);
+                void   PotentialSheetUngrounding(Vector<IssmDouble>* potential_sheet_ungrounding);
                 void   RequestedOutput(int output_enum,int step,IssmDouble time);
                 void   ListResultsInfo(int** results_enums,int** results_size,IssmDouble** results_times,int** results_steps,int* num_results);
@@ -114 +114 @@
                 IssmDouble SurfaceArea(void);
                 void   Update(int index, IoModel* iomodel,int analysis_counter,int analysis_type);
-                int    UpdatePotentialSheetUngrounding(IssmDouble* potential_sheet_ungrounding,Vector* vec_nodes_on_iceshelf,IssmDouble* nodes_on_iceshelf);
+                int    UpdatePotentialSheetUngrounding(IssmDouble* potential_sheet_ungrounding,Vector<IssmDouble>* vec_nodes_on_iceshelf,IssmDouble* nodes_on_iceshelf);
                 int    NodalValue(IssmDouble* pvalue, int index, int natureofdataenum,bool process_units);
                 IssmDouble TimeAdapt();
                 int*   GetHorizontalNeighboorSids(void);
                 void   ViscousHeatingCreateInput(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_
@@ -142 +142 @@
                 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   GradjDragMacAyeal(Vector* gradient,int control_index);
-                void   GradjDragPattyn(Vector* gradient,int control_index);
-                void   GradjDragStokes(Vector* gradient,int control_index);
-                void   GradjBbarMacAyeal(Vector* gradient,int control_index);
-                void   GradjBbarPattyn(Vector* gradient,int control_index);
-                void   GradjBbarStokes(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   GradjDragMacAyeal(Vector<IssmDouble>* gradient,int control_index);
+                void   GradjDragPattyn(Vector<IssmDouble>* gradient,int control_index);
+                void   GradjDragStokes(Vector<IssmDouble>* gradient,int control_index);
+                void   GradjBbarMacAyeal(Vector<IssmDouble>* gradient,int control_index);
+                void   GradjBbarPattyn(Vector<IssmDouble>* gradient,int control_index);
+                void   GradjBbarStokes(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);
@@ -183 +183 @@
                 void    GetInputValue(IssmDouble* pvalue,Node* node,int enumtype);
                 void      GetPhi(IssmDouble* phi, IssmDouble*  epsilon, IssmDouble viscosity);
-                void      GetSolutionFromInputsEnthalpy(Vector* solutiong);
+                void      GetSolutionFromInputsEnthalpy(Vector<IssmDouble>* solutiong);
                 IssmDouble  GetStabilizationParameter(IssmDouble u, IssmDouble v, IssmDouble w, IssmDouble diameter, IssmDouble kappa);
                 void    GetStrainRate3dPattyn(IssmDouble* epsilon,IssmDouble* xyz_list, GaussPenta* gauss, Input* vx_input, Input* vy_input);
@@ -254 +254 @@
                 void           InputUpdateFromSolutionDiagnosticVert( IssmDouble* solutiong);
                 void           InputUpdateFromSolutionDiagnosticStokes( IssmDouble* solutiong);
-                void             GetSolutionFromInputsDiagnosticHoriz(Vector* solutiong);
-                void             GetSolutionFromInputsDiagnosticHutter(Vector* solutiong);
-                void             GetSolutionFromInputsDiagnosticStokes(Vector* solutiong);
-                void             GetSolutionFromInputsDiagnosticVert(Vector* solutiong);
+                void             GetSolutionFromInputsDiagnosticHoriz(Vector<IssmDouble>* solutiong);
+                void             GetSolutionFromInputsDiagnosticHutter(Vector<IssmDouble>* solutiong);
+                void             GetSolutionFromInputsDiagnosticStokes(Vector<IssmDouble>* solutiong);
+                void             GetSolutionFromInputsDiagnosticVert(Vector<IssmDouble>* solutiong);
                 ElementVector* CreatePVectorCouplingMacAyealStokes(void);
                 ElementVector* CreatePVectorCouplingMacAyealStokesViscous(void);
@@ -313 +313 @@
                 ElementVector* CreatePVectorThermalShelf(void);
                 ElementVector* CreatePVectorThermalSheet(void);
-                void           GetSolutionFromInputsThermal(Vector* solutiong);
+                void           GetSolutionFromInputsThermal(Vector<IssmDouble>* solutiong);
                 void           InputUpdateFromSolutionThermal( IssmDouble* solutiong);
                 void           InputUpdateFromSolutionEnthalpy( IssmDouble* solutiong);