Changeset 4174

Timestamp:

06/23/10 14:49:50 (15 years ago)

Author:

Mathieu Morlighem

Message:

moved AXPY type switch into inputs and fixed compilation

Location:

issm/trunk/src

Files:

• c/objects/Elements/Tria.cpp (modified) (2 diffs)
• c/objects/Inputs/BeamVertexInput.cpp (modified) (2 diffs)
• c/objects/Inputs/BoolInput.cpp (modified) (1 diff)
• c/objects/Inputs/DoubleInput.cpp (modified) (1 diff)
• c/objects/Inputs/IntInput.cpp (modified) (1 diff)
• c/objects/Inputs/PentaVertexInput.cpp (modified) (1 diff)
• c/objects/Inputs/SingVertexInput.cpp (modified) (1 diff)
• c/objects/Inputs/TriaVertexInput.cpp (modified) (1 diff)
• mex/VerticesDof/VerticesDof.cpp (modified) (2 diffs)

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

@@ -549 +549 @@
         double rho_ice,rho_water;
 
-        /*recover material parameters: */
-        rho_ice=matpar->GetRhoIce();
-        rho_water=matpar->GetRhoWater();
-
-        ISSMERROR("not supported yet!");
+        /*If shelf: hydrostatic equilibrium*/
+        if (this->GetShelf()){
+
+                /*recover material parameters: */
+                rho_ice=matpar->GetRhoIce();
+                rho_water=matpar->GetRhoWater();
+
+        }
+        /*If sheet: surface = bed + thickness*/
+        else{
+                ISSMERROR("not supported yet!");
+        }
 }
 /*}}}*/
@@ -5477 +5484 @@
 
         /*some checks: */
-        if(!xinput || !yinput)ISSMERROR("%s%s%s%s%s"," input ",EnumAsString(XEnum)," or input ",EnumAsString(YEnum)," could not be found!");
-        if(xinput->Enum()!=yinput->Enum())ISSMERROR("%s%s%s%s%s"," input ",EnumAsString(XEnum)," and input ",EnumAsString(YEnum)," are not of the same type!");
+        if(!xinput || !yinput) ISSMERROR("%s%s%s%s%s"," input ",EnumAsString(XEnum)," or input ",EnumAsString(YEnum)," could not be found!");
 
         /*Scale: */

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

@@ -23 +23 @@
 }
 /*}}}*/
-/*FUNCTION BeamVertexInput::BeamVertexInput(double* values){{{1*/
+/*FUNCTION BeamVertexInput::BeamVertexInput(int in_enum_type, double* values){{{1*/
 BeamVertexInput::BeamVertexInput(int in_enum_type,double* in_values){
 
@@ -269 +269 @@
         xbeamvertexinput=(BeamVertexInput*)xinput;
 
-        /*Carry out the AXPY operation:*/
-        for(i=0;i<numgrids;i++)this->values[i]=this->values[i]+scalar*xbeamvertexinput->values[i];
+        /*Carry out the AXPY operation depending on type:*/
+        switch(xinput->Enum()){
+
+                case BeamVertexInputEnum:
+                        for(i=0;i<numgrids;i++)this->values[i]=this->values[i]+scalar*xbeamvertexinput->values[i];
+                        return;
+
+                default:
+                        ISSMERROR("not implemented yet");
+        }
 
 }

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

@@ -236 +236 @@
         xboolinput=(BoolInput*)xinput;
 
-        /*Carry out the AXPY operation:*/
-        this->value=this->value+scalar*xboolinput->value;
+        /*Carry out the AXPY operation depending on type:*/
+        switch(xinput->Enum()){
+
+                case BoolInputEnum:
+                        this->value=(bool)(this->value+scalar*xboolinput->value);
+                        return;
+
+                default:
+                        ISSMERROR("not implemented yet");
+        }
 
 }

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

@@ -247 +247 @@
         xdoubleinput=(DoubleInput*)xinput;
 
-        /*Carry out the AXPY operation:*/
-        this->value=this->value+scalar*xdoubleinput->value;
+        /*Carry out the AXPY operation depending on type:*/
+        switch(xinput->Enum()){
+
+                case DoubleInputEnum:
+                        this->value=this->value+scalar*xdoubleinput->value;
+                        return;
+
+                default:
+                        ISSMERROR("not implemented yet");
+        }
 
 }

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

@@ -236 +236 @@
         xintinput=(IntInput*)xinput;
 
-        /*Carry out the AXPY operation:*/
-        dvalue=(double)this->value+scalar*(double)xintinput->value;
-        this->value=(int)dvalue;
+        /*Carry out the AXPY operation depending on type:*/
+        switch(xinput->Enum()){
+
+                case IntInputEnum:
+                        dvalue=(double)this->value+scalar*(double)xintinput->value;
+                        this->value=(int)dvalue;
+                        return;
+
+                default:
+                        ISSMERROR("not implemented yet");
+        }
 
 }

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

@@ -918 +918 @@
         xpentavertexinput=(PentaVertexInput*)xinput;
 
-        /*Carry out the AXPY operation:*/
-        for(i=0;i<numgrids;i++)this->values[i]=this->values[i]+scalar*xpentavertexinput->values[i];
+        /*Carry out the AXPY operation depending on type:*/
+        switch(xinput->Enum()){
+
+                case PentaVertexInputEnum:
+                        for(i=0;i<numgrids;i++)this->values[i]=this->values[i]+scalar*xpentavertexinput->values[i];
+                        return;
+
+                default:
+                        ISSMERROR("not implemented yet");
+        }
 
 }

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

@@ -237 +237 @@
         xsingvertexinput=(SingVertexInput*)xinput;
 
-        /*Carry out the AXPY operation:*/
-        this->value=this->value+scalar*xsingvertexinput->value;
+        /*Carry out the AXPY operation depending on type:*/
+        switch(xinput->Enum()){
+
+                case SingVertexInputEnum:
+                        this->value=this->value+scalar*xsingvertexinput->value;
+                        return;
+
+                default:
+                        ISSMERROR("not implemented yet");
+        }
 
 }

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

@@ -492 +492 @@
         xtriavertexinput=(TriaVertexInput*)xinput;
 
-        /*Carry out the AXPY operation:*/
-        for(i=0;i<numgrids;i++)this->values[i]=this->values[i]+scalar*xtriavertexinput->values[i];
+        /*Carry out the AXPY operation depending on type:*/
+        switch(xinput->Enum()){
+
+                case TriaVertexInputEnum :
+                        for(i=0;i<numgrids;i++)this->values[i]=this->values[i]+scalar*xtriavertexinput->values[i];
+                        return;
+
+                default :
+                        ISSMERROR("not implemented yet");
+        }
 
 }

issm/trunk/src/mex/VerticesDof/VerticesDof.cpp

@@ -15 +15 @@
 
         /* output datasets: */
-        Vec* partition=NULL;
-        Vec* tpartition=NULL;
+        Vec partition=NULL;
+        Vec tpartition=NULL;
 
         /*Boot module: */
@@ -32 +32 @@
 
         /*partition and tpartition should be incremented by 1: */
-        VecShift(partition->vector,1.0); //matlab indexing starts at 1.
-        VecShift(tpartition->vector,1.0);
+        VecShift(partition,1.0); //matlab indexing starts at 1.
+        VecShift(tpartition,1.0);
 
         /*write output datasets: */