Changeset 4253

Timestamp:

06/28/10 09:39:34 (15 years ago)

Author:

Mathieu Morlighem

Message:

Added Vz As output of diagnostics

Location:

issm/trunk/src/c

Files:

• EnumDefinitions/EnumAsString.cpp (modified) (2 diffs)
• EnumDefinitions/EnumDefinitions.h (modified) (1 diff)
• EnumDefinitions/StringAsEnum.cpp (modified) (2 diffs)
• objects/Elements/Penta.cpp (modified) (5 diffs)
• objects/Elements/Tria.cpp (modified) (5 diffs)
• solutions/diagnostic_core.cpp (modified) (1 diff)

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

@@ -199 +199 @@
                 case ThicknessEnum : return "Thickness";
                 case TypeEnum : return "Type";
+                case VelEnum : return "Vel";
+                case VelObsEnum : return "VelObs";
                 case ViscosityOvershootEnum : return "ViscosityOvershoot";
                 case VxAverageEnum : return "VxAverage";
@@ -232 +234 @@
                 case JEnum : return "J";
                 case PatchEnum : return "Patch";
+                case TimeEnum : return "Time";
                 case RelativeEnum : return "Relative";
                 case ResidualEnum : return "Residual";

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

@@ -227 +227 @@
         ThicknessEnum,
         TypeEnum,
+        VelEnum,
+        VelObsEnum,
         ViscosityOvershootEnum,
         VxAverageEnum,

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

@@ -197 +197 @@
         else if (strcmp(name,"Thickness")==0) return ThicknessEnum;
         else if (strcmp(name,"Type")==0) return TypeEnum;
+        else if (strcmp(name,"Vel")==0) return VelEnum;
+        else if (strcmp(name,"VelObs")==0) return VelObsEnum;
         else if (strcmp(name,"ViscosityOvershoot")==0) return ViscosityOvershootEnum;
         else if (strcmp(name,"VxAverage")==0) return VxAverageEnum;
@@ -230 +232 @@
         else if (strcmp(name,"J")==0) return JEnum;
         else if (strcmp(name,"Patch")==0) return PatchEnum;
+        else if (strcmp(name,"Time")==0) return TimeEnum;
         else if (strcmp(name,"Relative")==0) return RelativeEnum;
         else if (strcmp(name,"Residual")==0) return ResidualEnum;

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

@@ -1891 +1891 @@
 void  Penta::InputUpdateFromSolutionDiagnosticHoriz(double* solution){
         
-        
         int i;
 
@@ -1902 +1901 @@
         double       vx[numvertices];
         double       vy[numvertices];
+        double       vz[numvertices];
+        double       vel[numvertices];
         int          dummy;
         double       pressure[numvertices];
@@ -1908 +1909 @@
         double       xyz_list[numvertices][3];
         double       gauss[numvertices][numvertices]={{1,0,0,0},{0,1,0,0},{0,0,1,0},{1,0,0,1},{0,1,0,1},{0,0,1,1}};
-
         
+        Input*       VzInput=NULL;
+        double*      VzPtr=NULL;
+
         /*Get dof list: */
         GetDofList(&doflist[0],&dummy);
@@ -1926 +1929 @@
                 vy[i]=values[i*numdofpervertex+1];
         }
+
+        /*Get Vz*/
+        VzInput=inputs->GetInput(VzEnum);
+        if (VzInput){
+                if (VzInput->Enum()!=TriaVertexInputEnum){
+                        ISSMERROR("Cannot compute Vel as Vz is of type %s",EnumAsString(VzInput->Enum()));
+                }
+                VzInput->GetValuesPtr(&VzPtr,&dummy);
+                for(i=0;i<numvertices;i++) vz[i]=VzPtr[i];
+        }
+        else{
+                for(i=0;i<numvertices;i++) vz[i]=0.0;
+        }
+
+        /*Now Compute vel*/
+        for(i=0;i<numvertices;i++) vel[i]=pow( pow(vx[i],2.0) + pow(vy[i],2.0) + pow(vz[i],2.0) , 0.5);
 
         /*For pressure: we have not computed pressure in this analysis, for this element. We are in 3D, 
@@ -1945 +1964 @@
         this->inputs->AddInput(new PentaVertexInput(VxEnum,vx));
         this->inputs->AddInput(new PentaVertexInput(VyEnum,vy));
+        this->inputs->AddInput(new TriaVertexInput(VelEnum,vel));
         this->inputs->AddInput(new PentaVertexInput(PressureEnum,pressure));
 }

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

@@ -674 +674 @@
         double       vx[numvertices];
         double       vy[numvertices];
+        double       vz[numvertices];
+        double       vel[numvertices];
         double       pressure[numvertices];
         double       thickness[numvertices];
@@ -679 +681 @@
         double       gauss[numvertices][numvertices]={{1,0,0},{0,1,0},{0,0,1}};
 
-
         int          dummy;
+        Input*       VzInput=NULL;
+        double*      VzPtr=NULL;
         
         /*Get dof list: */
@@ -695 +698 @@
                 vy[i]=values[i*numdofpervertex+1];
         }
+
+        /*Get Vz*/
+        VzInput=inputs->GetInput(VzEnum);
+        if (VzInput){
+                if (VzInput->Enum()!=TriaVertexInputEnum){
+                        ISSMERROR("Cannot compute Vel as Vz is of type %s",EnumAsString(VzInput->Enum()));
+                }
+                VzInput->GetValuesPtr(&VzPtr,&dummy);
+                for(i=0;i<numvertices;i++) vz[i]=VzPtr[i];
+        }
+        else{
+                for(i=0;i<numvertices;i++) vz[i]=0.0;
+        }
+
+        /*Now Compute vel*/
+        for(i=0;i<numvertices;i++) vel[i]=pow( pow(vx[i],2.0) + pow(vy[i],2.0) + pow(vz[i],2.0) , 0.5);
 
         /*For pressure: we have not computed pressure in this analysis, for this element. We are in 2D, 
@@ -715 +734 @@
         this->inputs->AddInput(new TriaVertexInput(VxEnum,vx));
         this->inputs->AddInput(new TriaVertexInput(VyEnum,vy));
+        this->inputs->AddInput(new TriaVertexInput(VelEnum,vel));
         this->inputs->AddInput(new TriaVertexInput(PressureEnum,pressure));
-
 
 }
@@ -4929 +4948 @@
 }
 /*}}}*/
-/*FUNCTION Tria::Tria::SetClone {{{1*/
+/*FUNCTION Tria::SetClone {{{1*/
 void  Tria::SetClone(int* minranks){
 

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

@@ -87 +87 @@
         InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,VxEnum);
         InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,VyEnum);
+        InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,VelEnum);
         InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,PressureEnum);
-        if(dim==3) InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,VxEnum);
+        if(dim==3) InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,VzEnum);
 
-        
 }