Changeset 4064

Timestamp:

06/21/10 11:13:48 (15 years ago)

Author:

Eric.Larour

Message:

Renamed ExtrudeInputx to InputExtrudex

Location:

issm/trunk/src/c

Files:

• DataSet/DataSet.cpp (modified) (1 diff)
• DataSet/DataSet.h (modified) (1 diff)
• Makefile.am (modified) (2 diffs)
• modules/DepthAverageInputx/DepthAverageInputx.cpp (modified) (2 diffs)
• modules/ExtrudeInputx (deleted)
• modules/InputExtrudex (added)
• modules/InputExtrudex/InputExtrudex.cpp (added)
• modules/InputExtrudex/InputExtrudex.h (added)
• modules/modules.h (modified) (1 diff)
• solutions/balancedthickness_core.cpp (modified) (1 diff)
• solutions/balancedvelocities_core.cpp (modified) (1 diff)
• solutions/bedslope_core.cpp (modified) (1 diff)
• solutions/prognostic_core.cpp (modified) (1 diff)
• solutions/surfaceslope_core.cpp (modified) (1 diff)
• solutions/transient2d.cpp (modified) (1 diff)
• solvers/solver_diagnostic_nonlinear.cpp (modified) (1 diff)

issm/trunk/src/c/DataSet/DataSet.cpp

@@ -685 +685 @@
         xfree((void**)&alltruedofs);
 
-}
-/*}}}*/
-/*FUNCTION DataSet::InputExtrude(int enum_type) {{{1*/
-void  DataSet::InputExtrude(int enum_type){
-        
-        vector<Object*>::iterator object;
-        Penta* penta=NULL;
-
-        for ( object=objects.begin() ; object < objects.end(); object++ ){
-
-                if((*object)->Enum()==PentaEnum){
-                        penta=(Penta*)(*object);
-                        penta->InputExtrude(enum_type);
-                }
-        }
 }
 /*}}}*/

issm/trunk/src/c/DataSet/DataSet.h

@@ -78 +78 @@
                 void  MeltingConstraints(int* pconverged, int* pnum_unstable_constraints);
                 DataSet* Copy(void);
-                void  InputExtrude(int enum_type);
                 int   DeleteObject(Object* object);
                 void  OutputRifts(Vec riftproperties);

issm/trunk/src/c/Makefile.am

@@ -524 +524 @@
                                         ./modules/InputConvergencex/InputConvergencex.cpp\
                                         ./modules/InputConvergencex/InputConvergencex.h\
-                                        ./modules/ExtrudeInputx/ExtrudeInputx.cpp\
-                                        ./modules/ExtrudeInputx/ExtrudeInputx.h\
+                                        ./modules/InputExtrudex/InputExtrudex.cpp\
+                                        ./modules/InputExtrudex/InputExtrudex.h\
                                         ./modules/OutputRiftsx/OutputRiftsx.h\
                                         ./modules/OutputRiftsx/OutputRiftsx.cpp\
@@ -1038 +1038 @@
                                         ./modules/InputConvergencex/InputConvergencex.cpp\
                                         ./modules/InputConvergencex/InputConvergencex.h\
-                                        ./modules/ExtrudeInputx/ExtrudeInputx.cpp\
-                                        ./modules/ExtrudeInputx/ExtrudeInputx.h\
+                                        ./modules/InputExtrudex/InputExtrudex.cpp\
+                                        ./modules/InputExtrudex/InputExtrudex.h\
                                         ./modules/OutputRiftsx/OutputRiftsx.h\
                                         ./modules/OutputRiftsx/OutputRiftsx.cpp\

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

@@ -4 +4 @@
 
 #include "./DepthAverageInputx.h"
-
+#include "../InputExtrudex/InputExtrudex.h"
 #include "../../shared/shared.h"
 #include "../../include/include.h"
@@ -25 +25 @@
         }
 
+
         /*Then extrude vertically the new inputs*/
-        elements->InputExtrude(average_enum_type);
+        InputExtrudex( elements,nodes,vertices,loads,materials,parameters,enum_type);
 }

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

@@ -63 +63 @@
 #include "./SplitSolutionVectorx/SplitSolutionVectorx.h"
 #include "./DepthAverageInputx/DepthAverageInputx.h"
-#include "./ExtrudeInputx/ExtrudeInputx.h"
+#include "./InputExtrudex/InputExtrudex.h"
 #include "./InputToResultx/InputToResultx.h"
 #include "./GetSolutionFromInputsx/GetSolutionFromInputsx.h"

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

@@ -34 +34 @@
 
         _printf_("extrude computed thickness on all layers:\n");
-        ExtrudeInputx(femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters,ThicknessEnum);
+        InputExtrudex(femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters,ThicknessEnum);
 
         if(verbose)_printf_("saving results:\n");

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

@@ -33 +33 @@
 
         _printf_("extrude computed velocity on all layers:\n");
-        ExtrudeInputx(femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters,VxEnum);
-        ExtrudeInputx(femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters,VyEnum);
+        InputExtrudex(femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters,VxEnum);
+        InputExtrudex(femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters,VyEnum);
 
         if(verbose)_printf_("saving results:\n");

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

@@ -33 +33 @@
         if (dim==3){
                 if(verbose)_printf_("%s\n","extruding bed in 3d...");
-                ExtrudeInputx(femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters,BedSlopeXEnum);
-                ExtrudeInputx(femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters,BedSlopeYEnum);
+                InputExtrudex(femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters,BedSlopeXEnum);
+                InputExtrudex(femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters,BedSlopeYEnum);
         }
         

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

@@ -30 +30 @@
                 
         _printf_("extrude computed thickness on all layers:\n");
-        ExtrudeInputx(femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters,ThicknessEnum);
+        InputExtrudex(femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters,ThicknessEnum);
 
         if(verbose)_printf_("saving results:\n");

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

@@ -33 +33 @@
         if (dim==3){
                 if(verbose)_printf_("%s\n","extruding slope in 3d...");
-                ExtrudeInputx(femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters,SurfaceSlopeXEnum);
-                ExtrudeInputx(femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters,SurfaceSlopeYEnum);
+                InputExtrudex(femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters,SurfaceSlopeXEnum);
+                InputExtrudex(femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters,SurfaceSlopeYEnum);
         }
         

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

@@ -61 +61 @@
 
         _printf_("create finite element model:\n");
-        femmodel=new FemModel(fid,solution_type,analyses,7);
+        femmodel=new FemModel(fid,solution_type,analyses,2);
 
         /*add outputfilename in parameters: */

issm/trunk/src/c/solvers/solver_diagnostic_nonlinear.cpp

@@ -137 +137 @@
         if (dim==3){
                 if(verbose)_printf_("%s\n","extruding velocity and pressure in 3d...");
-                ExtrudeInputx( fem->elements,fem->nodes,fem->vertices,fem->loads,fem->materials,fem->parameters,VxEnum);
-                ExtrudeInputx( fem->elements,fem->nodes,fem->vertices,fem->loads,fem->materials,fem->parameters,VyEnum);
+                InputExtrudex( fem->elements,fem->nodes,fem->vertices,fem->loads,fem->materials,fem->parameters,VxEnum);
+                InputExtrudex( fem->elements,fem->nodes,fem->vertices,fem->loads,fem->materials,fem->parameters,VyEnum);
         }