Changeset 4363

Timestamp:

06/30/10 15:25:10 (15 years ago)

Author:

Mathieu Morlighem

Message:

Added UpdateElementsControl.cpp to provide the control parameter to the element

Location:

issm/trunk/src/c

Files:

• Makefile.am (modified) (2 diffs)
• modules/ModelProcessorx/Control/UpdateElementsControl.cpp (added)
• modules/ModelProcessorx/CreateParameters.cpp (modified) (1 diff)
• modules/ModelProcessorx/ModelProcessorx.h (modified) (1 diff)
• objects/Elements/Tria.cpp (modified) (2 diffs)

issm/trunk/src/c/Makefile.am ¶

@@ -370 +370 @@
                                         ./modules/ModelProcessorx/SurfaceSlope/CreateLoadsSurfaceSlope.cpp\
                                         ./modules/ModelProcessorx/Control/CreateParametersControl.cpp\
+                                        ./modules/ModelProcessorx/Control/UpdateElementsControl.cpp\
                                         ./modules/ModelProcessorx/Thermal/UpdateElementsThermal.cpp\
                                         ./modules/ModelProcessorx/Thermal/CreateNodesThermal.cpp\
@@ -914 +915 @@
                                         ./modules/ModelProcessorx/SurfaceSlope/CreateLoadsSurfaceSlope.cpp\
                                         ./modules/ModelProcessorx/Control/CreateParametersControl.cpp\
+                                        ./modules/ModelProcessorx/Control/UpdateElementsControl.cpp\
                                         ./modules/ModelProcessorx/Thermal/UpdateElementsThermal.cpp\
                                         ./modules/ModelProcessorx/Thermal/CreateNodesThermal.cpp\

issm/trunk/src/c/modules/ModelProcessorx/CreateParameters.cpp ¶

@@ -107 +107 @@
         xfree((void**)&parameteroutput);
 
-
         /*Before returning, create parameters in case we are running Qmu or control types runs: */
         CreateParametersControl(&parameters,iomodel,iomodel_handle,analysis_type);

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

@@ -21 +21 @@
 void  CreateParametersControl(Parameters** pparameters,IoModel* iomodel,ConstDataHandle iomodel_handle,int analysis_type);
 void  CreateParametersQmu(Parameters** pparameters,IoModel* iomodel,ConstDataHandle iomodel_handle,int analysis_type);
+void    UpdateElementsControl(Elements* elements,IoModel* iomodel_handle,ConstDataHandle iomodel_handle,int analysis_counter,int analysis_type);
 
 /*Creation of fem datasets: specialised drivers: */

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

@@ -2165 +2165 @@
 }
 /*}}}*/
-/*FUNCTION Tria::Update(IoModel* iomodel,int analysis_counter,int analysis_type){{{1*/
+/*FUNCTION Tria::Update{{{1*/
 void Tria::Update(int index, IoModel* iomodel,int analysis_counter,int analysis_type){ //i is the element index
 
@@ -2221 +2221 @@
                 if (iomodel->drag_q) this->inputs->AddInput(new DoubleInput(DragQEnum,iomodel->drag_q[index]));
                 this->inputs->AddInput(new IntInput(DragTypeEnum,iomodel->drag_type));
+        }
+        if (iomodel->rheology_B) {
+                for(i=0;i<3;i++)nodeinputs[i]=iomodel->rheology_B[tria_vertex_ids[i]-1];
+                this->inputs->AddInput(new TriaVertexInput(RheologyBEnum,nodeinputs));
         }
         if (iomodel->melting_rate) {