Changeset 3647

Timestamp:

Sep 21, 2006, 3:20:23 PM (18 years ago)

Author:

ole

Message:

Rearranging okushiri

Location:

anuga_validation/okushiri_2005

Files:

• create_okushiri.py (modified) (1 diff)
• lwru2.py (modified) (4 diffs)
• okushiri_parallel.py (modified) (1 diff)

anuga_validation/okushiri_2005/create_okushiri.py

@@ -6 +6 @@
 #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
+from Numeric import array, zeros, Float, allclose
+
 from anuga.pmesh.mesh import *
 from anuga.coordinate_transforms.geo_reference import Geo_reference
 
+import project
+
+
+def prepare_timeboundary(filename):
+    """Converting benchmark 2 time series to NetCDF tms file.
+    This is a 'throw-away' code taylor made for files like
+    'Benchmark_2_input.txt' from the LWRU2 benchmark
+    """
+
+    print 'Preparing time boundary from %s' %filename
+    from Numeric import array
+
+    fid = open(filename)
+
+    #Skip first line
+    line = fid.readline()
+
+    #Read remaining lines
+    lines = fid.readlines()
+    fid.close()
+
+
+    N = len(lines)
+    T = zeros(N, Float)  #Time
+    Q = zeros(N, Float)  #Values
+
+    for i, line in enumerate(lines):
+        fields = line.split()
+
+        T[i] = float(fields[0])
+        Q[i] = float(fields[1])
+
+
+    #Create tms file
+    from Scientific.IO.NetCDF import NetCDFFile
+
+    outfile = filename[:-4] + '.tms'
+    print 'Writing to', outfile
+    fid = NetCDFFile(outfile, 'w')
+
+    fid.institution = 'Geoscience Australia'
+    fid.description = 'Input wave for Benchmark 2'
+    fid.starttime = 0.0
+    fid.createDimension('number_of_timesteps', len(T))
+    fid.createVariable('time', Float, ('number_of_timesteps',))
+    fid.variables['time'][:] = T
+
+    fid.createVariable('stage', Float, ('number_of_timesteps',))
+    fid.variables['stage'][:] = Q[:]
+
+    fid.createVariable('xmomentum', Float, ('number_of_timesteps',))
+    fid.variables['xmomentum'][:] = 0.0
+
+    fid.createVariable('ymomentum', Float, ('number_of_timesteps',))
+    fid.variables['ymomentum'][:] = 0.0
+
+    fid.close()
+
+
 #-------------------------------------------------------------
 if __name__ == "__main__":
 
+    #Preparing points
+    #(Only when using original Benchmark_2_Bathymetry.txt file)
+    #from anuga.abstract_2d_finite_volumes.data_manager import xya2pts
+    #xya2pts(project.bathymetry_filename, verbose = True,
+    #        z_func = lambda z: -z)
+
+
+
+
+
+    # Prepare time boundary
+    prepare_timeboundary(project.boundary_filename)
+
+
+    # Create Mesh
 
     #Basic geometry

anuga_validation/okushiri_2005/lwru2.py

