Changeset 4266

Timestamp:

Feb 18, 2007, 6:34:41 AM (17 years ago)

Author:

jack

Message:

Fix syntax error in benchmark_least_squares.py.
Updated the SConstruct to actually work with recent versions.

Location:

anuga_core/source/anuga

Files:

• SConstruct (modified) (1 diff)
• fit_interpolate/benchmark_least_squares.py (modified) (1 diff)

anuga_core/source/anuga/SConstruct

@@ -135 +135 @@
 mesh_install_dir = os.path.join(install_root, 'mesh_engine')
 
-triang = mesh_env.SharedLibrary(os.path.join(mesh_dir, 'triang'), map(lambda s: os.path.join(mesh_dir, s), ['triangle.c', 'triang.c']))
-triangle = mesh_env.SharedLibrary(os.path.join(mesh_dir, 'triangle'), map(lambda s: os.path.join(mesh_dir, s), ['triangle.c']))
-env.Install(mesh_install_dir, triang)
-env.Install(mesh_install_dir, triangle)
+mesh_c_layer = mesh_env.SharedLibrary(os.path.join(mesh_dir, 'mesh_engine_c_layer'), map(lambda s: os.path.join(mesh_dir, s), ['mesh_engine_c_layer.c', 'triangle.c']))
+#triang = mesh_env.SharedLibrary(os.path.join(mesh_dir, 'triang'), map(lambda s: os.path.join(mesh_dir, s), ['triangle.c']))
+#triangle = mesh_env.SharedLibrary(os.path.join(mesh_dir, 'triangle'), map(lambda s: os.path.join(mesh_dir, s), ['triangle.c']))
+#env.Install(mesh_install_dir, triang)
+#env.Install(mesh_install_dir, triangle)
+env.Install(mesh_install_dir, mesh_c_layer)
 
 # Utilities

anuga_core/source/anuga/fit_interpolate/benchmark_least_squares.py

@@ -118 +118 @@
                                          points_dict['point_attributes'])
                     G1.export_points_file(fileName, absolute=True)
-                    calc = interp.fit(fileName), verbose=verbose)
+                    calc = interp.fit(fileName, verbose=verbose)
                     os.remove(fileName)