Index: /issm/trunk-jpl/jenkins/linux64_caladan =================================================================== --- /issm/trunk-jpl/jenkins/linux64_caladan (revision 22273) +++ /issm/trunk-jpl/jenkins/linux64_caladan (revision 22274) @@ -64,4 +64,4 @@ #by Matlab and runme.m #ex: "'id',[101 102 103]" -PYTHON_NROPTIONS="--exclude 701 702 435" +PYTHON_NROPTIONS="--exclude 701 702 435 703" MATLAB_NROPTIONS="'exclude',[701,702,435]" Index: /issm/trunk-jpl/jenkins/linux64_ross =================================================================== --- /issm/trunk-jpl/jenkins/linux64_ross (revision 22273) +++ /issm/trunk-jpl/jenkins/linux64_ross (revision 22274) @@ -67,4 +67,4 @@ #by Matlab and runme.m #ex: "'id',[101 102 103]" -PYTHON_NROPTIONS="--exclude 243 701 702 435" +PYTHON_NROPTIONS="--exclude 702 703" MATLAB_NROPTIONS="'exclude',[IdFromString('Dakota')]" Index: /issm/trunk-jpl/jenkins/linux64_ross_dakota =================================================================== --- /issm/trunk-jpl/jenkins/linux64_ross_dakota (revision 22273) +++ /issm/trunk-jpl/jenkins/linux64_ross_dakota (revision 22274) @@ -62,4 +62,4 @@ #by Matlab and runme.m #ex: "'id',[101 102 103]" -PYTHON_NROPTIONS="" +PYTHON_NROPTIONS="--exclude 702 703" MATLAB_NROPTIONS="'exclude',[243,701,702,435]" Index: /issm/trunk-jpl/jenkins/linux64_ross_javascript =================================================================== --- /issm/trunk-jpl/jenkins/linux64_ross_javascript (revision 22273) +++ /issm/trunk-jpl/jenkins/linux64_ross_javascript (revision 22274) @@ -49,4 +49,4 @@ #by Matlab and runme.m #ex: "'id',[101 102 103]" -#PYTHON_NROPTIONS="--exclude 119 243 514 701 702 435" +#PYTHON_NROPTIONS="--exclude 119 243 514 701 702 703 435" #MATLAB_NROPTIONS="'exclude',[119,243,514,701,702,435,IdFromString('Dakota')]" Index: /issm/trunk-jpl/jenkins/linux64_ross_python =================================================================== --- /issm/trunk-jpl/jenkins/linux64_ross_python (revision 22273) +++ /issm/trunk-jpl/jenkins/linux64_ross_python (revision 22274) @@ -58,4 +58,4 @@ #by Matlab and runme.m #ex: "'id',[101 102 103]" -PYTHON_NROPTIONS="--exclude 243 701 702 435" +PYTHON_NROPTIONS="--exclude 702 703" MATLAB_NROPTIONS="'exclude',[IdFromString('Dakota')]" Index: /issm/trunk-jpl/jenkins/linux64_ross_test =================================================================== --- /issm/trunk-jpl/jenkins/linux64_ross_test (revision 22273) +++ /issm/trunk-jpl/jenkins/linux64_ross_test (revision 22274) @@ -64,4 +64,4 @@ #by Matlab and runme.m #ex: "'id',[101 102 103]" -PYTHON_NROPTIONS="--exclude 243 701 702 435" +PYTHON_NROPTIONS="--exclude 243 701 702 703 435" MATLAB_NROPTIONS="'exclude',[243,701,702,435]" Index: /issm/trunk-jpl/src/m/mesh/bamgflowband.py =================================================================== --- /issm/trunk-jpl/src/m/mesh/bamgflowband.py (revision 22273) +++ /issm/trunk-jpl/src/m/mesh/bamgflowband.py (revision 22274) @@ -25,10 +25,10 @@ #Write expfile with domain outline A = OrderedDict() - A.x = np.concatenate((x,np.flipud(x),[x[0]])) - A.y = np.concatenate((base,np.flipud(surf),[base[0]])) - A.nods = np.size(A.x) + A['x'] = np.concatenate((x,np.flipud(x),[x[0]])) + A['y'] = np.concatenate((base,np.flipud(surf),[base[0]])) + A['nods'] = np.size(A['x']) #markers: - m = np.ones((np.size(A.x)-1,)) # base = 1 + m = np.ones((np.size(A['x'])-1,)) # base = 1 m[np.size(x) - 1] = 2 # right side = 2 m[np.size(x):2 * np.size(x) - 1] = 3 # top surface = 3 Index: /issm/trunk-jpl/test/NightlyRun/test703.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test703.py (revision 22274) +++ /issm/trunk-jpl/test/NightlyRun/test703.py (revision 22274) @@ -0,0 +1,168 @@ +#Test Name: FlowbandFSsheetshelfTrans +import numpy as np +from scipy.interpolate import interp1d +from model import * +from setflowequation import * +from solve import * +from NowickiProfile import * +from bamgflowband import * +from paterson import * + +#mesh parameters +x = np.arange(-5,5.5,.5).T +[b,h,sea] = NowickiProfile(x) +x = x * 10**3 +h = h * 10**3 +b = (b-sea) * 10**3 + +#for i in x: + #print i + +#for i in b: + #print '%.12f' % i +#for i in h: + #print '%.11f' % i +#print '%.12f' % sea + +#print x +#print h +#print b +#print sea + +#mesh domain +md = bamgflowband(model(),x,b+h,b,'hmax',150.) +print md.mesh.numberofvertices + +#geometry +md.geometry.surface = interp1d(x,b+h)(md.mesh.x) +md.geometry.base = interp1d(x,b)(md.mesh.x) +md.geometry.thickness = md.geometry.surface - md.geometry.base + +#mask +md.mask.ice_levelset = -np.ones((md.mesh.numberofvertices,)) +md.mask.ice_levelset[np.where(md.mesh.vertexflags(2))] = 0 +md.mask.groundedice_levelset = np.zeros((md.mesh.numberofvertices,)) - 0.5 + +#materials +md.initialization.temperature = (273. - 20.) * np.ones((md.mesh.numberofvertices,)) +md.materials.rheology_B = paterson(md.initialization.temperature) +md.materials.rheology_n = 3 * np.ones((md.mesh.numberofelements,)) + +#friction +md.friction.coefficient = np.zeros((md.mesh.numberofvertices,)) +md.friction.coefficient[np.where(md.mesh.vertexflags(1))] = 20 +md.friction.p = np.ones((md.mesh.numberofelements,)) +md.friction.q = np.ones((md.mesh.numberofelements,)) + +#boundary conditions +md.stressbalance.spcvx = float('NaN') * np.ones((md.mesh.numberofvertices,)) +md.stressbalance.spcvy = float('NaN') * np.ones((md.mesh.numberofvertices,)) +md.stressbalance.spcvz = float('NaN') * np.ones((md.mesh.numberofvertices,)) +md.stressbalance.referential = float('NaN') * np.ones((md.mesh.numberofvertices,6)) +md.stressbalance.loadingforce = 0 * np.ones((md.mesh.numberofvertices,3)) +md.stressbalance.spcvx[np.where(md.mesh.vertexflags(4))] = 800. +md.stressbalance.spcvy[np.where(md.mesh.vertexflags(4))] = 0. + +#print md.stressbalance.referential +#print md.stressbalance.loadingforce +#print md.stressbalance.spcvx +#print md.stressbalance.spcvy +#print md.stressbalance.spcvz +#print np.shape(md.stressbalance.referential) +#print np.shape(md.stressbalance.loadingforce) +#print np.shape(md.stressbalance.spcvx) +#print np.shape(md.stressbalance.spcvy) +#print np.shape(md.stressbalance.spcvz) + +#Misc +md = setflowequation(md,'FS','all') +md.flowequation.fe_FS = 'TaylorHood' +md.stressbalance.abstol = float('NaN') +md.miscellaneous.name = 'test703' + +#Transient settings +md.timestepping.time_step = 0.000001 +md.timestepping.final_time = 0.000005 +md.stressbalance.shelf_dampening = 1. +md.smb.mass_balance = np.zeros((md.mesh.numberofvertices,)) +md.basalforcings.groundedice_melting_rate = np.zeros((md.mesh.numberofvertices,)) +md.basalforcings.floatingice_melting_rate = np.zeros((md.mesh.numberofvertices,)) +md.basalforcings.geothermalflux = np.zeros((md.mesh.numberofvertices,)) +posb = np.intersect1d(np.where(md.mesh.x > 0.), np.where(md.mesh.vertexonbase)) +md.basalforcings.groundedice_melting_rate[posb] = 18. +md.basalforcings.floatingice_melting_rate[posb] = 18. +md.initialization.vx = np.zeros((md.mesh.numberofvertices,)) +md.initialization.vy = np.zeros((md.mesh.numberofvertices,)) +md.initialization.pressure = np.zeros((md.mesh.numberofvertices,)) +md.masstransport.spcthickness = float('NaN') * np.ones((md.mesh.numberofvertices,)) +md.thermal.spctemperature = float('NaN') * np.ones((md.mesh.numberofvertices,)) +md.transient.isthermal = 0 +md.masstransport.isfreesurface = 1 + +#Go solve +md.cluster = generic('np',3) +md.stressbalance.shelf_dampening = 1 +md1 = solve(md,'Transient') + +md.stressbalance.shelf_dampening = 0 +md = solve(md,'Transient') + +#Fields and tolerances to track changes +field_names = [ + 'Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1', + 'Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2', + 'Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3', + 'Vx1_damp','Vy1_damp','Vel1_damp','Pressure1_damp','Bed1_damp','Surface1_damp','Thickness1_damp', + 'Vx2_damp','Vy2_damp','Vel2_damp','Pressure2_damp','Bed2_damp','Surface2_damp','Thickness2_damp', + 'Vx3_damp','Vy3_damp','Vel3_damp','Pressure3_damp','Bed3_damp','Surface3_damp','Thickness3_damp'] +field_tolerances = [ + 2e-08,2e-08,2e-08,1e-08,1e-10,1e-10,1e-10, + 2e-08,2e-08,2e-08,1e-08,1e-10,1e-10,1e-10, + 2e-08,2e-08,2e-08,1e-08,1e-10,1e-10,1e-10, + 5e-08,5e-08,5e-08,1e-08,1e-10,1e-10,1e-10, + 5e-08,5e-08,5e-08,1e-08,1e-10,1e-10,1e-10, + 5e-08,5e-08,5e-08,1e-08,1e-10,1e-10,1e-10] +field_values = [ + md.results.TransientSolution[0].Vx, + md.results.TransientSolution[0].Vy, + md.results.TransientSolution[0].Vel, + md.results.TransientSolution[0].Pressure, + md.results.TransientSolution[0].Base, + md.results.TransientSolution[0].Surface, + md.results.TransientSolution[0].Thickness, + md.results.TransientSolution[1].Vx, + md.results.TransientSolution[1].Vy, + md.results.TransientSolution[1].Vel, + md.results.TransientSolution[1].Pressure, + md.results.TransientSolution[1].Base, + md.results.TransientSolution[1].Surface, + md.results.TransientSolution[1].Thickness, + md.results.TransientSolution[2].Vx, + md.results.TransientSolution[2].Vy, + md.results.TransientSolution[2].Vel, + md.results.TransientSolution[2].Pressure, + md.results.TransientSolution[2].Base, + md.results.TransientSolution[2].Surface, + md.results.TransientSolution[2].Thickness, + md1.results.TransientSolution[0].Vx, + md1.results.TransientSolution[0].Vy, + md1.results.TransientSolution[0].Vel, + md1.results.TransientSolution[0].Pressure, + md1.results.TransientSolution[0].Base, + md1.results.TransientSolution[0].Surface, + md1.results.TransientSolution[0].Thickness, + md1.results.TransientSolution[1].Vx, + md1.results.TransientSolution[1].Vy, + md1.results.TransientSolution[1].Vel, + md1.results.TransientSolution[1].Pressure, + md1.results.TransientSolution[1].Base, + md1.results.TransientSolution[1].Surface, + md1.results.TransientSolution[1].Thickness, + md1.results.TransientSolution[2].Vx, + md1.results.TransientSolution[2].Vy, + md1.results.TransientSolution[2].Vel, + md1.results.TransientSolution[2].Pressure, + md1.results.TransientSolution[2].Base, + md1.results.TransientSolution[2].Surface, + md1.results.TransientSolution[2].Thickness, + ]