Changeset 5930

Timestamp:

09/21/10 16:20:56 (14 years ago)

Author:

seroussi

Message:

pattynstokes type elements allowed in stokes

File:

• issm/trunk/src/c/objects/Elements/Penta.cpp (modified) (2 diffs)

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

@@ -3478 +3478 @@
         if(IsOnWater()) return NULL;
         inputs->GetParameterValue(&approximation,ApproximationEnum);
-        if(approximation!=StokesApproximationEnum) return NULL;
+        if(approximation!=StokesApproximationEnum && approximation!=PattynStokesApproximationEnum) return NULL;
         ElementVector* pe=NewElementVector(nodes,NUMVERTICES,this->parameters,StokesApproximationEnum);
 
@@ -3578 +3578 @@
         if(IsOnWater() || !IsOnBed() || !IsOnShelf()) return NULL;
         inputs->GetParameterValue(&approximation,ApproximationEnum);
-        if(approximation!=StokesApproximationEnum) return NULL;
+        if(approximation!=StokesApproximationEnum && approximation!=PattynStokesApproximationEnum) return NULL;
         ElementVector* pe=NewElementVector(nodes,NUMVERTICES,this->parameters,StokesApproximationEnum);