Changeset 19105 for issm/trunk/src/c/modules/InputDepthAverageAtBasex/InputDepthAverageAtBasex.cpp

Timestamp:

02/12/15 16:48:40 (10 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 19103

Location:

issm/trunk

Files:

• . (modified) (2 props)
• src (modified) (1 prop)
• src/c (modified) (1 prop)
• src/c/modules (modified) (1 prop)
• src/c/modules/InputDepthAverageAtBasex/InputDepthAverageAtBasex.cpp (modified) (1 diff)

issm/trunk

@@ +1 @@
+build-fw
+build-ad
 nightlylog
 configure.sh

@@ +1 @@
+build-fw
+build-ad
 nightlylog
 configure.sh

issm/trunk/src/c

@@ -5 +5 @@
 *.obj
 *.exe
+issm
+kriging
 appscan.*
 ouncemake*
@@ -14 +16 @@
 probe.results
 stXXXX*
-.deps
-.dirstamp
+*.deps
+*.dirstamp
 .libs

@@ -5 +5 @@
 *.obj
 *.exe
+issm
+kriging
 appscan.*
 ouncemake*
@@ -14 +16 @@
 probe.results
 stXXXX*
-.deps
-.dirstamp
+*.deps
+*.dirstamp
 .libs

issm/trunk/src/c/modules/InputDepthAverageAtBasex/InputDepthAverageAtBasex.cpp

@@ -10 +10 @@
 void InputDepthAverageAtBasex(FemModel* femmodel,int original_enum, int new_enum){
         for(int i=0;i<femmodel->elements->Size();i++){
-                Element* element=dynamic_cast<Element*>(femmodel->elements->GetObjectByOffset(i));
+                Element* element=xDynamicCast<Element*>(femmodel->elements->GetObjectByOffset(i));
                 element->InputDepthAverageAtBase(original_enum,new_enum);
         }

@@ +1 @@
+build-fw
+build-ad
 nightlylog
 configure.sh

@@ -5 +5 @@
 *.obj
 *.exe
+issm
+kriging
 appscan.*
 ouncemake*
@@ -14 +16 @@
 probe.results
 stXXXX*
-.deps
-.dirstamp
+*.deps
+*.dirstamp
 .libs