Changeset 4073

Timestamp:

06/21/10 11:29:00 (15 years ago)

Author:

Eric.Larour

Message:

renamde DepthAverageInputx to InputDepthAveragex

Location:

issm/trunk/src/c

Files:

• Makefile.am (modified) (2 diffs)
• modules/InputDepthAveragex/InputDepthAveragex.cpp (modified) (3 diffs)
• modules/InputDepthAveragex/InputDepthAveragex.h (modified) (2 diffs)
• modules/modules.h (modified) (1 diff)
• objects/Elements/Beam.h (modified) (1 diff)
• objects/Elements/Element.h (modified) (1 diff)
• objects/Elements/Penta.cpp (modified) (1 diff)
• objects/Elements/Penta.h (modified) (1 diff)
• objects/Elements/Sing.h (modified) (1 diff)
• objects/Elements/Tria.cpp (modified) (1 diff)
• objects/Elements/Tria.h (modified) (1 diff)
• solutions/balancedthickness2_core.cpp (modified) (1 diff)
• solutions/balancedthickness_core.cpp (modified) (1 diff)
• solutions/balancedvelocities_core.cpp (modified) (1 diff)
• solutions/prognostic_core.cpp (modified) (1 diff)
• solutions/steadystate_core.cpp (modified) (1 diff)
• solutions/transient3d_core.cpp (modified) (1 diff)

issm/trunk/src/c/Makefile.am

@@ -516 +516 @@
                                         ./modules/FieldDepthAveragex/FieldDepthAveragex.cpp\
                                         ./modules/FieldDepthAveragex/FieldDepthAveragex.h\
-                                        ./modules/DepthAverageInputx/DepthAverageInputx.cpp\
-                                        ./modules/DepthAverageInputx/DepthAverageInputx.h\
+                                        ./modules/InputDepthAveragex/InputDepthAveragex.cpp\
+                                        ./modules/InputDepthAveragex/InputDepthAveragex.h\
                                         ./modules/VecExtrudex/VecExtrudex.cpp\
                                         ./modules/VecExtrudex/VecExtrudex.h\
@@ -1030 +1030 @@
                                         ./modules/FieldDepthAveragex/FieldDepthAveragex.cpp\
                                         ./modules/FieldDepthAveragex/FieldDepthAveragex.h\
-                                        ./modules/DepthAverageInputx/DepthAverageInputx.cpp\
-                                        ./modules/DepthAverageInputx/DepthAverageInputx.h\
+                                        ./modules/InputDepthAveragex/InputDepthAveragex.cpp\
+                                        ./modules/InputDepthAveragex/InputDepthAveragex.h\
                                         ./modules/VecExtrudex/VecExtrudex.cpp\
                                         ./modules/VecExtrudex/VecExtrudex.h\

issm/trunk/src/c/modules/InputDepthAveragex/InputDepthAveragex.cpp

@@ -1 @@
-/*!\file DepthAverageInputx
+/*!\file InputDepthAveragex
  * \brief: average field throfieldh thickness
  */
 
-#include "./DepthAverageInputx.h"
+#include "./InputDepthAveragex.h"
 #include "../InputExtrudex/InputExtrudex.h"
 #include "../../shared/shared.h"
@@ -10 +10 @@
 #include "../../EnumDefinitions/EnumDefinitions.h"
 
