Changeset 3928

Timestamp:

05/24/10 16:39:14 (15 years ago)

Author:

seroussi

Message:

completed some routines needed for Hutter 3d

Location:

issm/trunk/src/c/objects

Files:

• Elements/Beam.cpp (modified) (2 diffs)
• Elements/Beam.h (modified) (1 diff)
• Elements/Sing.cpp (modified) (1 diff)
• Inputs/BeamVertexInput.cpp (modified) (2 diffs)

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

@@ -247 +247 @@
 }
 /*}}}*/
+/*FUNCTION Beam::IsInput{{{1*/
+bool Beam::IsInput(int name){
+        if (name==SurfaceSlopexEnum ||
+                                name==SurfaceSlopeyEnum){
+                return true;
+        }
+        else return false;
+}
+/*}}}*/
 /*FUNCTION Beam::Marshall{{{1*/
 void  Beam::Marshall(char** pmarshalled_dataset){
@@ -761 +770 @@
 /*FUNCTION Beam::UpdateInputsFromVector(double* vector, int name, int type);{{{1*/
 void  Beam::UpdateInputsFromVector(double* vector, int name, int type){
-        ISSMERROR(" not supported yet!");
+
+        /*Check that name is an element input*/
+        if (!IsInput(name)) return;
+        Node**  nodes=NULL;
+
+        switch(type){
+
+                case VertexEnum:
+
+                        /*New PentaVertexInpu*/
+                        double values[2];
+
+                        /*Get values on the 6 vertices*/
+                        nodes=(Node**)hnodes.deliverp();
+                        for (int i=0;i<2;i++){
+                                values[i]=vector[nodes[i]->GetVertexDof()];
+                        }
+
+                        /*update input*/
+                        this->inputs->AddInput(new BeamVertexInput(name,values));
+                        return;
+
+                default:
+
+                        ISSMERROR("type %i (%s) not implemented yet",type,EnumAsString(type));
+        }
 }
 /*}}}*/

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

@@ -48 +48 @@
                 int   Enum();
                 int   Id(); 
+                bool  IsInput(int name);
                 int   MyRank();
                 void  Configure(DataSet* elements,DataSet* loads,DataSet* nodes,DataSet* materials,Parameters* parameters);

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

@@ -561 +561 @@
 void  Sing::UpdateInputsFromVector(double* vector, int name, int type){
 
-        Node*  node=NULL;
         /*Check that name is an element input*/
         if (!IsInput(name)) return;
+        Node*  node=NULL;
 
         switch(type){

issm/trunk/src/c/objects/Inputs/BeamVertexInput.cpp

@@ -155 +155 @@
 /*}}}*/
 /*FUNCTION BeamVertexInput::GetParameterValue(double* pvalue,double* gauss){{{1*/
-void BeamVertexInput::GetParameterValue(double* pvalue,double* gauss){ISSMERROR(" not supported yet!");}
+void BeamVertexInput::GetParameterValue(double* pvalue,double* gauss){
+        *pvalue=gauss[0]*values[0]+gauss[1]*values[1];
+}
 /*}}}*/
 /*FUNCTION BeamVertexInput::GetParameterValue(double* pvalue,double* gauss,double defaultvalue){{{1*/
@@ -161 +163 @@
 /*}}}*/
 /*FUNCTION BeamVertexInput::GetParameterValues(double* values,double* gauss_pointers, int numgauss){{{1*/
-void BeamVertexInput::GetParameterValues(double* values,double* gauss_pointers, int numgauss){ISSMERROR(" not supported yet!");}
+void BeamVertexInput::GetParameterValues(double* pvalues,double* gauss_pointers, int numgauss){
+        /*It is assumed that output has been correctly allocated*/
+
+        int i,j;
+        double gauss[2];
+
+        for(i=0;i<numgauss;i++){
+                /*Get current Gauss point coordinates*/
+                for (j=0;j<2;j++) gauss[j]=gauss_pointers[i*2+j];
+
+                /*Assign parameter value*/
+                GetParameterValue(&values[i],&gauss[0]);
+        }
+}
 /*}}}*/
 /*FUNCTION BeamVertexInput::GetParameterDerivativeValue(double* derivativevalues, double* xyz_list, double* gauss){{{1*/