Changeset 10703

Timestamp:

11/17/11 13:53:36 (13 years ago)

Author:

Eric.Larour

Message:

Added ElementResponsex module, to handle responses where we are averaging
inputs over a certain element.

Location:

issm/trunk/src

Files:

• c/Makefile.am (modified) (1 diff)
• c/modules/ElementResponsex (added)
• c/modules/ElementResponsex/ElementResponsex.cpp (added)
• c/modules/ElementResponsex/ElementResponsex.h (added)
• c/modules/Responsex/Responsex.cpp (modified) (1 diff)
• c/modules/RheologyBbarx (deleted)
• c/modules/modules.h (modified) (2 diffs)
• c/objects/Elements/Element.h (modified) (1 diff)
• c/objects/Elements/Penta.cpp (modified) (2 diffs)
• c/objects/Elements/Penta.h (modified) (2 diffs)
• c/objects/Elements/Tria.cpp (modified) (1 diff)
• c/objects/Elements/Tria.h (modified) (2 diffs)
• m/classes/qmu.m (modified) (1 diff)
• m/usr/larour/Alias/cdhal.m (added)

issm/trunk/src/c/Makefile.am

@@ -529 +529 @@
                                              ./modules/IceVolumex/IceVolumex.h\
                                              ./modules/IceVolumex/IceVolumex.cpp\
-                                             ./modules/RheologyBbarx/RheologyBbarx.cpp\
-                                             ./modules/RheologyBbarx/RheologyBbarx.h\
+                                             ./modules/ElementResponsex/ElementResponsex.h\
+                                             ./modules/ElementResponsex/ElementResponsex.cpp\
                                              ./modules/MassFluxx/MassFluxx.cpp\
                                              ./modules/MassFluxx/MassFluxx.h

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

@@ -43 +43 @@
                 case RheologyBbarAbsGradientEnum:RheologyBbarAbsGradientx( responses, elements,nodes, vertices, loads, materials, parameters,process_units,weight_index); break;
                 case DragCoefficientAbsGradientEnum:DragCoefficientAbsGradientx(responses, elements,nodes, vertices, loads, materials, parameters,process_units,weight_index); break;
-                case MaterialsRheologyBbarEnum:RheologyBbarx(responses, elements,nodes, vertices, loads, materials, parameters,process_units); break;
+                case MaterialsRheologyBbarEnum:ElementResponsex(responses, elements,nodes, vertices, loads, materials, parameters,MaterialsRheologyBbarEnum,process_units); break;
+                case VelEnum:ElementResponsex(responses, elements,nodes, vertices, loads, materials, parameters,VelEnum,process_units); break;
                 case FrictionCoefficientEnum:NodalValuex(responses, FrictionCoefficientEnum,elements,nodes, vertices, loads, materials, parameters,process_units); break;
                 default: _error_(" response descriptor \"%s\" not supported yet!",response_descriptor); break;

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

@@ -66 +66 @@
 #include "./MaxAbsVzx/MaxAbsVzx.h"
 #include "./MaxVelx/MaxVelx.h"
+#include "./ElementResponsex/ElementResponsex.h"
 #include "./MaxVxx/MaxVxx.h"
 #include "./MaxVyx/MaxVyx.h"
@@ -99 +100 @@
 #include "./ResetCoordinateSystemx/ResetCoordinateSystemx.h"
 #include "./Responsex/Responsex.h"
-#include "./RheologyBbarx/RheologyBbarx.h"
 #include "./RheologyBbarAbsGradientx/RheologyBbarAbsGradientx.h"
 #include "./Scotchx/Scotchx.h"

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

@@ -83 +83 @@
                 virtual void   MaxAbsVz(double* pmaxabsvz, bool process_units)=0;
                 virtual double MassFlux(double* segment,bool process_units)=0;
-                virtual double RheologyBbarx(void)=0;
+                virtual void   ElementResponse(double* presponse,int response_enum,bool process_units)=0;
                 virtual double IceVolume(void)=0;
                 virtual int    NodalValue(double* pvalue, int index, int natureofdataenum,bool process_units)=0;

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

@@ -2862 +2862 @@
 }
 /*}}}*/
