Changeset 3869

Timestamp:

Oct 25, 2006, 6:51:04 PM (19 years ago)

Author:

sexton

Message:

data update for sydney demo

Location:

anuga_core/documentation/user_manual/examples

Files:

• project.py (modified) (2 diffs)
• runsydney.py (modified) (2 diffs)

anuga_core/documentation/user_manual/examples/project.py

@@ -20 +20 @@
 scenario_dir_name = 'sydney_tsunami_example_2006'
 # revised 100m data
-coarsename = 'bathyland100' 
+#coarsename = 'bathyland100' 
 # revised 25m data
-finename = 'bathy_dem25'
+#finename = 'bathy_dem25'
+# revised 25m data
+dem_name = 'sydney_MGA56'
 
 home += sep + 'data' + sep + 'new_south_wales'
@@ -33 +35 @@
 
 meshname = meshdir + basename
-coarsedemname = datadir + coarsename
-finedemname = datadir + finename
+#coarsedemname = datadir + coarsename
+#finedemname = datadir + finename
+demname = datadir + dem_name
 combineddemname = datadir + 'sydneytopo'
 

anuga_core/documentation/user_manual/examples/runsydney.py

@@ -36 +36 @@
 
 # filenames
-coarsedemname = project.coarsedemname + '.pts'
-finedemname = project.finedemname + '.pts'
-combineddemname = project.combineddemname + '.pts'
+#coarsedemname = project.coarsedemname + '.pts'
+#finedemname = project.finedemname + '.pts'
+demname = project.demname
 meshname = project.meshname+'.msh'
 
+convert_dem_from_ascii2netcdf(demname, use_cache=True, verbose=True)
+
+# creates pts file 
+dem2pts(demname, use_cache=True, verbose=True)
 
 # combining the coarse and fine data
-combine_rectangular_points_files(finedemname,
-                                 coarsedemname,
-                                 combineddemname)
+#combine_rectangular_points_files(finedemname,
+#                                 coarsedemname,
+#                                 combineddemname)
 
 
@@ -115 +119 @@
 domain.set_quantity('friction', 0.0) 
 domain.set_quantity('elevation',
-                    filename = combineddemname,
+                    filename = demname + '.pts',
                     use_cache = True,
                     verbose = True)