Changeset 9665

Timestamp:

Feb 11, 2015, 3:26:44 PM (10 years ago)

Author:

steve

Message:

Checkedtha that anuga works on linux

Location:

trunk

Files:

• anuga_core/anuga/__init__.py (modified) (1 diff)
• anuga_core/anuga/setup.py (modified) (1 diff)
• anuga_core/setup.cfg (modified) (1 diff)
• anuga_core/setup.py (modified) (1 diff)
• anuga_user_manual/source/anuga_user_manual.tex (modified) (10 diffs)
• anuga_user_manual/source/update_anuga_user_manual.py (modified) (1 diff)

trunk/anuga_core/anuga/__init__.py

@@ -79 +79 @@
     import os
     if sys.platform == 'win32':
-                MinGW = False
-                import subprocess
-                try:
-                        output = subprocess.check_output('gcc -dumpmachine', shell=True)
-                        MinGW = 'mingw' in output
-                except Exception as e:
-                        pass            
-                
+        MinGW = False
+        import subprocess
+        try:
+            output = subprocess.check_output('gcc -dumpmachine', shell=True)
+            MinGW = 'mingw' in output
+        except Exception as e:
+            pass
+        
         if not MinGW:
             (folder, tail) = os.path.split(__file__)

trunk/anuga_core/anuga/setup.py

@@ -34 +34 @@
     config.add_subpackage('validation_utilities')
     
-    config.add_data_dir('runtime_libs')
+    if sys.platform == 'win32':
+        config.add_data_dir('runtime_libs')
     
     try:

trunk/anuga_core/setup.cfg

@@ -12 +12 @@
 
 
-[pip]
-compiler=mingw32
+#[pip]
+#compiler=mingw32
 
-[build]
-compiler=mingw32
+#[build]
+#compiler=mingw32
 

trunk/anuga_core/setup.py

@@ -167 +167 @@
     # monkey patch distutils to use Microsoft VC++ for Python on win32
     if sys.platform == 'win32':
-                print('win32')
-                import setuptools
+        print('win32')
+        import setuptools
 
     setup_package()

trunk/anuga_user_manual/source/anuga_user_manual.tex

@@ -287 +287 @@
 
 What follows is a discussion of the structure and operation of a
-script called \file{runup.py} (which is available in the \file{demos} directory 
-of \file{anuga_core}.
+script called \file{runup.py} (which is available in the \file{examples} 
+directory of \file{anuga_core}.
 
 This example carries out the solution of the shallow-water wave
@@ -344 +344 @@
 
 \label{ref:runup_py_code}
-\verbatiminputunderscore{../../anuga_core/demos/runup.py}
+\verbatiminputunderscore{../../anuga_core/examples/runup.py}
 
 
@@ -731 +731 @@
 Here is the code for the first version of the channel flow \file{channel1.py}:
 
-\verbatiminputunderscore{demos/channel1.py}
+\verbatiminputunderscore{../../anuga_core/examples/channel1.py}
 
 In discussing the details of this example, we follow the outline
@@ -738 +738 @@
 \subsection{Establishing the Mesh}\index{mesh, establishing}
 
-In this example we use a similar simple structured triangular mesh as in \file{runup.py}
+In this example we use a similar simple structured triangular mesh 
+as in \file{runup.py}
 for simplicity, but this time we will use a symmetric one and also
 change the physical extent of the domain. The assignment:
@@ -848 +849 @@
 Here is the code for the third version of the channel flow \file{channel3.py}:
 
-\verbatiminputunderscore{demos/channel3.py}
+\verbatiminputunderscore{../../anuga_core/examples/channel3.py}
 
 This example differs from the first two versions in that the topography
@@ -933 +934 @@
 Here is the code for \file{runcairns.py}:
 
-\verbatiminputunderscore{../../anuga_core/demos/cairns/runcairns.py}
+\verbatiminputunderscore{../../anuga_core/examples/cairns/runcairns.py}
 
 In discussing the details of this example, we follow the outline
@@ -994 +995 @@
 \file{project.py}:
 
-\verbatiminputunderscore{../../anuga_core/demos/cairns/project.py}
+\verbatiminputunderscore{../../anuga_core/examples/cairns/project.py}
 
 Figure \ref{fig:cairns3d} illustrates the landscape of the region
@@ -1257 +1258 @@
 \file{ExportResults.py} demonstrates how this function can be used:
 
-\verbatiminputunderscore{demos/cairns/ExportResults.py}
+\verbatiminputunderscore{../../anuga_core/examples/cairns/ExportResults.py}
 
 The script generates a maximum water depth ASCII grid at a defined
@@ -1312 +1313 @@
 the gauges shown in Figure \ref{fig:cairnsgauges} is \file{gauges.csv}:
 
-\verbatiminputunderscore{demos/cairns/gauges.csv}
+\verbatiminputunderscore{../../anuga_core/examples/cairns/gauges.csv}
 
 Header information has been included to identify the location in terms of eastings and
@@ -1322 +1323 @@
 of the standard \code{anuga} release, however it can be downloaded and installed from \code{http://matplotlib.sourceforge.net/}
 
-\verbatiminputunderscore{demos/cairns/GetTimeseries.py}
+\verbatiminputunderscore{../../anuga_core/examples/cairns/GetTimeseries.py}
 
 Here, the time series for the quantities stage, depth and speed will be generated for

trunk/anuga_user_manual/source/update_anuga_user_manual.py

@@ -115 +115 @@
 
 system('cp *.pdf ../')
-system('mv *.pdf ../anuga_core/user_manual')
+system('mv *.pdf ../../anuga_core/user_manual')
 
 print 'Cleanup aux tex files'