@@ -10 +10 @@
 """
 
+# Module imports
+from Numeric import array, zeros, Float, allclose
+
+from anuga.shallow_water import Domain
+from anuga.shallow_water import Reflective_boundary
+from anuga.shallow_water import Transmissive_Momentum_Set_Stage_boundary
+from anuga.abstract_2d_finite_volumes.util import file_function
+
+import project
+
+
+#-------------------------
+# Create Domain
+#-------------------------
 
 use_variable_mesh = True #Use large variable mesh generated by create_mesh.py
 #use_variable_mesh = False #Use small structured mesh for speed
 
-
-#import sys
-#from os import sep
-#sys.path.append('..'+sep+'..'+sep) #FIXME: Shouldn't be necessary
-
-def prepare_timeboundary(filename):
-    """Converting benchmark 2 time series to NetCDF tms file.
-    This is a 'throw-away' code taylor made for files like
-    'Benchmark_2_input.txt' from the LWRU2 benchmark
-    """
-
-    print 'Preparing time boundary from %s' %filename
-    from Numeric import array
-
-    fid = open(filename)
-
-    #Skip first line
-    line = fid.readline()
-
-    #Read remaining lines
-    lines = fid.readlines()
-    fid.close()
-
-
-    N = len(lines)
-    T = zeros(N, Float)  #Time
-    Q = zeros(N, Float)  #Values
-
-    for i, line in enumerate(lines):
-        fields = line.split()
-
-        T[i] = float(fields[0])
-        Q[i] = float(fields[1])
-
-
-    #Create tms file
-    from Scientific.IO.NetCDF import NetCDFFile
-
-    outfile = filename[:-4] + '.tms'
-    print 'Writing to', outfile
-    fid = NetCDFFile(outfile, 'w')
-
-    fid.institution = 'Geoscience Australia'
-    fid.description = 'Input wave for Benchmark 2'
-    fid.starttime = 0.0
-    fid.createDimension('number_of_timesteps', len(T))
-    fid.createVariable('time', Float, ('number_of_timesteps',))
-    fid.variables['time'][:] = T
-
-    fid.createVariable('stage', Float, ('number_of_timesteps',))
-    fid.variables['stage'][:] = Q[:]
-
-    fid.createVariable('xmomentum', Float, ('number_of_timesteps',))
-    fid.variables['xmomentum'][:] = 0.0
-
-    fid.createVariable('ymomentum', Float, ('number_of_timesteps',))
-    fid.variables['ymomentum'][:] = 0.0
-
-    fid.close()
-
-
-# Module imports
-from anuga.shallow_water import Domain, Reflective_boundary,\
-     File_boundary, Transmissive_Momentum_Set_Stage_boundary
-
-from anuga.abstract_2d_finite_volumes.mesh_factory import rectangular_cross
-from anuga.abstract_2d_finite_volumes.pmesh2domain import pmesh_to_domain_instance
-from Numeric import array, zeros, Float, allclose
-import project
-from caching import cache
-
-#Preparing time boundary
-prepare_timeboundary(project.boundary_filename)
-
-#Preparing points (Only when using original Benchmark_2_Bathymetry.txt file)
-#from anuga.abstract_2d_finite_volumes.data_manager import xya2pts
-#xya2pts(project.bathymetry_filename, verbose = True,
-#        z_func = lambda z: -z)
-
-
-
-#######################
-# Create Domain
 if use_variable_mesh is True:
     print 'Creating domain from', project.mesh_filename
 
     domain = Domain(project.mesh_filename, use_cache=True, verbose=True)
-
 else:
     print 'Creating regular mesh'
@@ -113 +43 @@
 
 
-
-
-import sys, os
-base = os.path.basename(sys.argv[0])
-domain.filename, _ = os.path.splitext(base)
-domain.default_order = 2
-domain.store = True    #Store for visualisation purposes
+domain.set_name('lwru2')
+domain.set_default_order(2)
 
 #domain.check_integrity()
@@ -127 +52 @@
 
 
-
-#######################
+#-------------------------
 # Initial Conditions
-print 'Initial values'
-
+#-------------------------
+domain.set_quantity('friction', 0.0)
+domain.set_quantity('stage', 0.0)
 domain.set_quantity('elevation',
                     filename = project.bathymetry_filename[:-4] + '.pts',
-                    #alpha = 0.01,
                     alpha = 0.02,                    
                     verbose = True,
                     use_cache = True)
 
-domain.set_quantity('friction', 0.0)
-domain.set_quantity('stage', 0.0)
-
-
-
-######################
+#-------------------------
 # Boundary Conditions
-#
-print 'Boundaries'
+#-------------------------
 Br = Reflective_boundary(domain)
 
-from anuga.abstract_2d_finite_volumes.util import file_function
 function = file_function(project.boundary_filename[:-4] + '.tms',
                          domain,
                          verbose = True)
+
 Bts = Transmissive_Momentum_Set_Stage_boundary(domain, function)
 
@@ -163 +81 @@
 
 
-
-#######################
-# Evolve
+#-------------------------
+# Evolve through time
+#-------------------------
 import time
 t0 = time.time()

anuga_validation/okushiri_2005/okushiri_parallel.py

@@ -23 +23 @@
 
 import project
-
-
-
-def prepare_timeboundary(filename):
-    """Converting benchmark 2 time series to NetCDF tms file.
-    This is a 'throw-away' code taylor made for files like
-    'Benchmark_2_input.txt' from the LWRU2 benchmark
-    """
-
-    print 'Preparing time boundary from %s' %filename
-    fid = open(filename)
-
-    #Skip first line
-    line = fid.readline()
-
-    #Read remaining lines
-    lines = fid.readlines()
-    fid.close()
-
-
-    N = len(lines)
-    T = zeros(N, Float)  #Time
-    Q = zeros(N, Float)  #Values
-
-    for i, line in enumerate(lines):
-        fields = line.split()
-
-        T[i] = float(fields[0])
-        Q[i] = float(fields[1])
-
-
-    #Create tms file
-    from Scientific.IO.NetCDF import NetCDFFile
-
-    outfile = filename[:-4] + '.tms'
-    print 'Writing to', outfile
-    fid = NetCDFFile(outfile, 'w')
-
-    fid.institution = 'Geoscience Australia'
-    fid.description = 'Input wave for Benchmark 2'
-    fid.starttime = 0.0
-    fid.createDimension('number_of_timesteps', len(T))
-    fid.createVariable('time', Float, ('number_of_timesteps',))
-    fid.variables['time'][:] = T
-
-    fid.createVariable('stage', Float, ('number_of_timesteps',))
-    fid.variables['stage'][:] = Q[:]
-
-    fid.createVariable('xmomentum', Float, ('number_of_timesteps',))
-    fid.variables['xmomentum'][:] = 0.0
-
-    fid.createVariable('ymomentum', Float, ('number_of_timesteps',))
-    fid.variables['ymomentum'][:] = 0.0
-
-    fid.close()
-
-
-
-#----------------------
-# Preparing time boundary
-#-------------------------
-if myid == 0:
-    prepare_timeboundary(project.boundary_filename)