Changeset 2715


Ignore:
Timestamp:
Apr 13, 2006, 1:28:12 PM (18 years ago)
Author:
ole
Message:

Comments regarding friction

Location:
inundation/pyvolution
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • inundation/pyvolution/shallow_water.py

    r2689 r2715  
    6969class Domain(Generic_Domain):
    7070
    71     def __init__(self, coordinates=None, vertices=None, boundary = None,
    72                  tagged_elements = None, geo_reference = None,
     71    def __init__(self, coordinates=None, vertices=None, boundary=None,
     72                 tagged_elements=None, geo_reference=None,
    7373                 use_inscribed_circle=False,
    7474                 mesh_filename=None):
     
    11541154def manning_friction(domain):
    11551155    """Apply (Manning) friction to water momentum
     1156    (Python version)
    11561157    """
    11571158
     
    11891190
    11901191
     1192    #print 'Implicit friction'
     1193   
    11911194    xmom = domain.quantities['xmomentum']
    11921195    ymom = domain.quantities['ymomentum']
     
    12141217    """
    12151218
     1219    #print 'Explicit friction'
     1220   
    12161221    xmom = domain.quantities['xmomentum']
    12171222    ymom = domain.quantities['ymomentum']
  • inundation/pyvolution/shallow_water_ext.c

    r2649 r2715  
    260260
    261261
     262/*
    262263void _manning_friction_explicit(double g, double eps, int N,
    263264                       double* w, double* z,
     
    285286  }
    286287}
    287 
     288*/
    288289
    289290int _balance_deep_and_shallow(int N,
     
    557558
    558559
     560/*
    559561PyObject *manning_friction_explicit(PyObject *self, PyObject *args) {
    560562  //
     
    584586  return Py_BuildValue("");
    585587}
     588*/
     589
    586590PyObject *extrapolate_second_order_sw(PyObject *self, PyObject *args) {
    587591  /*Compute the vertex values based on a linear reconstruction on each triangle
Note: See TracChangeset for help on using the changeset viewer.