Changeset 13395 for issm/trunk/src/c/modules/ModelProcessorx/Thermal/CreateLoadsThermal.cpp

Timestamp:

09/19/12 09:32:34 (12 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 13393

Location:

issm/trunk

Files:

• . (modified) (2 props)
• src (modified) (1 prop)
• src/c/modules/ModelProcessorx/Thermal/CreateLoadsThermal.cpp (modified) (2 diffs)

issm/trunk

@@ +1 @@
+projects
 autom4te.cache
 aclocal.m4

@@ +1 @@
+projects
 autom4te.cache
 aclocal.m4

issm/trunk/src/c/modules/ModelProcessorx/Thermal/CreateLoadsThermal.cpp

@@ -6 +6 @@
 #include "../../../io/io.h"
 #include "../../../EnumDefinitions/EnumDefinitions.h"
-#include "../../../objects/objects.h"
+#include "../../../classes/objects/objects.h"
 #include "../../../shared/shared.h"
 #include "../../../include/include.h"
@@ -33 +33 @@
 
         /*return if 2d mesh*/
-        if (dim==2) _error2_("2d meshes not supported yet");
+        if (dim==2) _error_("2d meshes not supported yet");
 
         //create penalties for nodes: no node can have a temperature over the melting point

@@ +1 @@
+projects
 autom4te.cache
 aclocal.m4