Changeset 9641

Timestamp:

Feb 8, 2015, 11:30:09 PM (10 years ago)

Author:

steve

Message:

Finding MICROSOFT compiler bugs

Location:

trunk/anuga_core

Files:

• LICENCE.txt (moved) (moved from trunk/anuga_core/LICENSE.txt)
• MANIFEST.in (modified) (1 diff)
• anuga/__init__.py (modified) (1 diff)
• anuga/pymetis/metis-4.0/metis.h (modified) (1 diff)
• anuga/tsunami_source/setup.py (modified) (1 diff)
• anuga/utilities/util_ext.h (modified) (3 diffs)

trunk/anuga_core/MANIFEST.in

@@ -4 +4 @@
 include LICENCE.txt
 recursive-include tools *
-recursive-include user_manual *
+recursive-include doc *
 recursive-include examples *
 recursive-include anuga *

trunk/anuga_core/anuga/__init__.py

@@ -24 +24 @@
 test = Tester().test
 
+
+# PEP0440 compatible formatted version, see:
+# https://www.python.org/dev/peps/pep-0440/
+#
+# Generic release markers:
+# X.Y
+# X.Y.Z # For bugfix releases
+#
+# Admissible pre-release markers:
+# X.YaN # Alpha release
+# X.YbN # Beta release
+# X.YrcN # Release Candidate
+# X.Y # Final release
+#
+# Dev branch marker is: 'X.Y.dev' or 'X.Y.devN' where N is an integer.
+#
+__version__ = '1.3.5'
+
+__svn_revision__ = filter(str.isdigit, "$Revision$")
+
 #from anuga.__metadata__ import  __date__, __author__
 
-from .version import git_revision as __git_revision__
-from .version import svn_revision as __svn_revision__
-from .version import version as __version__
+#from .version import git_revision as __git_revision__
+#from .version import svn_revision as __svn_revision__
+
+
+
 
 

trunk/anuga_core/anuga/pymetis/metis-4.0/metis.h

@@ -19 +19 @@
 #include <malloc.h>
 #endif
+#ifdef _WIN32
+#include <string.h>
+#else
 #include <strings.h>
-#include <string.h>
+#endif
 #include <ctype.h>
 #include <math.h>

trunk/anuga_core/anuga/tsunami_source/setup.py

@@ -16 +16 @@
     config.add_data_dir(join('tests','data'))
 
-
-    config.add_extension('okada_tsunami_fortran',
-                         sources=['okada_tsunami_fortran.f'])
+    if sys.platform != 'win32':
+        config.add_extension('okada_tsunami_fortran',
+                            sources=['okada_tsunami_fortran.f'])
 
     

trunk/anuga_core/anuga/utilities/util_ext.h

@@ -28 +28 @@
 #define P_ERROR_BUFFER_SIZE 65
 
+#ifdef _WIN32
+#define __func__ __FUNCTION__
+#endif
 
 // check that numpy array objects are C contiguous memory
@@ -58 +61 @@
 
 
+#ifdef _WIN32
+
+#else
 double max(double x, double y) {  
   //Return maximum of two doubles
@@ -72 +78 @@
   else return y;
 }
-
+#endif
 
 double sign(double x) {