Index: /issm/trunk-jpl/src/m/classes/model.m =================================================================== --- /issm/trunk-jpl/src/m/classes/model.m (revision 25171) +++ /issm/trunk-jpl/src/m/classes/model.m (revision 25172) @@ -1264,5 +1264,4 @@ md.frontalforcings = frontalforcings(); md.gia = giamme(); - md.esa = esa(); md.love = fourierlove(); md.esa = esa(); Index: /issm/trunk-jpl/src/m/classes/model.py =================================================================== --- /issm/trunk-jpl/src/m/classes/model.py (revision 25171) +++ /issm/trunk-jpl/src/m/classes/model.py (revision 25172) @@ -87,18 +87,18 @@ self.mesh = mesh2d() self.mask = mask() + self.constants = constants() self.geometry = geometry() - self.constants = constants() + self.initialization = initialization() self.smb = SMBforcing() self.basalforcings = basalforcings() + self.friction = friction() + self.rifts = rifts() + self.solidearth = solidearth() + self.dsl = dsl() + self.timestepping = timestepping() + self.groundingline = groundingline() self.materials = matice() self.damage = damage() - self.friction = friction() self.flowequation = flowequation() - self.timestepping = timestepping() - self.initialization = initialization() - self.rifts = rifts() - self.dsl = dsl() - self.solidearth = solidearth() - self.debug = debug() self.verbose = verbose() @@ -106,8 +106,6 @@ self.toolkits = toolkits() self.cluster = generic() - self.balancethickness = balancethickness() self.stressbalance = stressbalance() - self.groundingline = groundingline() self.hydrology = hydrologyshreve() self.masstransport = masstransport() @@ -125,8 +123,7 @@ self.qmu = qmu() self.amr = amr() - + self.radaroverlay = radaroverlay() self.results = results() self.outputdefinition = outputdefinition() - self.radaroverlay = radaroverlay() self.miscellaneous = miscellaneous() self.private = private() @@ -137,17 +134,18 @@ return ['mesh', 'mask', + 'constants', 'geometry', - 'constants', + 'initialization', 'smb', 'basalforcings', + 'friction', + 'rifts', + 'solidearth', + 'dsl', + 'timestepping', + 'groundingline', 'materials', 'damage', - 'friction', 'flowequation', - 'timestepping', - 'initialization', - 'rifts', - 'dsl', - 'solidearth', 'debug', 'verbose', @@ -157,5 +155,4 @@ 'balancethickness', 'stressbalance', - 'groundingline', 'hydrology', 'masstransport', @@ -166,6 +163,6 @@ 'calving', 'frontalforcings', + 'gia', 'love', - 'gia', 'esa', 'autodiff', @@ -173,7 +170,7 @@ 'qmu', 'amr', + 'radaroverlay', + 'results', 'outputdefinition', - 'results', - 'radaroverlay', 'miscellaneous', 'private'] Index: /issm/trunk-jpl/test/NightlyRun/test2071.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test2071.py (revision 25171) +++ /issm/trunk-jpl/test/NightlyRun/test2071.py (revision 25172) @@ -17,9 +17,9 @@ #indicate what you want to compute -md.gia.cross_section_shape = 1 # for square-edged x - section +md.gia.cross_section_shape = 1 # for square-edged x-section #define loading history md.timestepping.start_time = 0.3 # for t \approx 0 kyr : to get eleastic response! -md.timestepping.final_time = 2500000 # 2, 500 kyr +md.timestepping.final_time = 2500000 # 2,500 kyr md.geometry.thickness = np.array([np.append(md.geometry.thickness * 0.0, 0.0), np.append(md.geometry.thickness / 2.0, 0.1), Index: /issm/trunk-jpl/test/Par/GiaIvinsBenchmarksAB.py =================================================================== --- /issm/trunk-jpl/test/Par/GiaIvinsBenchmarksAB.py (revision 25171) +++ /issm/trunk-jpl/test/Par/GiaIvinsBenchmarksAB.py (revision 25172) @@ -15,5 +15,5 @@ nv = md.mesh.numberofvertices if (np.isnan(md.geometry.thickness)): - md.geometry.thickness = np.zeros((md.mesh.numberofvertices, )) + md.geometry.thickness = np.zeros((md.mesh.numberofvertices, 1)) for i in range(nv): dist = np.sqrt(md.mesh.x[i]**2 + md.mesh.y[i]**2) @@ -21,21 +21,21 @@ md.geometry.thickness[i] = 2000.0 else: - md.geometry.thickness[i] = 1.0 # non - zero thickness + md.geometry.thickness[i] = 1.0 # non-zero thickness md.geometry.thickness = md.geometry.thickness.reshape(-1, 1) -md.geometry.base = np.zeros((md.mesh.numberofvertices, )) +md.geometry.base = np.zeros((md.mesh.numberofvertices, 1)) md.geometry.surface = md.geometry.thickness + md.geometry.base.reshape(-1, 1) #would otherwise create a 91x91 matrix -#Ice density used for benchmarking, not 917 kg / m^3 -md.materials.rho_ice = 1000 #kg m^3 +#Ice density used for benchmarking, not 917 kg/m^3 +md.materials.rho_ice = 1000 #kg/m^3 -#GIA parameters specific to Experiments A and B +#GIA parameters specific to Experiments A and B md.gia=giaivins(); -md.gia.mantle_viscosity = 1e21 * np.ones((md.mesh.numberofvertices, )) #in Pa.s -md.gia.lithosphere_thickness = 100 * np.ones((md.mesh.numberofvertices, )) #in km +md.gia.mantle_viscosity = 1e21 * np.ones((md.mesh.numberofvertices, 1)) #in Pa.s +md.gia.lithosphere_thickness = 100 * np.ones((md.mesh.numberofvertices, 1)) #in km md.materials.lithosphere_shear_modulus = 6.7 * 1e10 #in Pa -md.materials.lithosphere_density = 3.36 #in g / cm^3 +md.materials.lithosphere_density = 3.36 #in g/cm^3 md.materials.mantle_shear_modulus = 1.45 * 1e11 #in Pa -md.materials.mantle_density = 3.38 #in g / cm^3 +md.materials.mantle_density = 3.38 #in g/cm^3 #Initial velocity @@ -53,17 +53,17 @@ y = None index = None -md.initialization.vz = np.zeros((md.mesh.numberofvertices, )) -md.initialization.pressure = np.zeros((md.mesh.numberofvertices, )) +md.initialization.vz = np.zeros((md.mesh.numberofvertices, 1)) +md.initialization.pressure = np.zeros((md.mesh.numberofvertices, 1)) #Materials -md.initialization.temperature = (273. - 20.) * np.ones((md.mesh.numberofvertices, )) +md.initialization.temperature = (273. - 20.) * np.ones((md.mesh.numberofvertices, 1)) md.materials.rheology_B = paterson(md.initialization.temperature) -md.materials.rheology_n = 3. * np.ones((md.mesh.numberofelements, )) +md.materials.rheology_n = 3. * np.ones((md.mesh.numberofelements, 1)) #Friction -md.friction.coefficient = 20. * np.ones((md.mesh.numberofvertices, )) +md.friction.coefficient = 20. * np.ones((md.mesh.numberofvertices, 1)) md.friction.coefficient[np.where(md.mask.ocean_levelset < 0.)] = 0. -md.friction.p = np.ones((md.mesh.numberofelements, )) -md.friction.q = np.ones((md.mesh.numberofelements, )) +md.friction.p = np.ones((md.mesh.numberofelements, 1)) +md.friction.q = np.ones((md.mesh.numberofelements, 1)) #Numerical parameters @@ -76,5 +76,5 @@ md.steadystate.reltol = 0.05 md.stressbalance.reltol = 0.05 -md.stressbalance.abstol = float('NaN') +md.stressbalance.abstol = np.nan md.timestepping.time_step = 1. md.timestepping.final_time = 3. Index: /issm/trunk-jpl/test/Par/GiaIvinsBenchmarksCD.py =================================================================== --- /issm/trunk-jpl/test/Par/GiaIvinsBenchmarksCD.py (revision 25171) +++ /issm/trunk-jpl/test/Par/GiaIvinsBenchmarksCD.py (revision 25172) @@ -1,8 +1,11 @@ #Geometry specific to Experiments C and D +import inspect import os.path -import inspect + import numpy as np + from arch import * +from giaivins import giaivins from InterpFromMeshToMesh2d import * from paterson import * @@ -10,8 +13,9 @@ from SetIceSheetBC import * + rad = 800000 nv = md.mesh.numberofvertices if (np.isnan(md.geometry.thickness)): - md.geometry.thickness = np.zeros((md.mesh.numberofvertices, )) + md.geometry.thickness = np.zeros((md.mesh.numberofvertices, 1)) for i in range(nv): dist = np.sqrt(md.mesh.x[i]**2 + md.mesh.y[i]**2) @@ -22,13 +26,14 @@ md.geometry.thickness = md.geometry.thickness.reshape(-1, 1) -md.geometry.base = np.zeros((md.mesh.numberofvertices, )) +md.geometry.base = np.zeros((md.mesh.numberofvertices, 1)) md.geometry.surface = md.geometry.thickness + md.geometry.base.reshape(-1, 1) #would otherwise create a 91x91 matrix #Ice density used for benchmarking, not 917 kg / m^3 -md.materials.rho_ice = 1000 #kg m^3 +md.materials.rho_ice = 1000 #kg m^3 -#GIA parameters specific to Experiments A and B -md.gia.mantle_viscosity = 1e21 * np.ones((md.mesh.numberofvertices, )) #in Pa.s -md.gia.lithosphere_thickness = 100 * np.ones((md.mesh.numberofvertices, )) #in km +#GIA parameters specific to Experiments A and B +md.gia=giaivins(); +md.gia.mantle_viscosity = 1e21 * np.ones((md.mesh.numberofvertices, 1)) #in Pa.s +md.gia.lithosphere_thickness = 100 * np.ones((md.mesh.numberofvertices, 1)) #in km md.materials.lithosphere_shear_modulus = 6.7e10 #in Pa md.materials.lithosphere_density = 3.32 #in g / cm^3 @@ -50,17 +55,17 @@ y = None index = None -md.initialization.vz = np.zeros((md.mesh.numberofvertices, )) -md.initialization.pressure = np.zeros((md.mesh.numberofvertices, )) +md.initialization.vz = np.zeros((md.mesh.numberofvertices, 1)) +md.initialization.pressure = np.zeros((md.mesh.numberofvertices, 1)) #Materials -md.initialization.temperature = (273. - 20.) * np.ones((md.mesh.numberofvertices, )) +md.initialization.temperature = (273. - 20.) * np.ones((md.mesh.numberofvertices, 1)) md.materials.rheology_B = paterson(md.initialization.temperature) -md.materials.rheology_n = 3. * np.ones((md.mesh.numberofelements, )) +md.materials.rheology_n = 3. * np.ones((md.mesh.numberofelements, 1)) #Friction -md.friction.coefficient = 20. * np.ones((md.mesh.numberofvertices, )) +md.friction.coefficient = 20. * np.ones((md.mesh.numberofvertices, 1)) md.friction.coefficient[np.where(md.mask.ocean_levelset < 0.)] = 0. -md.friction.p = np.ones((md.mesh.numberofelements, )) -md.friction.q = np.ones((md.mesh.numberofelements, )) +md.friction.p = np.ones((md.mesh.numberofelements, 1)) +md.friction.q = np.ones((md.mesh.numberofelements, 1)) #Numerical parameters @@ -73,5 +78,5 @@ md.steadystate.reltol = 0.05 md.stressbalance.reltol = 0.05 -md.stressbalance.abstol = float('NaN') +md.stressbalance.abstol = np.nan md.timestepping.time_step = 1. md.timestepping.final_time = 3.