-/*FUNCTION Penta::RheologyBbarx{{{1*/
-double Penta::RheologyBbarx(void){
-
-        double Bbar;
-        Penta* base=NULL;
-        
-        /*We here compute the vertically averaged Bbar. To do so, we go to the 
-         * base element under this one, and call this->InputDepthAverageAtBase:*/
-                
-        base=this;
-
-        if(!base->IsOnBed()){
-
-                for(;;){
-                        base=base->verticalneighbors[0];
-                        if(base->IsOnBed())break;
-                }
-        }
-
-        /*We have found the base under this. Call InputDepthAverageAtBase on it: */
-        base->InputDepthAverageAtBase(MaterialsRheologyBEnum,MaterialsRheologyBbarEnum,MaterialsEnum);
-
-        /*Ok, base->matice now has the Bbar. Ask Bbar from this enum: */
-        Bbar=base->matice->GetBbar();
-
-        return Bbar;
-}
-/*}}}*/
 /*FUNCTION Penta::NodalValue {{{1*/
 int    Penta::NodalValue(double* pvalue, int index, int natureofdataenum,bool process_units){
@@ -3068 +3040 @@
         /*Assign output pointers:*/
         *pmaxvz=maxvz;
+}
+/*}}}*/
+/*FUNCTION Penta::ElementResponse{{{1*/
+void Penta::ElementResponse(double* presponse,int response_enum,bool process_units){
+
+        switch(response_enum){
+                case MaterialsRheologyBbarEnum:
+                        *presponse=this->matice->GetBbar();
+                        break;
+                case VelEnum:
+
+                        /*Get input:*/
+                        double vel;
+                        Input* vel_input;
+
+                        vel_input=this->inputs->GetInput(VelEnum); _assert_(vel_input);
+                        vel_input->GetInputAverage(&vel);
+
+                        /*process units if requested: */
+                        if(process_units) vel=UnitConversion(vel,IuToExtEnum,VelEnum);
+
+                        /*Assign output pointers:*/
+                        *presponse=vel;
+                default:  
+                        _error_("Response type %s not supported yet!",EnumToStringx(response_enum));
+        }
+
 }
 /*}}}*/

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

@@ -125 +125 @@
                 void   MinVy(double* pminvy, bool process_units);
                 void   MinVz(double* pminvz, bool process_units);
-                double RheologyBbarx(void);
                 int    NodalValue(double* pvalue, int index, int natureofdataenum,bool process_units);
                 double MassFlux(double* segment,bool process_units);
@@ -132 +131 @@
                 void   MaxAbsVz(double* pmaxabsvz, bool process_units);
                 void   MaxVel(double* pmaxvel, bool process_units);
+                void   ElementResponse(double* presponse,int response_enum,bool process_units);
                 void   MaxVx(double* pmaxvx, bool process_units);
                 void   MaxVy(double* pmaxvy, bool process_units);

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

@@ -2634 +2634 @@
 }
 /*}}}*/
-/*FUNCTION Tria::RheologyBbarx{{{1*/
-double Tria::RheologyBbarx(void){
-
-        return this->matice->GetBbar();
+/*FUNCTION Tria::ElementResponse{{{1*/
+void Tria::ElementResponse(double* presponse,int response_enum,bool process_units){
+
+        switch(response_enum){
+                case MaterialsRheologyBbarEnum:
+                        *presponse=this->matice->GetBbar();
+                        break;
+                case VelEnum:
+
+                        /*Get input:*/
+                        double vel;
+                        Input* vel_input;
+
+                        vel_input=this->inputs->GetInput(VelEnum); _assert_(vel_input);
+                        vel_input->GetInputAverage(&vel);
+
+                        /*process units if requested: */
+                        if(process_units) vel=UnitConversion(vel,IuToExtEnum,VelEnum);
+
+                        /*Assign output pointers:*/
+                        *presponse=vel;
+                default:  
+                        _error_("Response type %s not supported yet!",EnumToStringx(response_enum));
+        }
 
 }

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

@@ -123 +123 @@
                 void   MinVy(double* pminvy, bool process_units);
                 void   MinVz(double* pminvz, bool process_units);
-                double RheologyBbarx(void);
                 int    NodalValue(double* pvalue, int index, int natureofdataenum,bool process_units);
                 double MassFlux(double* segment,bool process_units);
@@ -129 +128 @@
                 void   MaxAbsVy(double* pmaxabsvy, bool process_units);
                 void   MaxAbsVz(double* pmaxabsvz, bool process_units);
+                void   ElementResponse(double* presponse,int response_enum,bool process_units);
                 void   MaxVel(double* pmaxvel, bool process_units);
                 void   MaxVx(double* pmaxvx, bool process_units);

issm/trunk/src/m/classes/qmu.m

@@ -126 +126 @@
                         end
                         for i=1:numel(obj.params)
-                                disp(sprintf('         qmu_params%s:  (array of method-independent parameters)',...
+                                disp(sprintf('         params%s:  (array of method-independent parameters)',...
                                         string_dim(obj.params,i)));
                                 fnames=fieldnames(obj.params(i));