Index: ../trunk-jpl/test/NightlyRun/test2002.py =================================================================== --- ../trunk-jpl/test/NightlyRun/test2002.py (revision 24757) +++ ../trunk-jpl/test/NightlyRun/test2002.py (revision 24758) @@ -8,6 +8,7 @@ from gmtmask import * from paterson import * from love_numbers import * +from materials import * #mesh earth: md = model() @@ -65,17 +66,14 @@ md.slr.ocean_area_scaling = 0 -#geometry -di = md.materials.rho_ice / md.materials.rho_water +#geometry for the bed, arbitrary md.geometry.thickness = np.ones((md.mesh.numberofvertices)) -md.geometry.surface = (1 - di) * np.zeros((md.mesh.numberofvertices)) +md.geometry.surface = np.zeros((md.mesh.numberofvertices)) md.geometry.base = md.geometry.surface - md.geometry.thickness md.geometry.bed = md.geometry.base #materials -md.initialization.temperature = 273.25 * np.ones((md.mesh.numberofvertices)) -md.materials.rheology_B = paterson(md.initialization.temperature) -md.materials.rheology_n = 3 * np.ones((md.mesh.numberofelements)) +md.materials=materials('hydro') #New stuff md.slr.spcthickness = np.nan * np.ones((md.mesh.numberofvertices, ))