Changeset 4935

Timestamp:

08/02/10 15:16:44 (15 years ago)

Author:

seroussi

Message:

remove MaterialUpdateFromTemperature module and TemperatureAverage Enum

Location:

issm/trunk/src/c

Files:

• EnumDefinitions/EnumAsString.cpp (modified) (1 diff)
• EnumDefinitions/EnumDefinitions.h (modified) (1 diff)
• EnumDefinitions/StringAsEnum.cpp (modified) (1 diff)
• Makefile.am (modified) (2 diffs)
• modules/MaterialUpdateFromTemperaturex (deleted)
• modules/modules.h (modified) (1 diff)
• objects/Elements/Element.h (modified) (1 diff)
• objects/Elements/Penta.cpp (modified) (2 diffs)
• objects/Elements/Penta.h (modified) (1 diff)
• solutions/steadystate_core.cpp (modified) (1 diff)
• solutions/transient3d_core.cpp (modified) (1 diff)

issm/trunk/src/c/EnumDefinitions/EnumAsString.cpp

@@ -197 +197 @@
                 case TemperatureEnum : return "Temperature";
                 case TemperatureOldEnum : return "TemperatureOld";
-                case TemperatureAverageEnum : return "TemperatureAverage";
                 case ThicknessEnum : return "Thickness";
                 case TypeEnum : return "Type";

issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h

@@ -224 +224 @@
         TemperatureEnum,
         TemperatureOldEnum,
-        TemperatureAverageEnum,
         ThicknessEnum,
         TypeEnum,

issm/trunk/src/c/EnumDefinitions/StringAsEnum.cpp

@@ -195 +195 @@
         else if (strcmp(name,"Temperature")==0) return TemperatureEnum;
         else if (strcmp(name,"TemperatureOld")==0) return TemperatureOldEnum;
-        else if (strcmp(name,"TemperatureAverage")==0) return TemperatureAverageEnum;
         else if (strcmp(name,"Thickness")==0) return ThicknessEnum;
         else if (strcmp(name,"Type")==0) return TypeEnum;

issm/trunk/src/c/Makefile.am

@@ -554 +554 @@
                                         ./modules/InputExtrudex/InputExtrudex.cpp\
                                         ./modules/InputExtrudex/InputExtrudex.h\
-                                        ./modules/MaterialUpdateFromTemperaturex/MaterialUpdateFromTemperaturex.cpp\
-                                        ./modules/MaterialUpdateFromTemperaturex/MaterialUpdateFromTemperaturex.h\
                                         ./modules/OutputRiftsx/OutputRiftsx.h\
                                         ./modules/OutputRiftsx/OutputRiftsx.cpp\
@@ -1097 +1095 @@
                                         ./modules/InputExtrudex/InputExtrudex.cpp\
                                         ./modules/InputExtrudex/InputExtrudex.h\
-                                        ./modules/MaterialUpdateFromTemperaturex/MaterialUpdateFromTemperaturex.cpp\
-                                        ./modules/MaterialUpdateFromTemperaturex/MaterialUpdateFromTemperaturex.h\
                                         ./modules/OutputRiftsx/OutputRiftsx.h\
                                         ./modules/OutputRiftsx/OutputRiftsx.cpp\

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

@@ -43 +43 @@
 #include "./InputUpdateFromVectorx/InputUpdateFromVectorx.h"
 #include "./MassFluxx/MassFluxx.h"
-#include "./MaterialUpdateFromTemperaturex/MaterialUpdateFromTemperaturex.h"
 #include "./MaxAbsVxx/MaxAbsVxx.h"
 #include "./MaxAbsVyx/MaxAbsVyx.h"

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

@@ -54 +54 @@
                 virtual void   UpdateGeometry(void)=0;
                 virtual void   InputToResult(int enum_type,int step,double time)=0;
-                virtual void   MaterialUpdateFromTemperature(void)=0;
                 virtual void   ProcessResultsUnits(void)=0;
                 virtual void   MinVel(double* pminvel, bool process_units)=0;

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

@@ -1183 +1183 @@
 double Penta::MassFlux( double* segment){
         ISSMERROR(" not supported yet!");
-}
-/*}}}*/
-/*FUNCTION Penta::MaterialUpdateFromTemperature{{{1*/
-void  Penta::MaterialUpdateFromTemperature(void){
-
-        /*Intermediaries*/
-        double Taverage;
-        double B;
-
-        /*inputs: */
-        bool   collapse;
-        Input *TempInput = NULL;
-        Input *RheologyBInput = NULL;
-
-        /*retrieve inputs :*/
-        inputs->GetParameterValue(&collapse,CollapseEnum);
-
-        if (collapse){
-                /*find temperature average*/
-                this->inputs->GetParameterAverage(&Taverage,TemperatureAverageEnum);
-        }
-        else{
-                /*find 3d temperature*/
-                this->inputs->GetParameterAverage(&Taverage,TemperatureEnum);
-        }
-
-        /*Get B from T using Paterson*/
-        B=Paterson(Taverage);
-
-        /*Add input to Matice*/
-        this->matice->inputs->AddInput(new DoubleInput(RheologyBEnum,B));
-
 }
 /*}}}*/
@@ -5342 +5310 @@
                                 name==VzEnum ||
                                 name==TemperatureEnum ||
-                                name==TemperatureAverageEnum ||
                                 name==RheologyBEnum ||
                                 name==RheologyNEnum ||

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

@@ -93 +93 @@
                 void   InputScale(int enum_type,double scale_factor);
                 void   InputToResult(int enum_type,int step,double time);
-                void   MaterialUpdateFromTemperature(void);
                 double MassFlux(double* segment);
                 void   MaxAbsVx(double* pmaxabsvx, bool process_units);

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

@@ -35 +35 @@
                 thermal_core(femmodel);
 
-                if(verbose)_printf_("%s\n","computing depth average temperature");
-                InputDepthAveragex(femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters,TemperatureEnum,TemperatureAverageEnum);
-        
-                if(verbose)_printf_("%s\n","update B from temperature");
-                MaterialUpdateFromTemperaturex(femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters);
-
                 if(verbose)_printf_("%s\n","computing new velocity");
                 diagnostic_core(femmodel);

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

@@ -47 +47 @@
                 thermal_core_step(femmodel,step,time);
 
-                if(verbose)_printf_("%s\n","computing depth average temperature");
-                InputDepthAveragex(femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters,TemperatureEnum,TemperatureAverageEnum);
-
-                if(verbose)_printf_("%s\n","update B from temperature");
-                MaterialUpdateFromTemperaturex(femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters);
-
                 if(verbose)_printf_("%s\n","computing new velocity");
                 diagnostic_core(femmodel);