Changeset 12878 for issm/branches/trunk-jpl-damage/src/c/modules/InputArtificialNoisex

Timestamp:

08/02/12 17:13:12 (13 years ago)

Author:

cborstad

Message:

merged trunk-jpl into trunk-jpl-damage through revision 12877

Location:

issm/branches/trunk-jpl-damage

Files:

• . (modified) (1 prop)
• src/c/modules/InputArtificialNoisex/InputArtificialNoisex.cpp (modified) (1 diff)
• src/c/modules/InputArtificialNoisex/InputArtificialNoisex.h (modified) (1 diff)

issm/branches/trunk-jpl-damage/src/c/modules/InputArtificialNoisex/InputArtificialNoisex.cpp

@@ -9 +9 @@
 #include "../../EnumDefinitions/EnumDefinitions.h"
 
-void InputArtificialNoisex( Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,int enum_name,double min,double max){
+void InputArtificialNoisex( Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,int enum_name,IssmDouble min,IssmDouble max){
 
         int i;

issm/branches/trunk-jpl-damage/src/c/modules/InputArtificialNoisex/InputArtificialNoisex.h

@@ -6 +6 @@
 #define _INPUTARTIFICIALNOISEX_H
 
-#include "../../objects/objects.h"
+#include "../../classes/objects/objects.h"
 #include "../../Container/Container.h"
 
 /* local prototypes: */
-void    InputArtificialNoisex( Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, Materials* materials,  Parameters* parameters,int enum_name,double min,double max);
+void    InputArtificialNoisex( Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, Materials* materials,  Parameters* parameters,int enum_name,IssmDouble min,IssmDouble max);
 
 #endif  /* _UPDATEINPUTSFROMVECTORXX_H */