Changeset 16137 for issm/trunk/src/c/classes/ElementResults/PentaP1ElementResult.cpp

Timestamp:

09/16/13 09:43:55 (12 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 16135

Location:

issm/trunk

Files:

• . (modified) (2 props)
• src (modified) (1 prop)
• src/c (modified) (1 prop)
• src/c/classes (modified) (1 prop)
• src/c/classes/ElementResults (modified) (1 prop)
• src/c/classes/ElementResults/PentaP1ElementResult.cpp (modified) (1 diff)

issm/trunk

@@ +1 @@
+nightlylog
+configure.sh
 par
 ad

@@ +1 @@
+nightlylog
+configure.sh
 par
 ad

issm/trunk/src/c

@@ -14 +14 @@
 probe.results
 stXXXX*
-
+.deps
+.dirstamp

@@ -14 +14 @@
 probe.results
 stXXXX*
-
+.deps
+.dirstamp

issm/trunk/src/c/classes/ElementResults/PentaP1ElementResult.cpp

@@ -78 +78 @@
 }
 /*}}}*/
-/*FUNCTION PentaP1ElementResult::SpawnTriaElementResult{{{*/
-ElementResult* PentaP1ElementResult::SpawnTriaElementResult(int* indices){
-
-        /*output*/
-        TriaP1ElementResult* outresult=NULL;
-        IssmDouble newvalues[3];
-
-        /*Loop over the new indices*/
-        for(int i=0;i<3;i++){
-
-                /*Check index value*/
-                _assert_(indices[i]>=0 && indices[i]<6);
-
-                /*Assign value to new result*/
-                newvalues[i]=this->values[indices[i]];
-        }
-
-        /*Create new Tria result*/
-        outresult=new TriaP1ElementResult(this->enum_type,&newvalues[0],this->step,this->time);
-
-        /*Assign output*/
-        return outresult;
-
-}
-/*}}}*/
 /*FUNCTION PentaP1ElementResult::NumberOfNodalValues{{{*/
 int PentaP1ElementResult::NumberOfNodalValues(void){

@@ +1 @@
+nightlylog
+configure.sh
 par
 ad

@@ -14 +14 @@
 probe.results
 stXXXX*
-
+.deps
+.dirstamp