Changeset 15130 for issm/trunk-jpl/src/c/classes/Elements/Penta.h

Timestamp:

05/28/13 15:16:02 (12 years ago)

Author:

Mathieu Morlighem

Message:

CHG: removing all process_units

File:

• issm/trunk-jpl/src/c/classes/Elements/Penta.h (modified) (4 diffs)

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

@@ -118 +118 @@
                 void   Update(int index, IoModel* iomodel,int analysis_counter,int analysis_type);
                 int    UpdatePotentialUngrounding(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);
+                int    NodalValue(IssmDouble* pvalue, int index, int natureofdataenum);
                 IssmDouble TimeAdapt();
                 int*   GetHorizontalNeighboorSids(void);
@@ -127 +127 @@
                 IssmDouble IceVolume(void);
                 IssmDouble TotalSmb(void);
-                void   MinVel(IssmDouble* pminvel, bool process_units);
-                void   MinVx(IssmDouble* pminvx, bool process_units);
-                void   MinVy(IssmDouble* pminvy, bool process_units);
-                void   MinVz(IssmDouble* pminvz, bool process_units);
-                IssmDouble MassFlux(IssmDouble* segment,bool process_units);
-                void   MaxAbsVx(IssmDouble* pmaxabsvx, bool process_units);
-                void   MaxAbsVy(IssmDouble* pmaxabsvy, bool process_units);
-                void   MaxAbsVz(IssmDouble* pmaxabsvz, bool process_units);
-                void   MaxVel(IssmDouble* pmaxvel, bool process_units);
+                void   MinVel(IssmDouble* pminvel);
+                void   MinVx(IssmDouble* pminvx);
+                void   MinVy(IssmDouble* pminvy);
+                void   MinVz(IssmDouble* pminvz);
+                IssmDouble MassFlux(IssmDouble* segment);
+                void   MaxAbsVx(IssmDouble* pmaxabsvx);
+                void   MaxAbsVy(IssmDouble* pmaxabsvy);
+                void   MaxAbsVz(IssmDouble* pmaxabsvz);
+                void   MaxVel(IssmDouble* pmaxvel);
                 void   ElementResponse(IssmDouble* presponse,int response_enum);
-                void   MaxVx(IssmDouble* pmaxvx, bool process_units);
-                void   MaxVy(IssmDouble* pmaxvy, bool process_units);
-                void   MaxVz(IssmDouble* pmaxvz, bool process_units);
+                void   MaxVx(IssmDouble* pmaxvx);
+                void   MaxVy(IssmDouble* pmaxvy);
+                void   MaxVz(IssmDouble* pmaxvz);
                 #endif
 
@@ -147 +147 @@
 
                 #ifdef _HAVE_CONTROL_
-                IssmDouble DragCoefficientAbsGradient(bool process_units,int weight_index);
+                IssmDouble DragCoefficientAbsGradient(int weight_index);
                 void   GradientIndexing(int* indexing,int control_index);
                 void   Gradj(Vector<IssmDouble>* gradient,int control_type,int control_index);
@@ -161 +161 @@
                 void   ControlInputScaleGradient(int enum_type,IssmDouble scale);
                 void   ControlInputSetGradient(IssmDouble* gradient,int enum_type,int control_index);
-                IssmDouble RheologyBbarAbsGradient(bool process_units,int weight_index);
-                IssmDouble ThicknessAbsMisfit(     bool process_units,int weight_index);
-                IssmDouble SurfaceAbsVelMisfit(    bool process_units,int weight_index);
-                IssmDouble SurfaceRelVelMisfit(    bool process_units,int weight_index);
-                IssmDouble SurfaceLogVelMisfit(    bool process_units,int weight_index);
-                IssmDouble SurfaceLogVxVyMisfit(   bool process_units,int weight_index);
-                IssmDouble SurfaceAverageVelMisfit(bool process_units,int weight_index);
-                IssmDouble ThicknessAbsGradient(bool process_units,int weight_index);
-                IssmDouble ThicknessAlongGradient( bool process_units,int weight_index){_error_("not supported");};
-                IssmDouble ThicknessAcrossGradient(bool process_units,int weight_index){_error_("not supported");};
-                IssmDouble BalancethicknessMisfit(bool process_units,int weight_index){_error_("not supported");};
+                IssmDouble RheologyBbarAbsGradient(int weight_index);
+                IssmDouble ThicknessAbsMisfit(     int weight_index);
+                IssmDouble SurfaceAbsVelMisfit(    int weight_index);
+                IssmDouble SurfaceRelVelMisfit(    int weight_index);
+                IssmDouble SurfaceLogVelMisfit(    int weight_index);
+                IssmDouble SurfaceLogVxVyMisfit(   int weight_index);
+                IssmDouble SurfaceAverageVelMisfit(int weight_index);
+                IssmDouble ThicknessAbsGradient(int weight_index);
+                IssmDouble ThicknessAlongGradient( int weight_index){_error_("not supported");};
+                IssmDouble ThicknessAcrossGradient(int weight_index){_error_("not supported");};
+                IssmDouble BalancethicknessMisfit(int weight_index){_error_("not supported");};
                 void   InputControlUpdate(IssmDouble scalar,bool save_parameter);
                 #endif