Changeset 7800 for trunk/anuga_core/source/anuga/abstract_2d_finite_volumes/util.py

Timestamp:

Jun 7, 2010, 1:04:42 PM (14 years ago)

Author:

hudson

Message:

urs2sww has an extra urs_ungridded2sww function.

File:

• trunk/anuga_core/source/anuga/abstract_2d_finite_volumes/util.py (modified) (1 diff)

trunk/anuga_core/source/anuga/abstract_2d_finite_volumes/util.py

@@ -149 +149 @@
         else:
             return format % float(value)
-
-
-#################################################################################
-# OBSOLETE STUFF
-#################################################################################
-
-# @note TEMP
-def angle(v1, v2):
-    """Temporary Interface to new location"""
-
-    import anuga.utilities.numerical_tools as NT    
-    
-    msg = 'angle has moved from util.py.  '
-    msg += 'Please use "from anuga.utilities.numerical_tools import angle"'
-    warn(msg, DeprecationWarning) 
-
-    return NT.angle(v1, v2)
-
-    
-# @note TEMP
-def anglediff(v0, v1):
-    """Temporary Interface to new location"""
-
-    import anuga.utilities.numerical_tools as NT
-    
-    msg = 'anglediff has moved from util.py.  '
-    msg += 'Please use "from anuga.utilities.numerical_tools import anglediff"'
-    warn(msg, DeprecationWarning) 
-
-    return NT.anglediff(v0, v1)    
-
-# @note TEMP
-def point_on_line(*args, **kwargs):
-    """Temporary Interface to new location"""
-
-    msg = 'point_on_line has moved from util.py.  '
-    msg += 'Please use "from anuga.geometry.polygon import point_on_line"'
-    warn(msg, DeprecationWarning) 
-
-    return utilities.geometry.point_on_line(*args, **kwargs)    
-
-    
-# @note TEMP
-def inside_polygon(*args, **kwargs):
-    """Temporary Interface to new location"""
-
-    log.critical('inside_polygon has moved from util.py.')
-    log.critical('Please use '
-                 '"from anuga.utilities.polygon import inside_polygon"')
-
-    return geometry.polygon.inside_polygon(*args, **kwargs)    
-
-    
-# @note TEMP
-def outside_polygon(*args, **kwargs):
-    """Temporary Interface to new location"""
-
-    log.critical('outside_polygon has moved from util.py.')
-    log.critical('Please use '
-                 '"from anuga.geometry.polygon import outside_polygon"')
-
-    return geometry.geometry.outside_polygon(*args, **kwargs)    
-
-    
-# @note TEMP
-def read_polygon(*args, **kwargs):
-    """Temporary Interface to new location"""
-
-    log.critical('read_polygon has moved from util.py.')
-    log.critical('Please use '
-                 '"from anuga.geometry.polygon import read_polygon"')
-
-    return geometry.geometry.read_polygon(*args, **kwargs)    
-
-
-# @note TEMP
-def populate_polygon(*args, **kwargs):
-    """Temporary Interface to new location"""
-
-    log.critical('populate_polygon has moved from util.py.')
-    log.critical('Please use '
-                 '"from anuga.utilities.polygon import populate_polygon"')
-
-    return utilities.geometry.populate_polygon(*args, **kwargs)    
-
-
-#################################################################################
-# End of obsolete stuff ?
-#################################################################################
-
-# @note TEMP
-def start_screen_catcher(dir_name, myid='', numprocs='', extra_info='',
-                         verbose=False):
-    """Temporary Interface to new location"""
-    from anuga.shallow_water.data_manager import start_screen_catcher \
-         as dm_start_screen_catcher
-
-    log.critical('start_screen_catcher has moved from util.py.')
-    log.critical('Please use "from anuga.shallow_water.data_manager import '
-                 'start_screen_catcher"')
-    
-    return dm_start_screen_catcher(dir_name, myid='', numprocs='',
-                                   extra_info='', verbose=False)
-
-
 
 ##