-void DepthAverageInputx( DataSet* elements,DataSet* nodes, DataSet* vertices, DataSet* loads, DataSet* materials, Parameters* parameters,int enum_type,int average_enum_type){
+void InputDepthAveragex( DataSet* elements,DataSet* nodes, DataSet* vertices, DataSet* loads, DataSet* materials, Parameters* parameters,int enum_type,int average_enum_type){
         
         /*Intermediary*/
@@ -22 +22 @@
         for (i=0;i<elements->Size();i++){
                 element=(Element*)elements->GetObjectByOffset(i);
-                element->DepthAverageInputAtBase(enum_type,average_enum_type);
+                element->InputDepthAverageAtBase(enum_type,average_enum_type);
         }
 

issm/trunk/src/c/modules/InputDepthAveragex/InputDepthAveragex.h

@@ -1 @@
-/*!\file:  DepthAverageInputx.h
+/*!\file:  InputDepthAveragex.h
  * \brief header file for averaging a field throfieldh thickness
  */ 
@@ -9 +9 @@
 
 /* local prototypes: */
-void DepthAverageInputx( DataSet* elements,DataSet* nodes, DataSet* vertices, DataSet* loads, DataSet* materials, Parameters* parameters,int enum_type,int average_enum_type);
+void InputDepthAveragex( DataSet* elements,DataSet* nodes, DataSet* vertices, DataSet* loads, DataSet* materials, Parameters* parameters,int enum_type,int average_enum_type);
 
 #endif  /* _DEPTHAVERAGEINPUTX_H */

issm/trunk/src/c/modules/modules.h

@@ -62 +62 @@
 #include "./BamgConvertMeshx/BamgConvertMeshx.h"
 #include "./SplitSolutionVectorx/SplitSolutionVectorx.h"
-#include "./DepthAverageInputx/DepthAverageInputx.h"
+#include "./InputDepthAveragex/InputDepthAveragex.h"
 #include "./InputExtrudex/InputExtrudex.h"
 #include "./InputToResultx/InputToResultx.h"

issm/trunk/src/c/objects/Elements/Beam.h

@@ -62 +62 @@
                 void  UpdateInputsFromConstant(bool constant, int name){ISSMERROR("Not implemented yet!");}
                 void  UpdateInputsFromSolution(double* solution);
-                void  DepthAverageInputAtBase(int enum_type,int average_enum_type){ISSMERROR("not implemented yet");};
+                void  InputDepthAverageAtBase(int enum_type,int average_enum_type){ISSMERROR("not implemented yet");};
                 void  InputToResult(int enum_type,int step,double time);
                 void   ProcessResultsUnits(void);

issm/trunk/src/c/objects/Elements/Element.h

@@ -43 +43 @@
                 virtual double CostFunction(void)=0;
                 virtual double SurfaceArea(void)=0;
-                virtual void   DepthAverageInputAtBase(int enum_type,int average_enum_type)=0;
+                virtual void   InputDepthAverageAtBase(int enum_type,int average_enum_type)=0;
                 virtual void   ComputeBasalStress(Vec sigma_b)=0;
                 virtual void   ComputePressure(Vec p_g)=0;

issm/trunk/src/c/objects/Elements/Penta.cpp

@@ -3367 +3367 @@
 }
 /*}}}*/
-/*FUNCTION Penta::DepthAverageInputAtBase{{{1*/
-void  Penta::DepthAverageInputAtBase(int enum_type,int average_enum_type){
+/*FUNCTION Penta::InputDepthAverageAtBase{{{1*/
+void  Penta::InputDepthAverageAtBase(int enum_type,int average_enum_type){
         ISSMERROR("Not implemented yet (see Penta::InputExtrude and Node::FieldDepthAverageAtBase)");
 }

issm/trunk/src/c/objects/Elements/Penta.h

@@ -112 +112 @@
                 void  VecExtrude(Vec vector,double* vector_serial,int iscollapsed);
                 void  InputExtrude(int enum_type);
-                void  DepthAverageInputAtBase(int enum_type,int average_enum_type);
+                void  InputDepthAverageAtBase(int enum_type,int average_enum_type);
                 void  ComputeBasalStress(Vec sigma_bg);
                 void  ComputePressure(Vec p_gg);

issm/trunk/src/c/objects/Elements/Sing.h

@@ -62 +62 @@
                 void  UpdateInputsFromConstant(bool constant, int name){ISSMERROR("Not implemented yet!");}
                 void  UpdateInputsFromSolution(double* solutiong);
-                void  DepthAverageInputAtBase(int enum_type,int average_enum_type){ISSMERROR("not implemented yet");};
+                void  InputDepthAverageAtBase(int enum_type,int average_enum_type){ISSMERROR("not implemented yet");};
                 void  InputToResult(int enum_type,int step,double time);
                 void   ProcessResultsUnits(void);

issm/trunk/src/c/objects/Elements/Tria.cpp

@@ -5016 +5016 @@
 }
 /*}}}*/
-/*FUNCTION Tria::DepthAverageInputAtBase {{{1*/
-void  Tria::DepthAverageInputAtBase(int enum_type,int average_enum_type){
+/*FUNCTION Tria::InputDepthAverageAtBase {{{1*/
+void  Tria::InputDepthAverageAtBase(int enum_type,int average_enum_type){
 
         /*New input*/

issm/trunk/src/c/objects/Elements/Tria.h

@@ -55 +55 @@
                 int   MyRank(void);
                 void  SetClone(int* minranks);
-                void  DepthAverageInputAtBase(int enum_type,int average_enum_type);
+                void  InputDepthAverageAtBase(int enum_type,int average_enum_type);
                 void*  SpawnSing(int g0);
                 void*  SpawnBeam(int g0, int g1);

issm/trunk/src/c/solutions/balancedthickness2_core.cpp

@@ -26 +26 @@
 
         _printf_("depth averaging velocity...\n");
-        DepthAverageInputx(femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters,VxEnum,VxAverageEnum);
-        DepthAverageInputx(femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters,VyEnum,VyAverageEnum);
-        if(dim==3) DepthAverageInputx(femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters,VzEnum,VzAverageEnum);
+        InputDepthAveragex(femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters,VxEnum,VxAverageEnum);
+        InputDepthAveragex(femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters,VyEnum,VyAverageEnum);
+        if(dim==3) InputDepthAveragex(femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters,VzEnum,VzAverageEnum);
 
 

issm/trunk/src/c/solutions/balancedthickness_core.cpp

@@ -26 +26 @@
 
         _printf_("depth averaging velocity...\n");
-        DepthAverageInputx(femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters,VxEnum,VxAverageEnum);
-        DepthAverageInputx(femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters,VyEnum,VyAverageEnum);
-        if(dim==3) DepthAverageInputx(femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters,VzEnum,VzAverageEnum);
+        InputDepthAveragex(femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters,VxEnum,VxAverageEnum);
+        InputDepthAveragex(femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters,VyEnum,VyAverageEnum);
+        if(dim==3) InputDepthAveragex(femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters,VzEnum,VzAverageEnum);
 
         _printf_("call computational core:\n");

issm/trunk/src/c/solutions/balancedvelocities_core.cpp

@@ -25 +25 @@
 
         _printf_("depth averaging velocity...\n");
-        DepthAverageInputx(femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters,VxEnum,VxAverageEnum);
-        DepthAverageInputx(femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters,VyEnum,VyAverageEnum);
-        if(dim==3) DepthAverageInputx(femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters,VzEnum,VzAverageEnum);
+        InputDepthAveragex(femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters,VxEnum,VxAverageEnum);
+        InputDepthAveragex(femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters,VyEnum,VyAverageEnum);
+        if(dim==3) InputDepthAveragex(femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters,VzEnum,VzAverageEnum);
 
         _printf_("call computational core:\n");

issm/trunk/src/c/solutions/prognostic_core.cpp

@@ -23 +23 @@
 
         _printf_("depth averaging velocity...\n");
-        DepthAverageInputx(femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters,VxEnum,VxAverageEnum);
-        DepthAverageInputx(femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters,VyEnum,VyAverageEnum);
+        InputDepthAveragex(femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters,VxEnum,VxAverageEnum);
+        InputDepthAveragex(femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters,VyEnum,VyAverageEnum);
         
         _printf_("call computational core:\n");

issm/trunk/src/c/solutions/steadystate_core.cpp

@@ -34 +34 @@
 
                 if(verbose)_printf_("%s\n","computing depth average temperature");
-                DepthAverageInputx(femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters,TemperatureEnum,TemperatureAverageEnum);
+                InputDepthAveragex(femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters,TemperatureEnum,TemperatureAverageEnum);
         
                 if(verbose)_printf_("%s\n","computing new velocity");

issm/trunk/src/c/solutions/transient3d_core.cpp

@@ -43 +43 @@
 
                 if(verbose)_printf_("%s\n","computing depth average temperature");
-                DepthAverageInputx(femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters,TemperatureEnum,TemperatureAverageEnum);
+                InputDepthAveragex(femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters,TemperatureEnum,TemperatureAverageEnum);
 
                 if(verbose)_printf_("%s\n","computing new velocity");