Index: /issm/trunk-jpl/scripts/translateToPy.py =================================================================== --- /issm/trunk-jpl/scripts/translateToPy.py (revision 24260) +++ /issm/trunk-jpl/scripts/translateToPy.py (revision 24261) @@ -220,5 +220,5 @@ for il in importList: - if line.find(il) != - 1: + if line.find(il) != -1: output("from %s import * " % (il)) importList.remove(il) # already got it Index: /issm/trunk-jpl/src/m/archive/arch.py =================================================================== --- /issm/trunk-jpl/src/m/archive/arch.py (revision 24260) +++ /issm/trunk-jpl/src/m/archive/arch.py (revision 24261) @@ -178,8 +178,8 @@ """ Procedure to read a field and return a results list with the following attributes: - result['field_name'] - > the name of the variable that was just read - result['size'] - > size (dimensions) of the variable just read - result['data_type'] - > the type of data that was just read - result['data'] - > the actual data + result['field_name'] -> the name of the variable that was just read + result['size'] -> size (dimensions) of the variable just read + result['data_type'] -> the type of data that was just read + result['data'] -> the actual data """ @@ -207,5 +207,5 @@ for i in range(rows): raw_data[i, :] = struct.unpack('>{}d'.format(cols), fid.read(cols * struct.calcsize('>d'))) - # The matrix will be struct.upacked in order and will be filled left - > right by column + # The matrix will be struct.upacked in order and will be filled left -> right by column # We need to reshape and transpose the matrix so it can be read correctly data = raw_data.reshape(raw_data.shape[::-1]).T Index: /issm/trunk-jpl/src/m/array/MatlabArray.py =================================================================== --- /issm/trunk-jpl/src/m/array/MatlabArray.py (revision 24260) +++ /issm/trunk-jpl/src/m/array/MatlabArray.py (revision 24261) @@ -177,9 +177,9 @@ (a[4] == 5; counted as [1, 4, 2, 5, 3, 6] linearly in matlab) - x = string_dim(a, 4) - > '[1, 1]' + x = string_dim(a, 4) -> '[1, 1]' a[x] == a[4] == a[1, 1] == 5 - example use: exec('print a' + string_dim(a, 4)) - > print a[1, 1] + example use: exec('print a' + string_dim(a, 4)) -> print a[1, 1] ''' Index: /issm/trunk-jpl/src/m/classes/SMBpddSicopolis.py =================================================================== --- /issm/trunk-jpl/src/m/classes/SMBpddSicopolis.py (revision 24260) +++ /issm/trunk-jpl/src/m/classes/SMBpddSicopolis.py (revision 24261) @@ -83,5 +83,5 @@ def setdefaultparameters(self): # {{{ self.isfirnwarming = 1 - self.desfac = - np.log(2.0) / 1000 + self.desfac = -np.log(2.0) / 1000 self.rlaps = 7.4 Index: /issm/trunk-jpl/src/m/classes/dependent.py =================================================================== --- /issm/trunk-jpl/src/m/classes/dependent.py (revision 24260) +++ /issm/trunk-jpl/src/m/classes/dependent.py (revision 24261) @@ -21,5 +21,5 @@ self.exp = '' self.segments = [] - self.index = - 1 + self.index = -1 self.nods = 0 Index: /issm/trunk-jpl/src/m/classes/fourierlove.py =================================================================== --- /issm/trunk-jpl/src/m/classes/fourierlove.py (revision 24260) +++ /issm/trunk-jpl/src/m/classes/fourierlove.py (revision 24261) @@ -34,6 +34,6 @@ string = "%s\n%s" % (string, fielddisplay(self, 'sh_nmin', 'minimum spherical harmonic degree (default 1)')) string = "%s\n%s" % (string, fielddisplay(self, 'g0', 'adimensioning constant for gravity (default 10) [m / s^2]')) - string = "%s\n%s" % (string, fielddisplay(self, 'r0', 'adimensioning constant for radius (default 6378 * 10^3) [m]')) - string = "%s\n%s" % (string, fielddisplay(self, 'mu0', 'adimensioning constant for stress (default 10^11) [Pa]')) + string = "%s\n%s" % (string, fielddisplay(self, 'r0', 'adimensioning constant for radius (default 6378 * 1.0e3) [m]')) + string = "%s\n%s" % (string, fielddisplay(self, 'mu0', 'adimensioning constant for stress (default 1.0e11) [Pa]')) string = "%s\n%s" % (string, fielddisplay(self, 'allow_layer_deletion', 'allow for migration of the integration boundary with increasing spherical harmonics degree (default 1)')) string = "%s\n%s" % (string, fielddisplay(self, 'love_kernels', 'compute love numbers at depth? (default 0)')) Index: /issm/trunk-jpl/src/m/classes/geometry.py =================================================================== --- /issm/trunk-jpl/src/m/classes/geometry.py (revision 24260) +++ /issm/trunk-jpl/src/m/classes/geometry.py (revision 24261) @@ -58,12 +58,12 @@ md = checkfield(md, 'fieldname', 'geometry.base', 'NaN', 1, 'Inf', 1, 'size', [md.mesh.numberofvertices]) md = checkfield(md, 'fieldname', 'geometry.thickness', 'NaN', 1, 'Inf', 1, 'size', [md.mesh.numberofvertices], '>', 0, 'timeseries', 1) - if any(abs(self.thickness - self.surface + self.base) > 10**- 9): + if any(abs(self.thickness - self.surface + self.base) > 10**-9): md.checkmessage("equality thickness = surface-base violated") if solution == 'TransientSolution' and md.transient.isgroundingline: md = checkfield(md, 'fieldname', 'geometry.bed', 'NaN', 1, 'Inf', 1, 'size', [md.mesh.numberofvertices]) - if np.any(self.bed - self.base > 10**- 12): + if np.any(self.bed - self.base > 10**-12): md.checkmessage('base < bed on one or more vertex') pos = np.where(md.mask.groundedice_levelset > 0) - if np.any(np.abs(self.bed[pos] - self.base[pos]) > 10**- 9): + if np.any(np.abs(self.bed[pos] - self.base[pos]) > 10**-9): md.checkmessage('equality base = bed on grounded ice violated') md = checkfield(md, 'fieldname', 'geometry.bed', 'NaN', 1, 'Inf', 1, 'size', [md.mesh.numberofvertices]) Index: /issm/trunk-jpl/src/m/classes/groundingline.py =================================================================== --- /issm/trunk-jpl/src/m/classes/groundingline.py (revision 24260) +++ /issm/trunk-jpl/src/m/classes/groundingline.py (revision 24261) @@ -53,7 +53,7 @@ md.checkmessage("requesting grounding line migration, but bathymetry is absent!") pos = np.nonzero(md.mask.groundedice_levelset > 0.)[0] - if any(np.abs(md.geometry.base[pos] - md.geometry.bed[pos]) > 10**- 10): + if any(np.abs(md.geometry.base[pos] - md.geometry.bed[pos]) > 10**-10): md.checkmessage("base not equal to bed on grounded ice!") - if any(md.geometry.bed - md.geometry.base > 10**- 9): + if any(md.geometry.bed - md.geometry.base > 10**-9): md.checkmessage("bed superior to base on floating ice!") Index: /issm/trunk-jpl/src/m/classes/inversion.py =================================================================== --- /issm/trunk-jpl/src/m/classes/inversion.py (revision 24260) +++ /issm/trunk-jpl/src/m/classes/inversion.py (revision 24261) @@ -103,5 +103,5 @@ #new_par = old_par + gradient_scaling(n) * C * gradient with C in [0 1] #usually the gradient_scaling must be of the order of magnitude of the - #inversed parameter (10^8 for B, 50 for drag) and can be decreased + #inversed parameter (1.0e8 for B, 50 for drag) and can be decreased #after the first iterations self.gradient_scaling = 50 * np.ones((self.nsteps, 1)) Index: /issm/trunk-jpl/src/m/classes/linearbasalforcings.py =================================================================== --- /issm/trunk-jpl/src/m/classes/linearbasalforcings.py (revision 24260) +++ /issm/trunk-jpl/src/m/classes/linearbasalforcings.py (revision 24261) @@ -62,7 +62,7 @@ def setdefaultparameters(self): # {{{ self.deepwater_melting_rate = 50.0 - self.deepwater_elevation = - 800.0 + self.deepwater_elevation = -800.0 self.upperwater_melting_rate = 0.0 - self.upperwater_elevation = - 400.0 + self.upperwater_elevation = -400.0 return self Index: /issm/trunk-jpl/src/m/classes/masstransport.py =================================================================== --- /issm/trunk-jpl/src/m/classes/masstransport.py (revision 24260) +++ /issm/trunk-jpl/src/m/classes/masstransport.py (revision 24261) @@ -52,5 +52,5 @@ #Type of stabilization to use 0:nothing 1:artificial_diffusivity 3:Discontinuous Galerkin self.stabilization = 1 - #Factor applied to compute the penalties kappa = max(stiffness matrix) * 10^penalty_factor + #Factor applied to compute the penalties kappa = max(stiffness matrix) * 1.0**penalty_factor self.penalty_factor = 3 #Minimum ice thickness that can be used Index: /issm/trunk-jpl/src/m/classes/matenhancedice.py =================================================================== --- /issm/trunk-jpl/src/m/classes/matenhancedice.py (revision 24260) +++ /issm/trunk-jpl/src/m/classes/matenhancedice.py (revision 24261) @@ -99,9 +99,9 @@ self.meltingpoint = 273.15 #rate of change of melting point with pressure (K / Pa) - self.beta = 9.8 * 10**- 8 + self.beta = 9.8 * 10**-8 #mixed layer (ice-water interface) heat capacity (J / kg / K) self.mixed_layer_capacity = 3974. #thermal exchange velocity (ice-water interface) (m / s) - self.thermal_exchange_velocity = 1.00 * 10**- 4 + self.thermal_exchange_velocity = 1.00 * 10**-4 #Rheology law: what is the temperature dependence of B with T #available: none, paterson and arrhenius Index: /issm/trunk-jpl/src/m/classes/mismipbasalforcings.py =================================================================== --- /issm/trunk-jpl/src/m/classes/mismipbasalforcings.py (revision 24260) +++ /issm/trunk-jpl/src/m/classes/mismipbasalforcings.py (revision 24261) @@ -54,5 +54,5 @@ self.meltrate_factor = 0.2 self.threshold_thickness = 75. - self.upperdepth_melt = - 100. + self.upperdepth_melt = -100. return self #}}} Index: /issm/trunk-jpl/src/m/classes/model.py =================================================================== --- /issm/trunk-jpl/src/m/classes/model.py (revision 24260) +++ /issm/trunk-jpl/src/m/classes/model.py (revision 24261) @@ -376,5 +376,5 @@ if np.ndim(md2.mesh.edges) > 1 and np.size(md2.mesh.edges, axis=1) > 1: #do not use ~isnan because there are some np.nans... #renumber first two columns - pos = np.nonzero(md2.mesh.edges[:, 3] != - 1)[0] + pos = np.nonzero(md2.mesh.edges[:, 3] != -1)[0] md2.mesh.edges[:, 0] = Pnode[md2.mesh.edges[:, 0] - 1] md2.mesh.edges[:, 1] = Pnode[md2.mesh.edges[:, 1] - 1] @@ -385,16 +385,16 @@ #Replace all zeros by - 1 in the last two columns pos = np.nonzero(md2.mesh.edges[:, 2] == 0)[0] - md2.mesh.edges[pos, 2] = - 1 + md2.mesh.edges[pos, 2] = -1 pos = np.nonzero(md2.mesh.edges[:, 3] == 0)[0] - md2.mesh.edges[pos, 3] = - 1 + md2.mesh.edges[pos, 3] = -1 #Invert - 1 on the third column with last column (Also invert first two columns!!) - pos = np.nonzero(md2.mesh.edges[:, 2] == - 1)[0] + pos = np.nonzero(md2.mesh.edges[:, 2] == -1)[0] md2.mesh.edges[pos, 2] = md2.mesh.edges[pos, 3] - md2.mesh.edges[pos, 3] = - 1 + md2.mesh.edges[pos, 3] = -1 values = md2.mesh.edges[pos, 1] md2.mesh.edges[pos, 1] = md2.mesh.edges[pos, 0] md2.mesh.edges[pos, 0] = values #Finally remove edges that do not belong to any element - pos = np.nonzero(np.logical_and(md2.mesh.edges[:, 1] == - 1, md2.mesh.edges[:, 2] == - 1))[0] + pos = np.nonzero(np.logical_and(md2.mesh.edges[:, 1] == -1, md2.mesh.edges[:, 2] == -1))[0] md2.mesh.edges = np.delete(md2.mesh.edges, pos, axis=0) Index: /issm/trunk-jpl/src/m/classes/organizer.py =================================================================== --- /issm/trunk-jpl/src/m/classes/organizer.py (revision 24260) +++ /issm/trunk-jpl/src/m/classes/organizer.py (revision 24261) @@ -123,5 +123,5 @@ raise IOError("Could find neither '%s' nor '%s'" % (path1, path2)) else: - print((" - - > Branching '%s' from trunk '%s'" % (self.prefix, self.trunkprefix))) + print(("--> Branching '%s' from trunk '%s'" % (self.prefix, self.trunkprefix))) md = loadmodel(path2) return md Index: /issm/trunk-jpl/src/m/classes/plumebasalforcings.py =================================================================== --- /issm/trunk-jpl/src/m/classes/plumebasalforcings.py (revision 24260) +++ /issm/trunk-jpl/src/m/classes/plumebasalforcings.py (revision 24261) @@ -80,6 +80,6 @@ self.crustthickness = 30000 self.uppercrustthickness = 14000 - self.uppercrustheat = 1.7 * 10**- 6 - self.lowercrustheat = 0.4 * 10**- 6 + self.uppercrustheat = 1.7 * 10**-6 + self.lowercrustheat = 0.4 * 10**-6 return self #}}} Index: /issm/trunk-jpl/src/m/classes/qmu/@dakota_method/dakota_method.py =================================================================== --- /issm/trunk-jpl/src/m/classes/qmu/@dakota_method/dakota_method.py (revision 24260) +++ /issm/trunk-jpl/src/m/classes/qmu/@dakota_method/dakota_method.py (revision 24261) @@ -402,5 +402,5 @@ dm.params.show_misc_options = False dm.params.misc_options = [] - dm.params.solution_accuracy = - np.inf + dm.params.solution_accuracy = -np.inf dm.params.stochastic = False dm.params.seed = False Index: /issm/trunk-jpl/src/m/classes/qmu/continuous_design.py =================================================================== --- /issm/trunk-jpl/src/m/classes/qmu/continuous_design.py (revision 24260) +++ /issm/trunk-jpl/src/m/classes/qmu/continuous_design.py (revision 24261) @@ -28,5 +28,5 @@ self.descriptor = '' self.initpt = 0. - self.lower = - np.inf + self.lower = -np.inf self.upper = np.inf self.scale_type = 'none' Index: /issm/trunk-jpl/src/m/classes/qmu/continuous_state.py =================================================================== --- /issm/trunk-jpl/src/m/classes/qmu/continuous_state.py (revision 24260) +++ /issm/trunk-jpl/src/m/classes/qmu/continuous_state.py (revision 24261) @@ -26,5 +26,5 @@ self.descriptor = '' self.initst = 0. - self.lower = - np.inf + self.lower = -np.inf self.upper = np.inf Index: /issm/trunk-jpl/src/m/classes/qmu/linear_inequality_constraint.py =================================================================== --- /issm/trunk-jpl/src/m/classes/qmu/linear_inequality_constraint.py (revision 24260) +++ /issm/trunk-jpl/src/m/classes/qmu/linear_inequality_constraint.py (revision 24261) @@ -25,5 +25,5 @@ def __init__(self): self.matrix = np.array([[float('NaN')]]) - self.lower = - np.Inf + self.lower = -np.Inf self.upper = 0. self.scale_type = 'none' Index: /issm/trunk-jpl/src/m/classes/qmu/nonlinear_inequality_constraint.py =================================================================== --- /issm/trunk-jpl/src/m/classes/qmu/nonlinear_inequality_constraint.py (revision 24260) +++ /issm/trunk-jpl/src/m/classes/qmu/nonlinear_inequality_constraint.py (revision 24261) @@ -25,5 +25,5 @@ def __init__(self): self.descriptor = '' - self.lower = - np.inf + self.lower = -np.inf self.upper = 0. self.scale_type = 'none' Index: /issm/trunk-jpl/src/m/classes/qmu/normal_uncertain.py =================================================================== --- /issm/trunk-jpl/src/m/classes/qmu/normal_uncertain.py (revision 24260) +++ /issm/trunk-jpl/src/m/classes/qmu/normal_uncertain.py (revision 24261) @@ -26,5 +26,5 @@ self.mean = float('NaN') self.stddev = float('NaN') - self.lower = - np.Inf + self.lower = -np.Inf self.upper = np.Inf Index: /issm/trunk-jpl/src/m/classes/qmu/uniform_uncertain.py =================================================================== --- /issm/trunk-jpl/src/m/classes/qmu/uniform_uncertain.py (revision 24260) +++ /issm/trunk-jpl/src/m/classes/qmu/uniform_uncertain.py (revision 24261) @@ -23,5 +23,5 @@ def __init__(self): self.descriptor = '' - self.lower = - np.Inf + self.lower = -np.Inf self.upper = np.Inf Index: /issm/trunk-jpl/src/m/classes/stressbalance.py =================================================================== --- /issm/trunk-jpl/src/m/classes/stressbalance.py (revision 24260) +++ /issm/trunk-jpl/src/m/classes/stressbalance.py (revision 24261) @@ -61,5 +61,5 @@ string = "%s\n%s" % (string, '\n Penalty options:') - string = "%s\n%s" % (string, fielddisplay(self, 'penalty_factor', 'offset used by penalties: penalty = Kmax * 10^offset')) + string = "%s\n%s" % (string, fielddisplay(self, 'penalty_factor', 'offset used by penalties: penalty = Kmax * 1.0**offset')) string = "%s\n%s" % (string, fielddisplay(self, 'vertex_pairing', 'pairs of vertices that are penalized')) @@ -88,10 +88,10 @@ self.maxiter = 100 #Convergence criterion: absolute, relative and residual - self.restol = 10**- 4 + self.restol = 10**-4 self.reltol = 0.01 self.abstol = 10 self.FSreconditioning = 10**13 self.shelf_dampening = 0 - #Penalty factor applied kappa = max(stiffness matrix) * 10^penalty_factor + #Penalty factor applied kappa = max(stiffness matrix) * 1.0**penalty_factor self.penalty_factor = 3 #Stop the iterations of rift if below a threshold Index: /issm/trunk-jpl/src/m/classes/thermal.py =================================================================== --- /issm/trunk-jpl/src/m/classes/thermal.py (revision 24260) +++ /issm/trunk-jpl/src/m/classes/thermal.py (revision 24261) @@ -76,5 +76,5 @@ #Maximum number of iterations self.maxiter = 100 - #factor used to compute the values of the penalties: kappa = max(stiffness matrix) * 10^penalty_factor + #factor used to compute the values of the penalties: kappa = max(stiffness matrix) * 1.0**penalty_factor self.penalty_factor = 3 #Should we use cold ice (default) or enthalpy formulation Index: /issm/trunk-jpl/src/m/consistency/checkfield.py =================================================================== --- /issm/trunk-jpl/src/m/consistency/checkfield.py (revision 24260) +++ /issm/trunk-jpl/src/m/consistency/checkfield.py (revision 24261) @@ -19,6 +19,6 @@ - NaN: 1 if check that there is no NaN - size: [lines cols], NaN for non checked dimensions, or 'universal' for any input type (nodal, element, time series, etc) - - > : greater than provided value - - >= : greater or equal to provided value + -> : greater than provided value + ->= : greater or equal to provided value - < : smallerthan provided value - <=: smaller or equal to provided value Index: /issm/trunk-jpl/src/m/contrib/defleurian/paraview/exportVTK.py =================================================================== --- /issm/trunk-jpl/src/m/contrib/defleurian/paraview/exportVTK.py (revision 24260) +++ /issm/trunk-jpl/src/m/contrib/defleurian/paraview/exportVTK.py (revision 24261) @@ -293,5 +293,5 @@ #paraview does not like NaN, replacing if np.isnan(Val): - CleanVal = - 9999.999 + CleanVal = -9999.999 #also checking for very small value that mess up elif (abs(Val) < 1.0e-20): Index: /issm/trunk-jpl/src/m/contrib/morlighem/bamg/YamsCall.py =================================================================== --- /issm/trunk-jpl/src/m/contrib/morlighem/bamg/YamsCall.py (revision 24260) +++ /issm/trunk-jpl/src/m/contrib/morlighem/bamg/YamsCall.py (revision 24261) @@ -23,5 +23,5 @@ Example: - md = YamsCall(md, md.inversion.vel_obs, 1500, 10^8, 1.3, 0.9) + md = YamsCall(md, md.inversion.vel_obs, 1500, 1.0e8, 1.3, 0.9) """ Index: /issm/trunk-jpl/src/m/inversions/parametercontroldrag.py =================================================================== --- /issm/trunk-jpl/src/m/inversions/parametercontroldrag.py (revision 24260) +++ /issm/trunk-jpl/src/m/inversions/parametercontroldrag.py (revision 24261) @@ -18,5 +18,5 @@ md = parametercontroldrag(md, 'nsteps', 20, 'cm_responses', 0) md = parametercontroldrag(md, 'cm_min', 1, 'cm_max', 150, 'cm_jump', 0.99, 'maxiter', 20) - md = parametercontroldrag(md, eps_cm', 10^-4, 'optscal', [10^7 10^8]) + md = parametercontroldrag(md, eps_cm', 1.0e-4, 'optscal', [1.0e7 1.0e8]) See also PARAMETERCONTROLB Index: /issm/trunk-jpl/src/m/materials/paterson.py =================================================================== --- /issm/trunk-jpl/src/m/materials/paterson.py (revision 24260) +++ /issm/trunk-jpl/src/m/materials/paterson.py (revision 24261) @@ -29,8 +29,8 @@ # %From paterson, # Temp = [0; -2; -5; -10; -15; -20; -25; -30; -35; -40; -45; -50] - # A = [6.8 * 10^-15;2.4 * 10^-15;1.6 * 10^-15;4.9 * 10^-16;2.9 * 10^-16;1.7 * 10^-16;9.4 * - # 10^-17;5.1 * 10^-17;2.7 * 10^-17;1.4 * 10^-17;7.3 * 10^-18;3.6 * 10^-18];;%s - 1(kPa - 3) + # A = [6.8 * 1.0e-15;2.4 * 1.0e-15;1.6 * 1.0e-15;4.9 * 1.0e-16;2.9 * 1.0e-16;1.7 * 1.0e-16;9.4 * + # 1.0e-17;5.1 * 1.0e-17;2.7 * 1.0e-17;1.4 * 1.0e-17;7.3 * 1.0e-18;3.6 * 1.0e-18];;%s - 1(kPa - 3) # %Convert into rigidity B - # B = A.^(-1 / n) * 10^3; %s^(1 / 3)Pa + # B = A.^(-1 / n) * 1.0e3; %s^(1 / 3)Pa # %Now, do a cubic fit between Temp and B: # fittedmodel = fit(Temp, B, 'cubicspline') Index: /issm/trunk-jpl/src/m/mesh/ComputeMetric.py =================================================================== --- /issm/trunk-jpl/src/m/mesh/ComputeMetric.py (revision 24260) +++ /issm/trunk-jpl/src/m/mesh/ComputeMetric.py (revision 24261) @@ -11,5 +11,5 @@ Example: - metric = ComputeMetric(hessian, 2 / 9, 10^-1, 100, 10^5, []) + metric = ComputeMetric(hessian, 2 / 9, 1.0e-1, 100, 1.0e5, []) """ Index: /issm/trunk-jpl/src/m/mesh/bamg.py =================================================================== --- /issm/trunk-jpl/src/m/mesh/bamg.py (revision 24260) +++ /issm/trunk-jpl/src/m/mesh/bamg.py (revision 24261) @@ -26,11 +26,11 @@ subdomains (that need to be inside domain) - - hmin : minimum edge length (default is 10^ - 100) - - hmax : maximum edge length (default is 10^100) + - hmin : minimum edge length (default is 1.0e - 100) + - hmax : maximum edge length (default is 1.0e100) - hVertices : imposed edge length for each vertex (geometry or mesh) - hminVertices : minimum edge length for each vertex (mesh) - hmaxVertices : maximum edge length for each vertex (mesh) - - anisomax : maximum ratio between the smallest and largest edges (default is 10^30) + - anisomax : maximum ratio between the smallest and largest edges (default is 1.0e30) - coeff : coefficient applied to the metric (2 -> twice as many elements, default is 1) - cutoff : scalar used to compute the metric when metric type 2 or 3 are applied @@ -43,5 +43,5 @@ 1 -> use Green formula - KeepVertices : try to keep initial vertices when adaptation is done on an existing mesh (default 1) - - maxnbv : maximum number of vertices used to allocate memory (default is 10^6) + - maxnbv : maximum number of vertices used to allocate memory (default is 1.0e6) - maxsubdiv : maximum subdivision of exisiting elements (default is 10) - metric : matrix (numberofnodes x 3) used as a metric Index: /issm/trunk-jpl/src/m/miscellaneous/prctile_issm.py =================================================================== --- /issm/trunk-jpl/src/m/miscellaneous/prctile_issm.py (revision 24260) +++ /issm/trunk-jpl/src/m/miscellaneous/prctile_issm.py (revision 24261) @@ -16,5 +16,5 @@ # presumably at least 1 input value has been given - # np.shape(integer) - > (), must be at least (1, ) + # np.shape(integer) -> (), must be at least (1, ) psize = np.shape(p) or (1, ) if len(psize) > 1 and np.size(p, 1) > 1: Index: /issm/trunk-jpl/src/m/parameterization/setflowequation.py =================================================================== --- /issm/trunk-jpl/src/m/parameterization/setflowequation.py (revision 24260) +++ /issm/trunk-jpl/src/m/parameterization/setflowequation.py (revision 24261) @@ -150,5 +150,5 @@ SSAflag[pos[pos1]] = True SSAHOflag[pos[pos1]] = False - pos2 = np.where(elist == - 1)[0] + pos2 = np.where(elist == -1)[0] HOflag[pos[pos2]] = True SSAHOflag[pos[pos2]] = False @@ -182,5 +182,5 @@ FSflag[pos[pos1]] = True HOFSflag[pos[pos1]] = False - pos2 = np.where(elist == - 1)[0] + pos2 = np.where(elist == -1)[0] HOflag[pos[pos2]] = True HOFSflag[pos[pos2]] = False @@ -213,5 +213,5 @@ SSAflag[pos[pos1]] = True SSAFSflag[pos[pos1]] = False - pos2 = np.where(elist == - 1)[0] + pos2 = np.where(elist == -1)[0] FSflag[pos[pos2]] = True SSAFSflag[pos[pos2]] = False Index: /issm/trunk-jpl/src/m/parameterization/setmask.py =================================================================== --- /issm/trunk-jpl/src/m/parameterization/setmask.py (revision 24260) +++ /issm/trunk-jpl/src/m/parameterization/setmask.py (revision 24261) @@ -56,5 +56,5 @@ #level sets - md.mask.groundedice_levelset = - 1. * np.ones(md.mesh.numberofvertices) + md.mask.groundedice_levelset = -1. * np.ones(md.mesh.numberofvertices) md.mask.groundedice_levelset[md.mesh.elements[np.nonzero(elementongroundedice), :] - 1] = 1. @@ -66,7 +66,7 @@ #use contourtomesh to set ice values inside ice domain vertexinsideicedomain, elementinsideicedomain = ContourToMesh(elements, x, y, icedomainfile, 'node', 1) - md.mask.ice_levelset[np.nonzero(vertexinsideicedomain)[0]] = - 1. + md.mask.ice_levelset[np.nonzero(vertexinsideicedomain)[0]] = -1. else: - md.mask.ice_levelset = - 1. * np.ones(md.mesh.numberofvertices) + md.mask.ice_levelset = -1. * np.ones(md.mesh.numberofvertices) return md Index: /issm/trunk-jpl/src/m/plot/checkplotoptions.py =================================================================== --- /issm/trunk-jpl/src/m/plot/checkplotoptions.py (revision 24260) +++ /issm/trunk-jpl/src/m/plot/checkplotoptions.py (revision 24261) @@ -17,7 +17,7 @@ if options.exist('unit'): if 'km' in options.getfieldvalue('unit', 'km'): - options.changefieldvalue('unit', 10**- 3) + options.changefieldvalue('unit', 10**-3) elif '100km' in options.getfieldvalue('unit', '100km'): - options.changefieldvalue('unit', 10**- 5) + options.changefieldvalue('unit', 10**-5) # }}} # {{{ density Index: /issm/trunk-jpl/src/m/plot/colormaps/demmap.py =================================================================== --- /issm/trunk-jpl/src/m/plot/colormaps/demmap.py (revision 24260) +++ /issm/trunk-jpl/src/m/plot/colormaps/demmap.py (revision 24261) @@ -61,5 +61,5 @@ interval = landint - cmn = - nsea * interval * (1 + 1e-9) # zero values treated as land + cmn = -nsea * interval * (1 + 1e-9) # zero values treated as land cmx = nland * interval Index: /issm/trunk-jpl/src/m/plot/processdata.py =================================================================== --- /issm/trunk-jpl/src/m/plot/processdata.py (revision 24260) +++ /issm/trunk-jpl/src/m/plot/processdata.py (revision 24261) @@ -6,8 +6,8 @@ PROCESSDATA - process data to be plotted - datatype = 1 - > elements - datatype = 2 - > nodes - datatype = 3 - > node quivers - datatype = 4 - > patch + datatype = 1 -> elements + datatype = 2 -> nodes + datatype = 3 -> node quivers + datatype = 4 -> patch Usage: Index: /issm/trunk-jpl/src/m/plot/writejsfile.py =================================================================== --- /issm/trunk-jpl/src/m/plot/writejsfile.py (revision 24260) +++ /issm/trunk-jpl/src/m/plot/writejsfile.py (revision 24261) @@ -20,10 +20,10 @@ fid.write('model["initialZoomFactor"]={0};\n'.format(model.initialZoomFactor)) #write index: - fid.write(' < ! - - model["index"]{{{ - - > \n') - fid.write('model["index"] = [') + fid.write('\n') + fid.write('model["index"]=[') for i in range(0, nel - 1): - fid.write('[{0}, {1}, {2}], '.format(model.index[i][0], model.index[i][1], model.index[i][2])) - fid.write('[{0}, {1}, {2}]];\n'.format(model.index[-1][0], model.index[-1][1], model.index[-1][2])) - fid.write(' < ! - - }}} - - > \n') + fid.write('[{0},{1},{2}], '.format(model.index[i][0], model.index[i][1], model.index[i][2])) + fid.write('[{0},{1},{2}]];\n'.format(model.index[-1][0], model.index[-1][1], model.index[-1][2])) + fid.write('\n') print('writing model coordinates') writejsfield(fid, 'model["x"]', model.x, nods) @@ -45,15 +45,15 @@ fid.write('result={};\n') writejsfield(fid, 'result["data"]', results[i].data, nods) - fid.write(' < ! - - {{{ - - > \n') - fid.write('result["caxis"] = [{0}, {1}];\n'.format(results[i].caxis[0], results[i].caxis[1])) - fid.write('result["label"] = "{0}";\n'.format(results[i].label)) - fid.write('result["shortlabel"] = "{0}";\n'.format(results[i].shortlabel)) - fid.write('result["unit"] = "{0}";\n'.format(results[i].unit)) + fid.write('\n') + fid.write('result["caxis"]=[{0},{1}];\n'.format(results[i].caxis[0], results[i].caxis[1])) + fid.write('result["label"]="{0}";\n'.format(results[i].label)) + fid.write('result["shortlabel"]="{0}";\n'.format(results[i].shortlabel)) + fid.write('result["unit"]="{0}";\n'.format(results[i].unit)) if type(results[i].data) == np.float64: - fid.write('result["time_range"] = [{0}, {1}];\n'.format(results[i].time_range[0], results[i].time_range[1])) - fid.write('results["{0}"] = result;\n'.format(i)) - fid.write(' < ! - - }}} - - > \n') - fid.write('model.results = results;\n') - fid.write('models["{0}"] = model;\n'.format(keyname)) + fid.write('result["time_range"]=[{0},{1}];\n'.format(results[i].time_range[0], results[i].time_range[1])) + fid.write('results["{0}"]=result;\n'.format(i)) + fid.write('\n') + fid.write('model.results=results;\n') + fid.write('models["{0}"]=model;\n'.format(keyname)) fid.close() Index: /issm/trunk-jpl/test/NightlyRun/GetIds.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/GetIds.py (revision 24260) +++ /issm/trunk-jpl/test/NightlyRun/GetIds.py (revision 24261) @@ -50,6 +50,6 @@ # many inputs of both ids and test names - # ids_names[0] - > ids_names by id - # ids_names[1] - > ids_names by test name + # ids_names[0] -> ids_names by id + # ids_names[1] -> ids_names by test name if type(ids_names) == list and len(ids_names) == 2: if type(ids_names[0]) == list and len(ids_names[0]) > 0 and type(ids_names[0][0]) == int: @@ -62,5 +62,5 @@ # no recognizable ids or id formats if np.size(ids) == 0 and not np.all(np.equal(ids_names, None)): - raise RuntimeError('runme.py: GetIds.py: include and exclude options (-i / --id; -in / --include_name; - e / --exclude; - en / --exclude_name) options must follow GetIds usage format:\n' + GetIds.__doc__) + raise RuntimeError('runme.py: GetIds.py: include and exclude options (-i/--id; -in/--include_name; -e/--exclude; -en/--exclude_name) options must follow GetIds usage format:\n' + GetIds.__doc__) return np.array(ids).astype(int) Index: /issm/trunk-jpl/test/NightlyRun/test1101.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1101.py (revision 24260) +++ /issm/trunk-jpl/test/NightlyRun/test1101.py (revision 24261) @@ -63,5 +63,5 @@ #Now plot vx, vy, vz and vx on a cross section -# plotmodel(md, 'data', vx, 'layer #all', md.mesh.numberoflayers, 'xlim', [0 L / 10^3], 'ylim', [0 L / 10^3], 'unit', 'km') +# plotmodel(md, 'data', vx, 'layer #all', md.mesh.numberoflayers, 'xlim', [0 L / 1.0e3], 'ylim', [0 L / 1.0e3], 'unit', 'km') if printingflag: pass @@ -69,5 +69,5 @@ # printmodel(['ismipaHOvx' num2str(L)], 'png', 'margin', 'on', 'marginsize', 25, 'frame', 'off', 'resolution', 1.5, 'hardcopy', 'off') # shutil.move("ismipaHOvx%d.png" % L, ISSM_DIR + '/website/doc_pdf/validation/Images/ISMIP/TestA') -# plotmodel(md, 'data', vy, 'layer #all', md.mesh.numberoflayers, 'xlim', [0 L / 10^3], 'ylim', [0 L / 10^3], 'unit', 'km') +# plotmodel(md, 'data', vy, 'layer #all', md.mesh.numberoflayers, 'xlim', [0 L / 1.0e3], 'ylim', [0 L / 1.0e3], 'unit', 'km') if printingflag: pass @@ -75,5 +75,5 @@ # printmodel(['ismipaHOvy' num2str(L)], 'png', 'margin', 'on', 'marginsize', 25, 'frame', 'off', 'resolution', 1.5, 'hardcopy', 'off') # shutil.move("ismipaHOvy%d.png" % L, ISSM_DIR + '/website/doc_pdf/validation/Images/ISMIP/TestA') -# plotmodel(md, 'data', vz, 'layer #all', md.mesh.numberoflayers, 'xlim', [0 L / 10^3], 'ylim', [0 L / 10^3], 'unit', 'km') +# plotmodel(md, 'data', vz, 'layer #all', md.mesh.numberoflayers, 'xlim', [0 L / 1.0e3], 'ylim', [0 L / 1.0e3], 'unit', 'km') if printingflag: pass Index: /issm/trunk-jpl/test/NightlyRun/test1102.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1102.py (revision 24260) +++ /issm/trunk-jpl/test/NightlyRun/test1102.py (revision 24261) @@ -62,5 +62,5 @@ #Now plot vx, vy, vz and vx on a cross section - # plotmodel(md, 'data', vx, 'layer #all', md.mesh.numberoflayers, 'xlim', [0 L / 10^3], 'ylim', [0 L / 10^3], 'unit', 'km', 'figure', 2) + # plotmodel(md, 'data', vx, 'layer #all', md.mesh.numberoflayers, 'xlim', [0 L / 1.0e3], 'ylim', [0 L / 1.0e3], 'unit', 'km', 'figure', 2) if printingflag: pass @@ -68,5 +68,5 @@ # printmodel(['ismipaFSvx' num2str(L)], 'png', 'margin', 'on', 'marginsize', 25, 'frame', 'off', 'resolution', 1.5, 'hardcopy', 'off') # shutil.move("ismipaFSvx%d.png" % L, ISSM_DIR + '/website/doc_pdf/validation/Images/ISMIP/TestA') - # plotmodel(md, 'data', vy, 'layer #all', md.mesh.numberoflayers, 'xlim', [0 L / 10^3], 'ylim', [0 L / 10^3], 'unit', 'km', 'figure', 3) + # plotmodel(md, 'data', vy, 'layer #all', md.mesh.numberoflayers, 'xlim', [0 L / 1.0e3], 'ylim', [0 L / 1.0e3], 'unit', 'km', 'figure', 3) if printingflag: pass @@ -74,5 +74,5 @@ # printmodel(['ismipaFSvy' num2str(L)], 'png', 'margin', 'on', 'marginsize', 25, 'frame', 'off', 'resolution', 1.5, 'hardcopy', 'off') # shutil.move("ismipaFSvy%d.png" % L, ISSM_DIR + '/website/doc_pdf/validation/Images/ISMIP/TestA') - # plotmodel(md, 'data', vz, 'layer #all', md.mesh.numberoflayers, 'xlim', [0 L / 10^3], 'ylim', [0 L / 10^3], 'unit', 'km', 'figure', 4) + # plotmodel(md, 'data', vz, 'layer #all', md.mesh.numberoflayers, 'xlim', [0 L / 1.0e3], 'ylim', [0 L / 1.0e3], 'unit', 'km', 'figure', 4) if printingflag: pass Index: /issm/trunk-jpl/test/NightlyRun/test1103.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1103.py (revision 24260) +++ /issm/trunk-jpl/test/NightlyRun/test1103.py (revision 24261) @@ -62,5 +62,5 @@ #Now plot vx, vy, vz and vx on a cross section -# plotmodel(md, 'data', vx, 'layer #all', md.mesh.numberoflayers, 'xlim', [0 L / 10^3], 'ylim', [0 L / 10^3], 'unit', 'km') +# plotmodel(md, 'data', vx, 'layer #all', md.mesh.numberoflayers, 'xlim', [0 L / 1.0e3], 'ylim', [0 L / 1.0e3], 'unit', 'km') if printingflag: pass @@ -68,5 +68,5 @@ # printmodel(['ismipbHOvx' num2str(L)], 'png', 'margin', 'on', 'marginsize', 25, 'frame', 'off', 'resolution', 1.5, 'hardcopy', 'off') # shutil.move("ismipbHOvx%d.png" % L, ISSM_DIR + '/website/doc_pdf/validation/Images/ISMIP/TestB') -# plotmodel(md, 'data', vz, 'layer #all', md.mesh.numberoflayers, 'xlim', [0 L / 10^3], 'ylim', [0 L / 10^3], 'unit', 'km') +# plotmodel(md, 'data', vz, 'layer #all', md.mesh.numberoflayers, 'xlim', [0 L / 1.0e3], 'ylim', [0 L / 1.0e3], 'unit', 'km') if printingflag: pass Index: /issm/trunk-jpl/test/NightlyRun/test1105.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1105.py (revision 24260) +++ /issm/trunk-jpl/test/NightlyRun/test1105.py (revision 24261) @@ -51,20 +51,20 @@ if (L == 5000.): md.stressbalance.spcvx[pos] = 15.66 - md.stressbalance.spcvy[pos] = - 0.1967 + md.stressbalance.spcvy[pos] = -0.1967 elif (L == 10000.): md.stressbalance.spcvx[pos] = 16.04 - md.stressbalance.spcvy[pos] = - 0.1977 + md.stressbalance.spcvy[pos] = -0.1977 elif (L == 20000.): md.stressbalance.spcvx[pos] = 16.53 - md.stressbalance.spcvy[pos] = - 1.27 + md.stressbalance.spcvy[pos] = -1.27 elif (L == 40000.): md.stressbalance.spcvx[pos] = 17.23 - md.stressbalance.spcvy[pos] = - 3.17 + md.stressbalance.spcvy[pos] = -3.17 elif (L == 80000.): md.stressbalance.spcvx[pos] = 16.68 - md.stressbalance.spcvy[pos] = - 2.69 + md.stressbalance.spcvy[pos] = -2.69 elif (L == 160000.): md.stressbalance.spcvx[pos] = 16.03 - md.stressbalance.spcvy[pos] = - 1.27 + md.stressbalance.spcvy[pos] = -1.27 #Spc the bed at zero for vz @@ -85,5 +85,5 @@ #Now plot vx, vy, vz and vx on a cross section -# plotmodel(md, 'data', vx, 'layer #all', md.mesh.numberoflayers, 'xlim', [0 L / 10^3], 'ylim', [0 L / 10^3], 'unit', 'km', 'figure', 2) +# plotmodel(md, 'data', vx, 'layer #all', md.mesh.numberoflayers, 'xlim', [0 L / 1.0e3], 'ylim', [0 L / 1.0e3], 'unit', 'km', 'figure', 2) if printingflag: pass @@ -91,5 +91,5 @@ # printmodel(['ismipcHOvx' num2str(L)], 'png', 'margin', 'on', 'marginsize', 25, 'frame', 'off', 'resolution', 1.5, 'hardcopy', 'off') # shutil.move("ismipcHOvx%d.png" % L, ISSM_DIR + '/website/doc_pdf/validation/Images/ISMIP/TestC') -# plotmodel(md, 'data', vy, 'layer #all', md.mesh.numberoflayers, 'xlim', [0 L / 10^3], 'ylim', [0 L / 10^3], 'unit', 'km', 'figure', 3) +# plotmodel(md, 'data', vy, 'layer #all', md.mesh.numberoflayers, 'xlim', [0 L / 1.0e3], 'ylim', [0 L / 1.0e3], 'unit', 'km', 'figure', 3) if printingflag: pass @@ -97,5 +97,5 @@ # printmodel(['ismipcHOvy' num2str(L)], 'png', 'margin', 'on', 'marginsize', 25, 'frame', 'off', 'resolution', 1.5, 'hardcopy', 'off') # shutil.move("ismipcHOvy%d.png" % L, ISSM_DIR + '/website/doc_pdf/validation/Images/ISMIP/TestC') -# plotmodel(md, 'data', vz, 'layer #all', md.mesh.numberoflayers, 'xlim', [0 L / 10^3], 'ylim', [0 L / 10^3], 'unit', 'km', 'figure', 4) +# plotmodel(md, 'data', vz, 'layer #all', md.mesh.numberoflayers, 'xlim', [0 L / 1.0e3], 'ylim', [0 L / 1.0e3], 'unit', 'km', 'figure', 4) if printingflag: pass Index: /issm/trunk-jpl/test/NightlyRun/test1106.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1106.py (revision 24260) +++ /issm/trunk-jpl/test/NightlyRun/test1106.py (revision 24261) @@ -30,20 +30,20 @@ if (L == 5000.): md.stressbalance.spcvx[pos] = 15.66 - md.stressbalance.spcvy[pos] = - 0.1967 + md.stressbalance.spcvy[pos] = -0.1967 elif (L == 10000.): md.stressbalance.spcvx[pos] = 16.04 - md.stressbalance.spcvy[pos] = - 0.1977 + md.stressbalance.spcvy[pos] = -0.1977 elif (L == 20000.): md.stressbalance.spcvx[pos] = 16.53 - md.stressbalance.spcvy[pos] = - 1.27 + md.stressbalance.spcvy[pos] = -1.27 elif (L == 40000.): md.stressbalance.spcvx[pos] = 17.23 - md.stressbalance.spcvy[pos] = - 3.17 + md.stressbalance.spcvy[pos] = -3.17 elif (L == 80000.): md.stressbalance.spcvx[pos] = 16.68 - md.stressbalance.spcvy[pos] = - 2.69 + md.stressbalance.spcvy[pos] = -2.69 elif (L == 160000.): md.stressbalance.spcvx[pos] = 16.03 - md.stressbalance.spcvy[pos] = - 1.27 + md.stressbalance.spcvy[pos] = -1.27 md = setflowequation(md, 'FS', 'all') Index: /issm/trunk-jpl/test/NightlyRun/test1107.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1107.py (revision 24260) +++ /issm/trunk-jpl/test/NightlyRun/test1107.py (revision 24261) @@ -82,5 +82,5 @@ #Now plot vx, vy, vz and vx on a cross section -# plotmodel(md, 'data', vx, 'layer #all', md.mesh.numberoflayers, 'xlim', [0 L / 10^3], 'ylim', [0 L / 10^3], 'unit', 'km', 'figure', 2) +# plotmodel(md, 'data', vx, 'layer #all', md.mesh.numberoflayers, 'xlim', [0 L / 1.0e3], 'ylim', [0 L / 1.0e3], 'unit', 'km', 'figure', 2) if printingflag: pass @@ -88,5 +88,5 @@ # printmodel(['ismipdHOvx' num2str(L)], 'png', 'margin', 'on', 'marginsize', 25, 'frame', 'off', 'resolution', 1.5, 'hardcopy', 'off') # shutil.move("ismipdHOvx%d.png" % L, ISSM_DIR + '/website/doc_pdf/validation/Images/ISMIP/TestD') -# plotmodel(md, 'data', vz, 'layer #all', md.mesh.numberoflayers, 'xlim', [0 L / 10^3], 'ylim', [0 L / 10^3], 'unit', 'km', 'figure', 3) +# plotmodel(md, 'data', vz, 'layer #all', md.mesh.numberoflayers, 'xlim', [0 L / 1.0e3], 'ylim', [0 L / 1.0e3], 'unit', 'km', 'figure', 3) if printingflag: pass Index: /issm/trunk-jpl/test/NightlyRun/test1201.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1201.py (revision 24260) +++ /issm/trunk-jpl/test/NightlyRun/test1201.py (revision 24261) @@ -28,5 +28,5 @@ print(" initial velocity") md.initialization.vx = np.zeros((md.mesh.numberofvertices)) - md.initialization.vy = - 400. * np.ones((md.mesh.numberofvertices)) + md.initialization.vy = -400. * np.ones((md.mesh.numberofvertices)) #Stabilization Index: /issm/trunk-jpl/test/NightlyRun/test1202.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1202.py (revision 24260) +++ /issm/trunk-jpl/test/NightlyRun/test1202.py (revision 24261) @@ -38,5 +38,5 @@ # system(['mv eismintdiag1vx.png ' ISSM_DIR '/website/doc_pdf/validation/Images/EISMINT/IceShelf ']) -#plotmodel(md, 'data', vy, 'contourlevels', { - 100, -200, -300, -400, -500, -600, -700, -800, -900, -1000}, ... +#plotmodel(md, 'data', vy, 'contourlevels', { -100, -200, -300, -400, -500, -600, -700, -800, -900, -1000}, ... # 'contourcolor', 'k') if printingflag: Index: /issm/trunk-jpl/test/NightlyRun/test1203.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1203.py (revision 24260) +++ /issm/trunk-jpl/test/NightlyRun/test1203.py (revision 24261) @@ -45,5 +45,5 @@ # printmodel('eismintdiag2vx', 'png', 'margin', 'on', 'marginsize', 25, 'frame', 'off', 'resolution', 2, 'hardcopy', 'off') # system(['mv eismintdiag2vx.png ' ISSM_DIR '/website/doc_pdf/validation/Images/EISMINT/IceShelf ']) -#plotmodel(md, 'data', vy, 'contourlevels', { - 100, -200, -300, -400, -500, -600, -700, -800, -900, -1000}, ... +#plotmodel(md, 'data', vy, 'contourlevels', { -100, -200, -300, -400, -500, -600, -700, -800, -900, -1000}, ... # 'contourcolor', 'k') if printingflag: Index: /issm/trunk-jpl/test/NightlyRun/test1301.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1301.py (revision 24260) +++ /issm/trunk-jpl/test/NightlyRun/test1301.py (revision 24261) @@ -49,5 +49,5 @@ #plotmodel(md, 'data', comp_melting, 'title', 'Modeled melting', 'data', melting, 'title', 'Analytical melting', ... # 'data', comp_melting - melting, 'title', 'Absolute error', 'data', relative, 'title', 'Relative error [%]', ... -# 'layer #all', 1, 'caxis #2', [1.02964 1.02966] * 10^ - 4, 'FontSize #all', 20, 'figposition', 'mathieu') +# 'layer #all', 1, 'caxis #2', [1.02964 1.02966] * 1.0e - 4, 'FontSize #all', 20, 'figposition', 'mathieu') if printingflag: pass Index: /issm/trunk-jpl/test/NightlyRun/test1302.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1302.py (revision 24260) +++ /issm/trunk-jpl/test/NightlyRun/test1302.py (revision 24261) @@ -22,5 +22,5 @@ md = setmask(md, '', '') md = parameterize(md, '../Par/SquareThermal.py') -md.extrude(30, 1.) #NB: the more one extrudes, the better (10 - > relative~0.35%, 20 - > 0.1%, 30 - > 0.05%) +md.extrude(30, 1.) #NB: the more one extrudes, the better (10 -> relative~0.35%, 20 -> 0.1%, 30 -> 0.05%) md = setflowequation(md, 'HO', 'all') @@ -38,6 +38,6 @@ #d2T / dz2 - w * rho_ice * c / k * dT / dz = 0 T(surface)=0 T(bed)=10 = > T = A exp(alpha z) + B alpha = 0.1 / md.constants.yts * md.materials.rho_ice * md.materials.heatcapacity / md.materials.thermalconductivity #alpha = w rho_ice c / k and w = 0.1m / an -A = 10. / (np.exp(alpha * (-1000.)) - 1.) #A = T(bed) / (exp(alpha * bed) - 1) with bed= - 1000 T(bed)=10 -B = - A +A = 10. / (np.exp(alpha * (-1000.)) - 1.) #A = T(bed) / (exp(alpha * bed) - 1) with bed= -1000 T(bed)=10 +B = -A md.initialization.temperature = A * np.exp(alpha * md.mesh.z) + B Index: /issm/trunk-jpl/test/NightlyRun/test1304.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1304.py (revision 24260) +++ /issm/trunk-jpl/test/NightlyRun/test1304.py (revision 24261) @@ -33,6 +33,6 @@ #analytical results #the result is linear with depth and is equal to 0 on the upper surface (See BC) -#d2T / dz2 = 0 - k * dT / dz(bed)=G T(surface)=0 = > T= - G / k * (z - surface) -md.initialization.temperature = - 0.1 / md.materials.thermalconductivity * (md.mesh.z - md.geometry.surface) #G = 0.1 W / m2 +#d2T / dz2 = 0 - k * dT / dz(bed)=G T(surface)=0 = > T= -G / k * (z - surface) +md.initialization.temperature = -0.1 / md.materials.thermalconductivity * (md.mesh.z - md.geometry.surface) #G = 0.1 W / m2 #modeled results Index: /issm/trunk-jpl/test/NightlyRun/test2002.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test2002.py (revision 24260) +++ /issm/trunk-jpl/test/NightlyRun/test2002.py (revision 24261) @@ -24,8 +24,8 @@ longe = np.sum(md.mesh.long[md.mesh.elements - 1], axis=1) / 3 pos = np.where(late < -80) -md.slr.deltathickness[pos] = - 100 +md.slr.deltathickness[pos] = -100 #greenland pos = np.where(np.logical_and.reduce((late > 70, late < 80, longe > -60, longe < -30))) -md.slr.deltathickness[pos] = - 100 +md.slr.deltathickness[pos] = -100 #elastic loading from love numbers: @@ -41,7 +41,7 @@ icemask = np.ones((md.mesh.numberofvertices)) pos = np.where(mask == 0)[0] -icemask[pos] = - 1 +icemask[pos] = -1 pos = np.where(np.sum(mask[md.mesh.elements.astype(int) - 1], axis=1) < 3)[0] -icemask[md.mesh.elements[pos, :].astype(int) - 1] = - 1 +icemask[md.mesh.elements[pos, :].astype(int) - 1] = -1 md.mask.ice_levelset = icemask md.mask.ocean_levelset = np.zeros((md.mesh.numberofvertices)) @@ -51,5 +51,5 @@ #make sure that the ice level set is all inclusive: md.mask.land_levelset = np.zeros((md.mesh.numberofvertices)) -md.mask.groundedice_levelset = - np.ones((md.mesh.numberofvertices)) +md.mask.groundedice_levelset = -np.ones((md.mesh.numberofvertices)) #make sure that the elements that have loads are fully grounded: @@ -58,5 +58,5 @@ #make sure wherever there is an ice load, that the mask is set to ice: -icemask[md.mesh.elements[pos, :] - 1] = - 1 +icemask[md.mesh.elements[pos, :] - 1] = -1 md.mask.ice_levelset = icemask Index: /issm/trunk-jpl/test/NightlyRun/test2003.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test2003.py (revision 24260) +++ /issm/trunk-jpl/test/NightlyRun/test2003.py (revision 24261) @@ -26,5 +26,5 @@ longe = sum(md.mesh.long[md.mesh.elements - 1], 1) / 3 pos = np.intersect1d(np.array(np.where(late < -75)), np.array(np.where(longe < 0))) -md.slr.deltathickness[pos] = - 1 +md.slr.deltathickness[pos] = -1 #elastic loading from love numbers: @@ -45,7 +45,7 @@ pos = np.where(mask == 0) #pos[0] because np.where(mask = 0) returns a 2d array, the latter parts of which are all array / s of 0s -icemask[pos[0]] = - 1 +icemask[pos[0]] = -1 pos = np.where(sum(mask[md.mesh.elements - 1], 1) < 3) -icemask[md.mesh.elements[pos, :] - 1] = - 1 +icemask[md.mesh.elements[pos, :] - 1] = -1 md.mask.ice_levelset = icemask md.mask.ocean_levelset = np.zeros((md.mesh.numberofvertices, )) @@ -55,5 +55,5 @@ #make sure that the ice level set is all inclusive: md.mask.land_levelset = np.zeros((md.mesh.numberofvertices, )) -md.mask.groundedice_levelset = - np.ones((md.mesh.numberofvertices, )) +md.mask.groundedice_levelset = -np.ones((md.mesh.numberofvertices, )) #make sure that the elements that have loads are fully grounded: @@ -62,5 +62,5 @@ #make sure wherever there is an ice load, that the mask is set to ice: -icemask[md.mesh.elements[pos, :] - 1] = - 1 +icemask[md.mesh.elements[pos, :] - 1] = -1 md.mask.ice_levelset = icemask # }}} Index: /issm/trunk-jpl/test/NightlyRun/test2010.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test2010.py (revision 24260) +++ /issm/trunk-jpl/test/NightlyRun/test2010.py (revision 24261) @@ -22,6 +22,6 @@ md.slr.deltathickness = np.zeros((md.mesh.numberofelements, )) pos = np.intersect1d(np.array(np.where(late < -75)), np.array(np.where(longe > 0))) -#python does not include last element in array slices, (6:7) - > [5:7] -md.slr.deltathickness[pos[5:7]] = - 1 +#python does not include last element in array slices, (6:7) -> [5:7] +md.slr.deltathickness[pos[5:7]] = -1 md.slr.sealevel = np.zeros((md.mesh.numberofvertices, )) @@ -45,7 +45,7 @@ icemask = np.ones((md.mesh.numberofvertices, )) pos = np.where(mask == 0) -icemask[pos[0]] = - 1 +icemask[pos[0]] = -1 pos = np.where(sum(mask[md.mesh.elements - 1], 1) < 3) -icemask[md.mesh.elements[pos, :] - 1] = - 1 +icemask[md.mesh.elements[pos, :] - 1] = -1 md.mask.ice_levelset = icemask md.mask.ocean_levelset = np.zeros((md.mesh.numberofvertices, )) @@ -55,5 +55,5 @@ #make sure that the ice level set is all inclusive: md.mask.land_levelset = np.zeros((md.mesh.numberofvertices, )) -md.mask.groundedice_levelset = - np.ones((md.mesh.numberofvertices, )) +md.mask.groundedice_levelset = -np.ones((md.mesh.numberofvertices, )) #make sure that the elements that have loads are fully grounded: @@ -62,5 +62,5 @@ #make sure wherever there is an ice load, that the mask is set to ice: -icemask[md.mesh.elements[pos, :] - 1] = - 1 +icemask[md.mesh.elements[pos, :] - 1] = -1 md.mask.ice_levelset = icemask # }}} Index: /issm/trunk-jpl/test/NightlyRun/test2101.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test2101.py (revision 24260) +++ /issm/trunk-jpl/test/NightlyRun/test2101.py (revision 24261) @@ -19,5 +19,5 @@ md.esa.deltathickness = np.zeros((md.mesh.numberofelements, )) pos = 449 -md.esa.deltathickness[pos] = - 100 # this is the only "icy" element +md.esa.deltathickness[pos] = -100 # this is the only "icy" element #love numbers: @@ -35,8 +35,8 @@ md.mask.ice_levelset = np.ones((md.mesh.numberofvertices, )) pos = np.where(md.esa.deltathickness) -md.mask.ice_levelset[md.mesh.elements[pos, :]] = - 1 +md.mask.ice_levelset[md.mesh.elements[pos, :]] = -1 #is ice grounded? -md.mask.groundedice_levelset = - np.ones((md.mesh.numberofvertices, )) +md.mask.groundedice_levelset = -np.ones((md.mesh.numberofvertices, )) pos = np.where(md.mask.ice_levelset <= 0) md.mask.groundedice_levelset[pos] = 1 Index: /issm/trunk-jpl/test/NightlyRun/test2110.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test2110.py (revision 24260) +++ /issm/trunk-jpl/test/NightlyRun/test2110.py (revision 24261) @@ -21,5 +21,5 @@ y_element = np.mean(md.mesh.y[index - 1], 1) rad_dist = np.sqrt(x_element**2 + y_element**2) / 1000 # radial distance in km -md.esa.deltathickness[np.where(rad_dist <= disc_radius)] = - 1 # 1 m water withdrawl +md.esa.deltathickness[np.where(rad_dist <= disc_radius)] = -1 # 1 m water withdrawl #love numbers: @@ -34,8 +34,8 @@ md.mask.ice_levelset = np.ones((md.mesh.numberofvertices, )) pos = np.where(md.esa.deltathickness) -md.mask.ice_levelset[md.mesh.elements[pos, :] - 1] = - 1 +md.mask.ice_levelset[md.mesh.elements[pos, :] - 1] = -1 #is ice grounded? -md.mask.groundedice_levelset = - np.ones((md.mesh.numberofvertices, )) +md.mask.groundedice_levelset = -np.ones((md.mesh.numberofvertices, )) pos = np.where(md.mask.ice_levelset <= 0) md.mask.groundedice_levelset[pos] = 1 Index: /issm/trunk-jpl/test/NightlyRun/test2111.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test2111.py (revision 24260) +++ /issm/trunk-jpl/test/NightlyRun/test2111.py (revision 24261) @@ -21,5 +21,5 @@ y_element = np.mean(md.mesh.y[index - 1], 1) - 1.0e6 rad_dist = np.sqrt(x_element**2 + y_element**2) / 1000 # radial distance in km -md.esa.deltathickness[np.where(rad_dist <= disc_radius)] = - 1 # 1 m water withdrawl +md.esa.deltathickness[np.where(rad_dist <= disc_radius)] = -1 # 1 m water withdrawl # }}} #love numbers: {{{ @@ -34,8 +34,8 @@ md.mask.ice_levelset = np.ones((md.mesh.numberofvertices, )) pos = np.where(md.esa.deltathickness) -md.mask.ice_levelset[md.mesh.elements[pos, :]] = - 1 +md.mask.ice_levelset[md.mesh.elements[pos, :]] = -1 #is ice grounded? -md.mask.groundedice_levelset = - np.ones((md.mesh.numberofvertices, )) +md.mask.groundedice_levelset = -np.ones((md.mesh.numberofvertices, )) pos = np.where(md.mask.ice_levelset <= 0) md.mask.groundedice_levelset[pos] = 1 @@ -56,5 +56,5 @@ md.miscellaneous.name = 'test2111' md.esa.degacc = 0.01 -md.esa.hemisphere = - 1 +md.esa.hemisphere = -1 # }}} Index: /issm/trunk-jpl/test/NightlyRun/test2112.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test2112.py (revision 24260) +++ /issm/trunk-jpl/test/NightlyRun/test2112.py (revision 24261) @@ -20,5 +20,5 @@ y_element = np.mean(md.mesh.y[index - 1], 1) rad_dist = np.sqrt(x_element**2 + y_element**2) / 1000 # radial distance in km -md.esa.deltathickness[np.where(rad_dist <= disc_radius)] = - 1 # 1 m water withdrawl +md.esa.deltathickness[np.where(rad_dist <= disc_radius)] = -1 # 1 m water withdrawl # }}} #love numbers: {{{ @@ -33,8 +33,8 @@ md.mask.ice_levelset = np.ones((md.mesh.numberofvertices, )) pos = np.where(md.esa.deltathickness) -md.mask.ice_levelset[md.mesh.elements[pos, :]] = - 1 +md.mask.ice_levelset[md.mesh.elements[pos, :]] = -1 #is ice grounded? -md.mask.groundedice_levelset = - np.ones((md.mesh.numberofvertices, )) +md.mask.groundedice_levelset = -np.ones((md.mesh.numberofvertices, )) pos = np.where(md.mask.ice_levelset <= 0) md.mask.groundedice_levelset[pos] = 1 @@ -55,5 +55,5 @@ md.miscellaneous.name = 'test2112' md.esa.degacc = 0.01 -md.esa.hemisphere = - 1 +md.esa.hemisphere = -1 # }}} Index: /issm/trunk-jpl/test/NightlyRun/test2113.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test2113.py (revision 24260) +++ /issm/trunk-jpl/test/NightlyRun/test2113.py (revision 24261) @@ -22,5 +22,5 @@ y_element = np.mean(md.mesh.y[index - 1], 1) + 1.0e6 rad_dist = np.sqrt(x_element**2 + y_element**2) / 1000 # radial distance in km -md.esa.deltathickness[np.where(rad_dist <= disc_radius)] = - 1 # 1 m water withdrawl +md.esa.deltathickness[np.where(rad_dist <= disc_radius)] = -1 # 1 m water withdrawl # }}} #love numbers: {{{ @@ -35,8 +35,8 @@ md.mask.ice_levelset = np.ones((md.mesh.numberofvertices, )) pos = np.where(md.esa.deltathickness) -md.mask.ice_levelset[md.mesh.elements[pos, :]] = - 1 +md.mask.ice_levelset[md.mesh.elements[pos, :]] = -1 #is ice grounded? -md.mask.groundedice_levelset = - np.ones((md.mesh.numberofvertices, )) +md.mask.groundedice_levelset = -np.ones((md.mesh.numberofvertices, )) pos = np.where(md.mask.ice_levelset <= 0) md.mask.groundedice_levelset[pos] = 1 Index: /issm/trunk-jpl/test/NightlyRun/test217.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test217.py (revision 24260) +++ /issm/trunk-jpl/test/NightlyRun/test217.py (revision 24261) @@ -34,5 +34,5 @@ h = 1000. md.geometry.thickness = h * np.ones((md.mesh.numberofvertices)) -md.geometry.base = - md.materials.rho_ice / md.materials.rho_water * md.geometry.thickness +md.geometry.base = -md.materials.rho_ice / md.materials.rho_water * md.geometry.thickness md.geometry.surface = md.geometry.base + md.geometry.thickness @@ -67,5 +67,5 @@ pos = np.where(md.mesh.y == ymax) nodeonicefront[pos] = 1 -md.mask.ice_levelset = - 1 + nodeonicefront +md.mask.ice_levelset = -1 + nodeonicefront md = solve(md, 'Stressbalance') Index: /issm/trunk-jpl/test/NightlyRun/test218.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test218.py (revision 24260) +++ /issm/trunk-jpl/test/NightlyRun/test218.py (revision 24261) @@ -42,5 +42,5 @@ h = 1000. md.geometry.thickness = h * np.ones((md.mesh.numberofvertices, )) -md.geometry.base = - md.materials.rho_ice / md.materials.rho_water * md.geometry.thickness +md.geometry.base = -md.materials.rho_ice / md.materials.rho_water * md.geometry.thickness md.geometry.surface = md.geometry.base + md.geometry.thickness @@ -80,5 +80,5 @@ #dakota version version = IssmConfig('_DAKOTA_VERSION_') -# returns tuple "(u'6.2', )" - > unicode string '6.2', convert to float +# returns tuple "(u'6.2', )" -> unicode string '6.2', convert to float version = float(version[0]) @@ -106,5 +106,5 @@ #imperative! -md.stressbalance.reltol = 10**- 10 #tighten for qmu analysis +md.stressbalance.reltol = 10**-10 #tighten for qmu analysis md.qmu.isdakota = 1 Index: /issm/trunk-jpl/test/NightlyRun/test234.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test234.py (revision 24260) +++ /issm/trunk-jpl/test/NightlyRun/test234.py (revision 24261) @@ -81,5 +81,5 @@ md.qmu.params.evaluation_concurrency = 1 -md.stressbalance.reltol = 10**- 5 #tighten for qmu analyses +md.stressbalance.reltol = 10**-5 #tighten for qmu analyses md.transient.requested_outputs = ['IceVolume'] Index: /issm/trunk-jpl/test/NightlyRun/test235.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test235.py (revision 24260) +++ /issm/trunk-jpl/test/NightlyRun/test235.py (revision 24261) @@ -77,5 +77,5 @@ md.qmu.params.evaluation_concurrency = 1 -md.stressbalance.reltol = 10**- 5 #tighten for qmu analyses +md.stressbalance.reltol = 10**-5 #tighten for qmu analyses md.transient.requested_outputs = ['IceVolume'] Index: /issm/trunk-jpl/test/NightlyRun/test236.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test236.py (revision 24260) +++ /issm/trunk-jpl/test/NightlyRun/test236.py (revision 24261) @@ -52,7 +52,7 @@ md.smb.precipitations_lgm = np.zeros((md.mesh.numberofvertices + 1, 12)) for imonth in range(0, 12): - md.smb.precipitations_presentday[0:md.mesh.numberofvertices, imonth] = - 0.4 * 10**(-6) * md.mesh.y + 0.5 + md.smb.precipitations_presentday[0:md.mesh.numberofvertices, imonth] = -0.4 * 10**(-6) * md.mesh.y + 0.5 md.smb.precipitations_presentday[md.mesh.numberofvertices, imonth] = ((float(imonth) + 1.) / 12.) - md.smb.precipitations_lgm[0:md.mesh.numberofvertices, imonth] = - 0.4 * 10**(-6) * md.mesh.y + 0.5 + md.smb.precipitations_lgm[0:md.mesh.numberofvertices, imonth] = -0.4 * 10**(-6) * md.mesh.y + 0.5 md.smb.precipitations_lgm[md.mesh.numberofvertices, imonth] = ((float(imonth) + 1.) / 12.) Index: /issm/trunk-jpl/test/NightlyRun/test237.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test237.py (revision 24260) +++ /issm/trunk-jpl/test/NightlyRun/test237.py (revision 24261) @@ -50,7 +50,7 @@ md.smb.precipitations_lgm = np.zeros((md.mesh.numberofvertices + 1, 12)) for imonth in range(0, 12): - md.smb.precipitations_presentday[0:md.mesh.numberofvertices, imonth] = - 0.4 * 10**(-6) * md.mesh.y + 0.5 + md.smb.precipitations_presentday[0:md.mesh.numberofvertices, imonth] = -0.4 * 10**(-6) * md.mesh.y + 0.5 md.smb.precipitations_presentday[md.mesh.numberofvertices, imonth] = ((float(imonth) + 1.) / 12.) - md.smb.precipitations_lgm[0:md.mesh.numberofvertices, imonth] = - 0.4 * 10**(-6) * md.mesh.y + 0.5 + md.smb.precipitations_lgm[0:md.mesh.numberofvertices, imonth] = -0.4 * 10**(-6) * md.mesh.y + 0.5 md.smb.precipitations_lgm[md.mesh.numberofvertices, imonth] = ((float(imonth) + 1.) / 12.) Index: /issm/trunk-jpl/test/NightlyRun/test238.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test238.py (revision 24260) +++ /issm/trunk-jpl/test/NightlyRun/test238.py (revision 24261) @@ -41,5 +41,5 @@ md.smb.precipitations_presentday = np.zeros((md.mesh.numberofvertices + 1, 12)) for imonth in range(0, 12): - md.smb.precipitations_presentday[0:md.mesh.numberofvertices, imonth] = - 0.4 * 10**(-6) * md.mesh.y + 0.5 + md.smb.precipitations_presentday[0:md.mesh.numberofvertices, imonth] = -0.4 * 10**(-6) * md.mesh.y + 0.5 md.smb.precipitations_presentday[md.mesh.numberofvertices, imonth] = (float(imonth) / 12.) Index: /issm/trunk-jpl/test/NightlyRun/test239.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test239.py (revision 24260) +++ /issm/trunk-jpl/test/NightlyRun/test239.py (revision 24261) @@ -41,5 +41,5 @@ md.smb.precipitations_presentday = np.zeros((md.mesh.numberofvertices + 1, 12)) for imonth in range(0, 12): - md.smb.precipitations_presentday[0:md.mesh.numberofvertices, imonth] = - 0.4 * 10**(-6) * md.mesh.y + 0.5 + md.smb.precipitations_presentday[0:md.mesh.numberofvertices, imonth] = -0.4 * 10**(-6) * md.mesh.y + 0.5 md.smb.precipitations_presentday[md.mesh.numberofvertices, imonth] = ((float(imonth) + 1.) / 12.) Index: /issm/trunk-jpl/test/NightlyRun/test240.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test240.py (revision 24260) +++ /issm/trunk-jpl/test/NightlyRun/test240.py (revision 24261) @@ -41,5 +41,5 @@ md.smb.precipitations_presentday = np.zeros((md.mesh.numberofvertices + 1, 12)) for imonth in range(0, 12): - md.smb.precipitations_presentday[0:md.mesh.numberofvertices, imonth] = - 0.4 * 10**(-6) * md.mesh.y + 0.5 + md.smb.precipitations_presentday[0:md.mesh.numberofvertices, imonth] = -0.4 * 10**(-6) * md.mesh.y + 0.5 md.smb.precipitations_presentday[md.mesh.numberofvertices, imonth] = ((float(imonth) + 1.) / 12.) Index: /issm/trunk-jpl/test/NightlyRun/test2424.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test2424.py (revision 24260) +++ /issm/trunk-jpl/test/NightlyRun/test2424.py (revision 24261) @@ -18,6 +18,6 @@ md.smb.mass_balance[:] = 0. -md.geometry.base = - 700. - np.abs(md.mesh.y - 500000.) / 1000. -md.geometry.bed = - 700. - np.abs(md.mesh.y - 500000.) / 1000. +md.geometry.base = -700. - np.abs(md.mesh.y - 500000.) / 1000. +md.geometry.bed = -700. - np.abs(md.mesh.y - 500000.) / 1000. md.geometry.thickness[:] = 1000. md.geometry.surface = md.geometry.base + md.geometry.thickness Index: /issm/trunk-jpl/test/NightlyRun/test2425.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test2425.py (revision 24260) +++ /issm/trunk-jpl/test/NightlyRun/test2425.py (revision 24261) @@ -15,6 +15,6 @@ md.initialization.vx[:] = 0. md.initialization.vy[:] = 0. -md.geometry.base = - 700. - (md.mesh.y - 500000.) / 1000. -md.geometry.bed = - 700. - (md.mesh.y - 500000.) / 1000. +md.geometry.base = -700. - (md.mesh.y - 500000.) / 1000. +md.geometry.bed = -700. - (md.mesh.y - 500000.) / 1000. md.geometry.thickness[:] = 1300. md.geometry.surface = md.geometry.base + md.geometry.thickness @@ -31,6 +31,6 @@ #get same results with offset in bed and sea level: -md.geometry.base = - 700. - (md.mesh.y - 500000.) / 1000. -md.geometry.bed = - 700. - (md.mesh.y - 500000.) / 1000. +md.geometry.base = -700. - (md.mesh.y - 500000.) / 1000. +md.geometry.bed = -700. - (md.mesh.y - 500000.) / 1000. md.geometry.thickness[:] = 1300. md.geometry.surface = md.geometry.base + md.geometry.thickness Index: /issm/trunk-jpl/test/NightlyRun/test244.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test244.py (revision 24260) +++ /issm/trunk-jpl/test/NightlyRun/test244.py (revision 24261) @@ -84,5 +84,5 @@ mint_on_partition[pa] = max(mint / telms[0, vi]) -mint_on_partition[np.where(np.isnan(mint_on_partition))] = 10**- 10 +mint_on_partition[np.where(np.isnan(mint_on_partition))] = 10**-10 md.qmu.variables.surface_mass_balanceTa = uniform_uncertain.uniform_uncertain('scaled_SmbTa', 1, 0.05) md.qmu.variables.surface_mass_balanceTa[0].lower = 0.95 @@ -117,5 +117,5 @@ -md.stressbalance.reltol = 10**- 5 #tighten for qmu analyses +md.stressbalance.reltol = 10**-5 #tighten for qmu analyses md.transient.requested_outputs = ['IceVolume', 'TotalSmb', 'IceMass'] Index: /issm/trunk-jpl/test/NightlyRun/test245.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test245.py (revision 24260) +++ /issm/trunk-jpl/test/NightlyRun/test245.py (revision 24261) @@ -25,5 +25,5 @@ md.smb.monthlytemperatures = np.empty((md.mesh.numberofvertices + 1, 12)) md.smb.precipitation = np.empty((md.mesh.numberofvertices + 1, 12)) -temp_ma_present = - 10. * np.ones((md.mesh.numberofvertices, )) - md.smb.rlaps * md.geometry.surface / 1000. +temp_ma_present = -10. * np.ones((md.mesh.numberofvertices, )) - md.smb.rlaps * md.geometry.surface / 1000. temp_mj_present = 10. * np.ones((md.mesh.numberofvertices, )) - md.smb.rlaps * md.geometry.surface / 1000. precipitation = 5. * np.ones((md.mesh.numberofvertices, )) Index: /issm/trunk-jpl/test/NightlyRun/test250.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test250.py (revision 24260) +++ /issm/trunk-jpl/test/NightlyRun/test250.py (revision 24261) @@ -79,5 +79,5 @@ md.qmu.params.evaluation_concurrency = 1 -md.stressbalance.reltol = 10**- 5 #tighten for qmu analyses +md.stressbalance.reltol = 10**-5 #tighten for qmu analyses md.transient.requested_outputs = ['IceVolume'] Index: /issm/trunk-jpl/test/NightlyRun/test251.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test251.py (revision 24260) +++ /issm/trunk-jpl/test/NightlyRun/test251.py (revision 24261) @@ -76,5 +76,5 @@ md.qmu.params.evaluation_concurrency = 1 -md.stressbalance.reltol = 10**- 5 #tighten for qmu analyses +md.stressbalance.reltol = 10**-5 #tighten for qmu analyses md.transient.requested_outputs = ['IceVolume'] Index: /issm/trunk-jpl/test/NightlyRun/test272.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test272.py (revision 24260) +++ /issm/trunk-jpl/test/NightlyRun/test272.py (revision 24261) @@ -25,5 +25,5 @@ md.inversion.iscontrol = 1 md.inversion.control_parameters = ['DamageDbar'] -md.inversion.min_parameters = 10**- 13 * np.ones((md.mesh.numberofvertices, len(md.inversion.control_parameters))) +md.inversion.min_parameters = 10**-13 * np.ones((md.mesh.numberofvertices, len(md.inversion.control_parameters))) md.inversion.max_parameters = np.ones((md.mesh.numberofvertices, len(md.inversion.control_parameters))) md.inversion.nsteps = 2 Index: /issm/trunk-jpl/test/NightlyRun/test3015.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test3015.py (revision 24260) +++ /issm/trunk-jpl/test/NightlyRun/test3015.py (revision 24261) @@ -49,5 +49,5 @@ md.autodiff.isautodiff = False md.geometry.thickness[index] = h0 -md.geometry.base = - md.materials.rho_ice / md.materials.rho_water * md.geometry.thickness +md.geometry.base = -md.materials.rho_ice / md.materials.rho_water * md.geometry.thickness md.geometry.surface = md.geometry.base + md.geometry.thickness md = SetIceShelfBC(md) @@ -60,5 +60,5 @@ md.autodiff.isautodiff = False md.geometry.thickness[index] = h2 -md.geometry.base = - md.materials.rho_ice / md.materials.rho_water * md.geometry.thickness +md.geometry.base = -md.materials.rho_ice / md.materials.rho_water * md.geometry.thickness md.geometry.surface = md.geometry.base + md.geometry.thickness md = SetIceShelfBC(md) @@ -74,5 +74,5 @@ md.autodiff.isautodiff = True md.geometry.thickness[index] = h1 -md.geometry.base = - md.materials.rho_ice / md.materials.rho_water * md.geometry.thickness +md.geometry.base = -md.materials.rho_ice / md.materials.rho_water * md.geometry.thickness md.geometry.surface = md.geometry.base + md.geometry.thickness md = SetIceShelfBC(md) Index: /issm/trunk-jpl/test/NightlyRun/test3020.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test3020.py (revision 24260) +++ /issm/trunk-jpl/test/NightlyRun/test3020.py (revision 24261) @@ -51,5 +51,5 @@ md.autodiff.isautodiff = False md.geometry.thickness[index] = h0 -md.geometry.base = - md.materials.rho_ice / md.materials.rho_water * md.geometry.thickness +md.geometry.base = -md.materials.rho_ice / md.materials.rho_water * md.geometry.thickness md.geometry.surface = md.geometry.base + md.geometry.thickness md = SetIceShelfBC(md) @@ -63,5 +63,5 @@ md.autodiff.isautodiff = False md.geometry.thickness[index] = h2 -md.geometry.base = - md.materials.rho_ice / md.materials.rho_water * md.geometry.thickness +md.geometry.base = -md.materials.rho_ice / md.materials.rho_water * md.geometry.thickness md.geometry.surface = md.geometry.base + md.geometry.thickness md = SetIceShelfBC(md) @@ -79,5 +79,5 @@ md.autodiff.isautodiff = True md.geometry.thickness[index] = h1 -md.geometry.base = - md.materials.rho_ice / md.materials.rho_water * md.geometry.thickness +md.geometry.base = -md.materials.rho_ice / md.materials.rho_water * md.geometry.thickness md.geometry.surface = md.geometry.base + md.geometry.thickness md = SetIceShelfBC(md) Index: /issm/trunk-jpl/test/NightlyRun/test319.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test319.py (revision 24260) +++ /issm/trunk-jpl/test/NightlyRun/test319.py (revision 24261) @@ -24,5 +24,5 @@ md.inversion.cost_functions = [103, 501] md.inversion.cost_functions_coefficients = np.ones((md.mesh.numberofvertices, 2)) -md.inversion.cost_functions_coefficients[:, 1] = 2. * 10**- 7 +md.inversion.cost_functions_coefficients[:, 1] = 2. * 10**-7 md.inversion.gradient_scaling = 3. * np.ones((md.inversion.nsteps, len(md.inversion.control_parameters))) md.inversion.maxiter_per_step = 2 * np.ones(md.inversion.nsteps) Index: /issm/trunk-jpl/test/NightlyRun/test320.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test320.py (revision 24260) +++ /issm/trunk-jpl/test/NightlyRun/test320.py (revision 24261) @@ -24,5 +24,5 @@ md.inversion.cost_functions = [103, 501] md.inversion.cost_functions_coefficients = np.ones((md.mesh.numberofvertices, 2)) -md.inversion.cost_functions_coefficients[:, 1] = 2. * 10**- 7 +md.inversion.cost_functions_coefficients[:, 1] = 2. * 10**-7 md.inversion.gradient_scaling = 3. * np.ones((md.inversion.nsteps, len(md.inversion.control_parameters))) md.inversion.maxiter_per_step = 2 * np.ones(md.inversion.nsteps) Index: /issm/trunk-jpl/test/NightlyRun/test321.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test321.py (revision 24260) +++ /issm/trunk-jpl/test/NightlyRun/test321.py (revision 24261) @@ -24,5 +24,5 @@ md.inversion.cost_functions = [102, 501] md.inversion.cost_functions_coefficients = np.ones((md.mesh.numberofvertices, 2)) -md.inversion.cost_functions_coefficients[:, 1] = 2 * 10**- 7 +md.inversion.cost_functions_coefficients[:, 1] = 2 * 10**-7 md.inversion.gradient_scaling = 3. * np.ones((md.inversion.nsteps, len(md.inversion.control_parameters))) md.inversion.maxiter_per_step = 2 * np.ones(md.inversion.nsteps) Index: /issm/trunk-jpl/test/NightlyRun/test322.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test322.py (revision 24260) +++ /issm/trunk-jpl/test/NightlyRun/test322.py (revision 24261) @@ -24,5 +24,5 @@ md.inversion.cost_functions = [104, 501] md.inversion.cost_functions_coefficients = np.ones((md.mesh.numberofvertices, 2)) -md.inversion.cost_functions_coefficients[:, 1] = 2. * 10**- 7 +md.inversion.cost_functions_coefficients[:, 1] = 2. * 10**-7 md.inversion.gradient_scaling = 3. * np.ones((md.inversion.nsteps, len(md.inversion.control_parameters))) md.inversion.maxiter_per_step = 2 * np.ones(md.inversion.nsteps) Index: /issm/trunk-jpl/test/NightlyRun/test328.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test328.py (revision 24260) +++ /issm/trunk-jpl/test/NightlyRun/test328.py (revision 24261) @@ -14,5 +14,5 @@ md = setflowequation(md, 'SSA', 'all') md.smb = SMBgradients() -md.smb.b_pos = - 100. + 0.00005 * md.mesh.x - 0.0001 * md.mesh.y +md.smb.b_pos = -100. + 0.00005 * md.mesh.x - 0.0001 * md.mesh.y md.smb.b_neg = 250. + 0.000051 * md.mesh.x - 0.00011 * md.mesh.y md.transient.requested_outputs = ['default', 'TotalSmb'] Index: /issm/trunk-jpl/test/NightlyRun/test329.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test329.py (revision 24260) +++ /issm/trunk-jpl/test/NightlyRun/test329.py (revision 24261) @@ -15,5 +15,5 @@ md = setflowequation(md, 'HO', 'all') md.smb = SMBgradients() -md.smb.b_pos = - 100. + 0.00005 * md.mesh.x - 0.0001 * md.mesh.y +md.smb.b_pos = -100. + 0.00005 * md.mesh.x - 0.0001 * md.mesh.y md.smb.b_neg = 250. + 0.000051 * md.mesh.x - 0.00011 * md.mesh.y md.smb.href = copy.deepcopy(md.geometry.surface) Index: /issm/trunk-jpl/test/NightlyRun/test330.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test330.py (revision 24260) +++ /issm/trunk-jpl/test/NightlyRun/test330.py (revision 24261) @@ -38,5 +38,5 @@ md.hydrology.sediment_transmitivity = (1.0e-3 * md.hydrology.sediment_thickness) * np.ones((md.mesh.numberofvertices)) #init -md.initialization.sediment_head = - 5.0 * np.ones((md.mesh.numberofvertices)) +md.initialization.sediment_head = -5.0 * np.ones((md.mesh.numberofvertices)) #BC md.hydrology.spcsediment_head = np.nan * np.ones((md.mesh.numberofvertices)) Index: /issm/trunk-jpl/test/NightlyRun/test3300.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test3300.py (revision 24260) +++ /issm/trunk-jpl/test/NightlyRun/test3300.py (revision 24261) @@ -50,5 +50,5 @@ md.basalforcings.groundedice_melting_rate = np.zeros((md.mesh.numberofvertices + 1, len(times))) -md.basalforcings.groundedice_melting_rate[:, np.where(times <= 6.0)] = - 0.2 +md.basalforcings.groundedice_melting_rate[:, np.where(times <= 6.0)] = -0.2 md.basalforcings.groundedice_melting_rate[:, np.where(times <= 1.0)] = 1.0 md.basalforcings.groundedice_melting_rate[-1, :] = times Index: /issm/trunk-jpl/test/NightlyRun/test341.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test341.py (revision 24260) +++ /issm/trunk-jpl/test/NightlyRun/test341.py (revision 24261) @@ -27,5 +27,5 @@ md.inversion.cost_functions = [102, 501] md.inversion.cost_functions_coefficients = np.ones((md.mesh.numberofvertices, 2)) -md.inversion.cost_functions_coefficients[:, 1] = 2. * 10**- 7 +md.inversion.cost_functions_coefficients[:, 1] = 2. * 10**-7 md.inversion.vx_obs = md.initialization.vx md.inversion.vy_obs = md.initialization.vy Index: /issm/trunk-jpl/test/NightlyRun/test343.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test343.py (revision 24260) +++ /issm/trunk-jpl/test/NightlyRun/test343.py (revision 24261) @@ -19,5 +19,5 @@ md.smb.b_neg = 0.005 * np.ones((md.mesh.numberofvertices + 1, )) md.smb.b_max = 4. * (md.materials.rho_freshwater / md.materials.rho_ice) * np.ones((md.mesh.numberofvertices + 1, )) -md.smb.b_min = - 4. * (md.materials.rho_freshwater / md.materials.rho_ice) * np.ones((md.mesh.numberofvertices + 1, )) +md.smb.b_min = -4. * (md.materials.rho_freshwater / md.materials.rho_ice) * np.ones((md.mesh.numberofvertices + 1, )) #Change geometry Index: /issm/trunk-jpl/test/NightlyRun/test344.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test344.py (revision 24260) +++ /issm/trunk-jpl/test/NightlyRun/test344.py (revision 24261) @@ -25,5 +25,5 @@ md.smb.b_neg = 0.005 * np.ones((md.mesh.numberofvertices + 1, )) md.smb.b_max = 4. * (md.materials.rho_freshwater / md.materials.rho_ice) * np.ones((md.mesh.numberofvertices + 1, )) -md.smb.b_min = - 4. * (md.materials.rho_freshwater / md.materials.rho_ice) * np.ones((md.mesh.numberofvertices + 1, )) +md.smb.b_min = -4. * (md.materials.rho_freshwater / md.materials.rho_ice) * np.ones((md.mesh.numberofvertices + 1, )) Index: /issm/trunk-jpl/test/NightlyRun/test350.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test350.py (revision 24260) +++ /issm/trunk-jpl/test/NightlyRun/test350.py (revision 24261) @@ -30,5 +30,5 @@ #Change geometry -md.geometry.base = - .02 * md.mesh.x + 20. +md.geometry.base = -.02 * md.mesh.x + 20. md.geometry.thickness = 300. * np.ones((md.mesh.numberofvertices, )) md.geometry.bed = md.geometry.base Index: /issm/trunk-jpl/test/NightlyRun/test412.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test412.py (revision 24260) +++ /issm/trunk-jpl/test/NightlyRun/test412.py (revision 24261) @@ -53,5 +53,5 @@ #imperative! -md.stressbalance.reltol = 10**- 5 #tighten for qmu analyses +md.stressbalance.reltol = 10**-5 #tighten for qmu analyses #solve Index: /issm/trunk-jpl/test/NightlyRun/test413.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test413.py (revision 24260) +++ /issm/trunk-jpl/test/NightlyRun/test413.py (revision 24261) @@ -51,5 +51,5 @@ #imperative! -md.stressbalance.reltol = 10**- 5 #tighten for qmu analyses +md.stressbalance.reltol = 10**-5 #tighten for qmu analyses md.qmu.isdakota = 1 Index: /issm/trunk-jpl/test/NightlyRun/test414.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test414.py (revision 24260) +++ /issm/trunk-jpl/test/NightlyRun/test414.py (revision 24261) @@ -60,5 +60,5 @@ md.qmu.params.interval_type = 'forward' md.qmu.isdakota = 1 -md.stressbalance.reltol = 10**- 5 #tighten for qmu analyses +md.stressbalance.reltol = 10**-5 #tighten for qmu analyses if version >= 6: Index: /issm/trunk-jpl/test/NightlyRun/test415.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test415.py (revision 24260) +++ /issm/trunk-jpl/test/NightlyRun/test415.py (revision 24261) @@ -24,5 +24,5 @@ md.inversion.cost_functions = [103, 501] md.inversion.cost_functions_coefficients = np.ones((md.mesh.numberofvertices, 2)) -md.inversion.cost_functions_coefficients[:, 1] = 2. * 10**- 7 +md.inversion.cost_functions_coefficients[:, 1] = 2. * 10**-7 md.inversion.gradient_scaling = 3. * np.ones((md.inversion.nsteps, len(md.inversion.control_parameters))) md.inversion.maxiter_per_step = 2 * np.ones((md.inversion.nsteps)) Index: /issm/trunk-jpl/test/NightlyRun/test416.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test416.py (revision 24260) +++ /issm/trunk-jpl/test/NightlyRun/test416.py (revision 24261) @@ -24,5 +24,5 @@ md.inversion.cost_functions = [102, 501] md.inversion.cost_functions_coefficients = np.ones((md.mesh.numberofvertices, 2)) -md.inversion.cost_functions_coefficients[:, 1] = 2. * 10**- 7 +md.inversion.cost_functions_coefficients[:, 1] = 2. * 10**-7 md.inversion.gradient_scaling = 3. * np.ones((md.inversion.nsteps, len(md.inversion.control_parameters))) md.inversion.maxiter_per_step = 2 * np.ones((md.inversion.nsteps)) Index: /issm/trunk-jpl/test/NightlyRun/test417.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test417.py (revision 24260) +++ /issm/trunk-jpl/test/NightlyRun/test417.py (revision 24261) @@ -76,5 +76,5 @@ md.qmu.isdakota = 1 -md.stressbalance.reltol = 10**- 5 #tighten for qmu analyses +md.stressbalance.reltol = 10**-5 #tighten for qmu analyses #solve Index: /issm/trunk-jpl/test/NightlyRun/test420.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test420.py (revision 24260) +++ /issm/trunk-jpl/test/NightlyRun/test420.py (revision 24261) @@ -50,5 +50,5 @@ #imperative! -md.stressbalance.reltol = 10**- 5 #tighten for qmu analysese +md.stressbalance.reltol = 10**-5 #tighten for qmu analysese #solve Index: /issm/trunk-jpl/test/NightlyRun/test424.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test424.py (revision 24260) +++ /issm/trunk-jpl/test/NightlyRun/test424.py (revision 24261) @@ -14,6 +14,6 @@ md.initialization.vx[:] = 0. md.initialization.vy[:] = 0. -md.geometry.base = - 700. - abs(md.mesh.y - 500000.) / 1000. -md.geometry.bed = - 700. - abs(md.mesh.y - 500000.) / 1000. +md.geometry.base = -700. - abs(md.mesh.y - 500000.) / 1000. +md.geometry.bed = -700. - abs(md.mesh.y - 500000.) / 1000. md.geometry.thickness[:] = 1000. md.geometry.surface = md.geometry.base + md.geometry.thickness Index: /issm/trunk-jpl/test/NightlyRun/test425.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test425.py (revision 24260) +++ /issm/trunk-jpl/test/NightlyRun/test425.py (revision 24261) @@ -14,9 +14,9 @@ md.initialization.vx[:] = 0. md.initialization.vy[:] = 0. -md.geometry.base = - 700. - abs(md.mesh.y - 500000.) / 1000. -md.geometry.bed = - 700. - abs(md.mesh.y - 500000.) / 1000. +md.geometry.base = -700. - abs(md.mesh.y - 500000.) / 1000. +md.geometry.bed = -700. - abs(md.mesh.y - 500000.) / 1000. md.geometry.thickness[:] = 1300. md.geometry.surface = md.geometry.base + md.geometry.thickness -md.smb.mass_balance[:] = - 150. +md.smb.mass_balance[:] = -150. md.transient.isstressbalance = False md.transient.isgroundingline = True Index: /issm/trunk-jpl/test/NightlyRun/test426.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test426.py (revision 24260) +++ /issm/trunk-jpl/test/NightlyRun/test426.py (revision 24261) @@ -13,6 +13,6 @@ md.initialization.vx[:] = 0. md.initialization.vy[:] = 0. -md.geometry.base = - 700. - abs(md.mesh.y - 500000.) / 1000. -md.geometry.bed = - 700. - abs(md.mesh.y - 500000.) / 1000. +md.geometry.base = -700. - abs(md.mesh.y - 500000.) / 1000. +md.geometry.bed = -700. - abs(md.mesh.y - 500000.) / 1000. md.geometry.thickness[:] = 1000. md.geometry.surface = md.geometry.base + md.geometry.thickness Index: /issm/trunk-jpl/test/NightlyRun/test427.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test427.py (revision 24260) +++ /issm/trunk-jpl/test/NightlyRun/test427.py (revision 24261) @@ -13,6 +13,6 @@ md.initialization.vx[:] = 0. md.initialization.vy[:] = 0. -md.geometry.base = - 700. - abs(md.mesh.y - 500000.) / 1000. -md.geometry.bed = - 700. - abs(md.mesh.y - 500000.) / 1000. +md.geometry.base = -700. - abs(md.mesh.y - 500000.) / 1000. +md.geometry.bed = -700. - abs(md.mesh.y - 500000.) / 1000. md.geometry.thickness[:] = 1300 md.geometry.surface = md.geometry.base + md.geometry.thickness @@ -20,5 +20,5 @@ md.extrude(3, 1.) -md.smb.mass_balance[:] = - 150 +md.smb.mass_balance[:] = -150 md.transient.isstressbalance = False md.transient.isgroundingline = True Index: /issm/trunk-jpl/test/NightlyRun/test430.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test430.py (revision 24260) +++ /issm/trunk-jpl/test/NightlyRun/test430.py (revision 24261) @@ -15,6 +15,6 @@ md.initialization.vy[:] = 1. md.geometry.thickness[:] = 500. - md.mesh.x / 10000. -md.geometry.bed = - 100. - md.mesh.x / 1000. -md.geometry.base = - md.geometry.thickness * md.materials.rho_ice / md.materials.rho_water +md.geometry.bed = -100. - md.mesh.x / 1000. +md.geometry.base = -md.geometry.thickness * md.materials.rho_ice / md.materials.rho_water md.mask.groundedice_levelset = md.geometry.thickness + md.materials.rho_water / md.materials.rho_ice * md.geometry.bed pos = np.where(md.mask.groundedice_levelset >= 0.) @@ -24,5 +24,5 @@ #Boundary conditions: -md.mask.ice_levelset = - np.ones((md.mesh.numberofvertices, )) +md.mask.ice_levelset = -np.ones((md.mesh.numberofvertices, )) md.mask.ice_levelset[np.where(md.mesh.x == max(md.mesh.x))] = 0. md.stressbalance.spcvx[:] = float('NaN') @@ -37,5 +37,5 @@ md.stressbalance.spcvy[pos2] = 0. -md.materials.rheology_B = 1. / ((10**- 25)**(1. / 3.)) * np.ones((md.mesh.numberofvertices, )) +md.materials.rheology_B = 1. / ((10**-25)**(1. / 3.)) * np.ones((md.mesh.numberofvertices, )) md.materials.rheology_law = 'None' md.friction.coefficient[:] = np.sqrt(10**7) * np.ones((md.mesh.numberofvertices, )) Index: /issm/trunk-jpl/test/NightlyRun/test435.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test435.py (revision 24260) +++ /issm/trunk-jpl/test/NightlyRun/test435.py (revision 24261) @@ -15,6 +15,6 @@ md.initialization.vy[:] = 1. md.geometry.thickness[:] = 500. - md.mesh.x / 10000. -md.geometry.bed = - 100. - md.mesh.x / 1000. -md.geometry.base = - md.geometry.thickness * md.materials.rho_ice / md.materials.rho_water +md.geometry.bed = -100. - md.mesh.x / 1000. +md.geometry.base = -md.geometry.thickness * md.materials.rho_ice / md.materials.rho_water md.mask.groundedice_levelset = md.geometry.thickness + md.materials.rho_water / md.materials.rho_ice * md.geometry.bed pos = np.where(md.mask.groundedice_levelset >= 0) @@ -25,5 +25,5 @@ #Boundary conditions: -md.mask.ice_levelset = - np.ones((md.mesh.numberofvertices, )) +md.mask.ice_levelset = -np.ones((md.mesh.numberofvertices, )) md.mask.ice_levelset[np.where(md.mesh.x == max(md.mesh.x))] = 0. md.stressbalance.spcvx[:] = float('Nan') @@ -38,5 +38,5 @@ md.stressbalance.spcvy[pos2] = 0. -md.materials.rheology_B = 1. / ((10**- 25)**(1. / 3.)) * np.ones((md.mesh.numberofvertices, )) +md.materials.rheology_B = 1. / ((10**-25)**(1. / 3.)) * np.ones((md.mesh.numberofvertices, )) md.materials.rheology_law = 'None' md.friction.coefficient[:] = np.sqrt(1e7) * np.ones((md.mesh.numberofvertices, )) Index: /issm/trunk-jpl/test/NightlyRun/test437.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test437.py (revision 24260) +++ /issm/trunk-jpl/test/NightlyRun/test437.py (revision 24261) @@ -15,5 +15,5 @@ h = 100. md.geometry.thickness = h * np.ones((md.mesh.numberofvertices, )) -md.geometry.base = - h * np.ones((md.mesh.numberofvertices, )) +md.geometry.base = -h * np.ones((md.mesh.numberofvertices, )) md.geometry.surface = md.geometry.base + md.geometry.thickness Index: /issm/trunk-jpl/test/NightlyRun/test440.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test440.py (revision 24260) +++ /issm/trunk-jpl/test/NightlyRun/test440.py (revision 24261) @@ -51,5 +51,5 @@ #imperative! -md.stressbalance.reltol = 10**- 5 #tighten for qmu analysese +md.stressbalance.reltol = 10**-5 #tighten for qmu analysese #solve Index: /issm/trunk-jpl/test/NightlyRun/test441.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test441.py (revision 24260) +++ /issm/trunk-jpl/test/NightlyRun/test441.py (revision 24261) @@ -15,6 +15,6 @@ md.initialization.vy[:] = 1. md.geometry.thickness[:] = 500. - md.mesh.x / 10000. -md.geometry.bed = - 100. - md.mesh.x / 1000. -md.geometry.base = - md.geometry.thickness * md.materials.rho_ice / md.materials.rho_water +md.geometry.bed = -100. - md.mesh.x / 1000. +md.geometry.base = -md.geometry.thickness * md.materials.rho_ice / md.materials.rho_water md.mask.groundedice_levelset = md.geometry.thickness + md.materials.rho_water / md.materials.rho_ice * md.geometry.bed pos = np.array(np.where(md.mask.groundedice_levelset >= 0.)) @@ -24,5 +24,5 @@ #Boundary conditions: -md.mask.ice_levelset = - np.ones((md.mesh.numberofvertices, )) +md.mask.ice_levelset = -np.ones((md.mesh.numberofvertices, )) md.mask.ice_levelset[np.where(md.mesh.x == max(md.mesh.x))] = 0. md.stressbalance.spcvx[:] = float('Nan') @@ -37,5 +37,5 @@ md.stressbalance.spcvy[pos2] = 0. -md.materials.rheology_B = 1. / ((10**- 25)**(1. / 3.)) * np.ones((md.mesh.numberofvertices, )) +md.materials.rheology_B = 1. / ((10**-25)**(1. / 3.)) * np.ones((md.mesh.numberofvertices, )) md.materials.rheology_law = 'None' md.friction.coefficient[:] = np.sqrt(1e7) * np.ones((md.mesh.numberofvertices, )) Index: /issm/trunk-jpl/test/NightlyRun/test442.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test442.py (revision 24260) +++ /issm/trunk-jpl/test/NightlyRun/test442.py (revision 24261) @@ -15,6 +15,6 @@ md.initialization.vy[:] = 1. md.geometry.thickness[:] = 500. - md.mesh.x / 10000. -md.geometry.bed = - 100. - md.mesh.x / 1000. -md.geometry.base = - md.geometry.thickness * md.materials.rho_ice / md.materials.rho_water +md.geometry.bed = -100. - md.mesh.x / 1000. +md.geometry.base = -md.geometry.thickness * md.materials.rho_ice / md.materials.rho_water md.mask.groundedice_levelset = md.geometry.thickness + md.materials.rho_water / md.materials.rho_ice * md.geometry.bed pos = np.where(md.mask.groundedice_levelset >= 0.) @@ -25,5 +25,5 @@ #Boundary conditions: -md.mask.ice_levelset = - np.ones((md.mesh.numberofvertices, )) +md.mask.ice_levelset = -np.ones((md.mesh.numberofvertices, )) md.mask.ice_levelset[np.where(md.mesh.x == max(md.mesh.x))] = 0. md.stressbalance.spcvx[:] = float('Nan') @@ -38,5 +38,5 @@ md.stressbalance.spcvy[pos2] = 0. -md.materials.rheology_B = 1. / ((10**- 25)**(1. / 3.)) * np.ones((md.mesh.numberofvertices, )) +md.materials.rheology_B = 1. / ((10**-25)**(1. / 3.)) * np.ones((md.mesh.numberofvertices, )) md.materials.rheology_law = 'None' md.friction.coefficient[:] = np.sqrt(1e7) * np.ones((md.mesh.numberofvertices, )) Index: /issm/trunk-jpl/test/NightlyRun/test444.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test444.py (revision 24260) +++ /issm/trunk-jpl/test/NightlyRun/test444.py (revision 24261) @@ -104,5 +104,5 @@ md.qmu.isdakota = 1 -md.stressbalance.reltol = 10**- 5 #tighten for qmu analyses +md.stressbalance.reltol = 10**-5 #tighten for qmu analyses #solve Index: /issm/trunk-jpl/test/NightlyRun/test445.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test445.py (revision 24260) +++ /issm/trunk-jpl/test/NightlyRun/test445.py (revision 24261) @@ -75,5 +75,5 @@ md.qmu.isdakota = 1 -md.stressbalance.reltol = 10**- 5 #tighten for qmu analyses +md.stressbalance.reltol = 10**-5 #tighten for qmu analyses Index: /issm/trunk-jpl/test/NightlyRun/test511.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test511.py (revision 24260) +++ /issm/trunk-jpl/test/NightlyRun/test511.py (revision 24261) @@ -14,5 +14,5 @@ #impose hydrostatic equilibrium (required by Stokes) -md.geometry.base = - md.materials.rho_ice / md.materials.rho_water * md.geometry.thickness +md.geometry.base = -md.materials.rho_ice / md.materials.rho_water * md.geometry.thickness md.geometry.surface = md.geometry.base + md.geometry.thickness md.extrude(3, 1.) Index: /issm/trunk-jpl/test/NightlyRun/test512.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test512.py (revision 24260) +++ /issm/trunk-jpl/test/NightlyRun/test512.py (revision 24261) @@ -25,5 +25,5 @@ md.inversion.cost_functions = [103, 501] md.inversion.cost_functions_coefficients = np.ones((md.mesh.numberofvertices, 2)) -md.inversion.cost_functions_coefficients[:, 1] = 2. * 10**- 7 +md.inversion.cost_functions_coefficients[:, 1] = 2. * 10**-7 md.inversion.gradient_scaling = 3. * np.ones((md.inversion.nsteps, len(md.inversion.control_parameters))) md.inversion.maxiter_per_step = 2. * np.ones((md.inversion.nsteps)) Index: /issm/trunk-jpl/test/NightlyRun/test513.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test513.py (revision 24260) +++ /issm/trunk-jpl/test/NightlyRun/test513.py (revision 24261) @@ -23,5 +23,5 @@ md.inversion.cost_functions = [103, 501] md.inversion.cost_functions_coefficients = np.ones((md.mesh.numberofvertices, 2)) -md.inversion.cost_functions_coefficients[:, 1] = 2. * 10**- 7 +md.inversion.cost_functions_coefficients[:, 1] = 2. * 10**-7 md.inversion.gradient_scaling = 3. * np.ones((md.inversion.nsteps, len(md.inversion.control_parameters))) md.inversion.maxiter_per_step = 2. * np.ones((md.inversion.nsteps)) Index: /issm/trunk-jpl/test/NightlyRun/test611.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test611.py (revision 24260) +++ /issm/trunk-jpl/test/NightlyRun/test611.py (revision 24261) @@ -20,5 +20,5 @@ md.inversion.control_parameters = ['BalancethicknessThickeningRate'] md.inversion.thickness_obs = md.geometry.thickness -md.inversion.min_parameters = - 50. * np.ones((md.mesh.numberofvertices, len(md.inversion.control_parameters))) +md.inversion.min_parameters = -50. * np.ones((md.mesh.numberofvertices, len(md.inversion.control_parameters))) md.inversion.max_parameters = 50. * np.ones((md.mesh.numberofvertices, len(md.inversion.control_parameters))) md.inversion.cost_functions = [201] Index: /issm/trunk-jpl/test/NightlyRun/test701.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test701.py (revision 24260) +++ /issm/trunk-jpl/test/NightlyRun/test701.py (revision 24261) @@ -9,5 +9,5 @@ x = np.arange(1, 3001, 100).T h = np.linspace(1000, 300, np.size(x)).T -b = - 917. / 1023. * h +b = -917. / 1023. * h md = bamgflowband(model(), x, b + h, b, 'hmax', 80.) @@ -21,5 +21,5 @@ #mask -md.mask.ice_levelset = - np.ones((md.mesh.numberofvertices, )) +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 @@ -51,5 +51,5 @@ md = setflowequation(md, 'FS', 'all') md.stressbalance.abstol = np.nan -#md.stressbalance.reltol = 10**- 16 +#md.stressbalance.reltol = 10**-16 md.stressbalance.FSreconditioning = 1. md.stressbalance.maxiter = 20 Index: /issm/trunk-jpl/test/NightlyRun/test702.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test702.py (revision 24260) +++ /issm/trunk-jpl/test/NightlyRun/test702.py (revision 24261) @@ -25,7 +25,7 @@ #mask -md.mask.ice_levelset = - np.ones((md.mesh.numberofvertices, )) +md.mask.ice_levelset = -np.ones((md.mesh.numberofvertices, )) md.mask.ice_levelset[np.where(md.mesh.vertexflags(2))] = 0 -md.mask.groundedice_levelset = - 0.5 * np.ones((md.mesh.numberofvertices)) +md.mask.groundedice_levelset = -0.5 * np.ones((md.mesh.numberofvertices)) md.mask.groundedice_levelset[np.where(md.mesh.x < 0)] = 0.5 Index: /issm/trunk-jpl/test/NightlyRun/test703.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test703.py (revision 24260) +++ /issm/trunk-jpl/test/NightlyRun/test703.py (revision 24261) @@ -38,7 +38,7 @@ #mask -md.mask.ice_levelset = - np.ones((md.mesh.numberofvertices)) +md.mask.ice_levelset = -np.ones((md.mesh.numberofvertices)) md.mask.ice_levelset[np.where(md.mesh.vertexflags(2))] = 0 -md.mask.groundedice_levelset = - 0.5 * np.ones((md.mesh.numberofvertices)) +md.mask.groundedice_levelset = -0.5 * np.ones((md.mesh.numberofvertices)) md.mask.groundedice_levelset[np.where(md.mesh.x < 0)] = 0.5 Index: /issm/trunk-jpl/test/NightlyRun/test808.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test808.py (revision 24260) +++ /issm/trunk-jpl/test/NightlyRun/test808.py (revision 24261) @@ -24,5 +24,5 @@ Lx = (xmax - xmin) alpha = 2. / 3. -md.mask.ice_levelset = - 1 + 2 * (md.mesh.y > 9e5) +md.mask.ice_levelset = -1 + 2 * (md.mesh.y > 9e5) md.timestepping.time_step = 1 Index: /issm/trunk-jpl/test/Par/ISMIPF.py =================================================================== --- /issm/trunk-jpl/test/Par/ISMIPF.py (revision 24260) +++ /issm/trunk-jpl/test/Par/ISMIPF.py (revision 24261) @@ -12,5 +12,5 @@ print(" creating drag") -md.friction.coefficient = np.sqrt(md.constants.yts / (2.140373 * 10**- 7 * 1000.)) * np.ones((md.mesh.numberofvertices)) +md.friction.coefficient = np.sqrt(md.constants.yts / (2.140373 * 10**-7 * 1000.)) * np.ones((md.mesh.numberofvertices)) md.friction.p = np.ones((md.mesh.numberofelements)) md.friction.q = np.zeros((md.mesh.numberofelements)) Index: /issm/trunk-jpl/test/Par/RoundSheetEISMINT.py =================================================================== --- /issm/trunk-jpl/test/Par/RoundSheetEISMINT.py (revision 24260) +++ /issm/trunk-jpl/test/Par/RoundSheetEISMINT.py (revision 24261) @@ -15,8 +15,8 @@ print(" creating temperatures") tmin = 238.15 #K -st = 1.67 * 10**- 2 / 1000. #k / m +st = 1.67 * 10**-2 / 1000. #k / m radius = numpy.sqrt((md.mesh.x)**2 + (md.mesh.y)**2) md.initialization.temperature = tmin + st * radius -md.basalforcings.geothermalflux = 4.2 * 10**- 2 * numpy.ones((md.mesh.numberofvertices)) +md.basalforcings.geothermalflux = 4.2 * 10**-2 * numpy.ones((md.mesh.numberofvertices)) print(" creating flow law parameter") @@ -26,5 +26,5 @@ print(" creating surface mass balance") smb_max = 0.5 #m / yr -sb = 10**- 2 / 1000. #m / yr / m +sb = 10**-2 / 1000. #m / yr / m rel = 450. * 1000. #m md.smb.mass_balance = numpy.minimum(smb_max * numpy.ones_like(radius), sb * (rel - radius)) @@ -60,4 +60,4 @@ md.materials.thermalconductivity = 2.1 md.materials.latentheat = 3.35 * 10**5 -md.materials.beta = 8.66 * 10**- 4 / (md.materials.rho_ice * md.constants.g) #conversion from K / m to K / Pa +md.materials.beta = 8.66 * 10**-4 / (md.materials.rho_ice * md.constants.g) #conversion from K / m to K / Pa md.constants.yts = 31556926. Index: /issm/trunk-jpl/test/Par/RoundSheetStaticEISMINT.par =================================================================== --- /issm/trunk-jpl/test/Par/RoundSheetStaticEISMINT.par (revision 24260) +++ /issm/trunk-jpl/test/Par/RoundSheetStaticEISMINT.par (revision 24261) @@ -22,5 +22,5 @@ disp(' creating flow law parameter'); -md.materials.rheology_B=6.81*10^7*ones(md.mesh.numberofvertices,1); %to have the same B as the analytical solution +md.materials.rheology_B=6.81*10^7*ones(md.mesh.numberofvertices,1); %to have the same B as the analytical solution md.materials.rheology_n=3.*ones(md.mesh.numberofelements,1); Index: /issm/trunk-jpl/test/Par/RoundSheetStaticEISMINT.py =================================================================== --- /issm/trunk-jpl/test/Par/RoundSheetStaticEISMINT.py (revision 24260) +++ /issm/trunk-jpl/test/Par/RoundSheetStaticEISMINT.py (revision 24261) @@ -7,5 +7,5 @@ radius = numpy.sqrt((md.mesh.x)**2 + (md.mesh.y)**2) radiusmax = numpy.max(radius) -radius[numpy.nonzero(radius > (1. - 10**- 9) * radiusmax)] = radiusmax #eliminate roundoff issues in next statement +radius[numpy.nonzero(radius > (1. - 10**-9) * radiusmax)] = radiusmax #eliminate roundoff issues in next statement md.geometry.thickness = hmin * numpy.ones((numpy.size(md.mesh.x))) + hmax * (4. * ((1. / 2.)**(4. / 3.) * numpy.ones((numpy.size(md.mesh.x))) - ((radius) / (2. * radiusmax))**(4. / 3.)))**(3. / 8.) md.geometry.base = 0. * md.geometry.thickness @@ -20,7 +20,7 @@ print(" creating temperatures") tmin = 238.15 #K -st = 1.67 * 10**- 2 / 1000. #k / m +st = 1.67 * 10**-2 / 1000. #k / m md.initialization.temperature = tmin + st * radius -md.basalforcings.geothermalflux = 4.2 * 10**- 2 * numpy.ones((md.mesh.numberofvertices)) +md.basalforcings.geothermalflux = 4.2 * 10**-2 * numpy.ones((md.mesh.numberofvertices)) print(" creating flow law parameter") @@ -30,5 +30,5 @@ print(" creating surface mass balance") smb_max = 0.5 #m / yr -sb = 10**- 2 / 1000. #m / yr / m +sb = 10**-2 / 1000. #m / yr / m rel = 450. * 1000. #m md.smb.mass_balance = numpy.minimum(smb_max * numpy.ones_like(radius), sb * (rel - radius)) Index: /issm/trunk-jpl/test/Par/SquareSheetConstrainedCO2.py =================================================================== --- /issm/trunk-jpl/test/Par/SquareSheetConstrainedCO2.py (revision 24260) +++ /issm/trunk-jpl/test/Par/SquareSheetConstrainedCO2.py (revision 24261) @@ -16,5 +16,5 @@ CO2_heatCapacity = 700. CO2_thermalCond = 0.5 -CO2_dynViscosity = 13.72 * 10**- 6 +CO2_dynViscosity = 13.72 * 10**-6 CO2_rhoLiquidZeroDeg = 929. md.materials.rho_ice = CO2_rhoIce @@ -34,5 +34,5 @@ xmax = max(md.mesh.x) md.geometry.thickness = hmax + (hmin - hmax) * (md.mesh.y - ymin) / (ymax - ymin) + 0.1 * (hmin - hmax) * (md.mesh.x - xmin) / (xmax - xmin) -md.geometry.base = - md.materials.rho_ice / md.materials.rho_water * md.geometry.thickness + 20. +md.geometry.base = -md.materials.rho_ice / md.materials.rho_water * md.geometry.thickness + 20. md.geometry.surface = md.geometry.base + md.geometry.thickness Index: /issm/trunk-jpl/test/Par/SquareSheetShelf.py =================================================================== --- /issm/trunk-jpl/test/Par/SquareSheetShelf.py (revision 24260) +++ /issm/trunk-jpl/test/Par/SquareSheetShelf.py (revision 24261) @@ -18,6 +18,6 @@ xmax = max(md.mesh.x) md.geometry.thickness = hmax + (hmin - hmax) * (md.mesh.y - ymin) / (ymax - ymin) + 0.1 * (hmin - hmax) * (md.mesh.x - xmin) / (xmax - xmin) -md.geometry.base = - md.materials.rho_ice / md.materials.rho_water * md.geometry.thickness -bed_sheet = - md.materials.rho_ice / md.materials.rho_water * (hmax + (hmin - hmax) * (ymax / 2 - ymin) / (ymax - ymin)) +md.geometry.base = -md.materials.rho_ice / md.materials.rho_water * md.geometry.thickness +bed_sheet = -md.materials.rho_ice / md.materials.rho_water * (hmax + (hmin - hmax) * (ymax / 2 - ymin) / (ymax - ymin)) pos = np.nonzero(md.mesh.y <= ymax / 2.) md.geometry.base[pos] = bed_sheet Index: /issm/trunk-jpl/test/Par/SquareShelfConstrained.py =================================================================== --- /issm/trunk-jpl/test/Par/SquareShelfConstrained.py (revision 24260) +++ /issm/trunk-jpl/test/Par/SquareShelfConstrained.py (revision 24261) @@ -17,5 +17,5 @@ xmax = max(md.mesh.x) md.geometry.thickness = hmax + (hmin - hmax) * (md.mesh.y - ymin) / (ymax - ymin) + 0.1 * (hmin - hmax) * (md.mesh.x - xmin) / (xmax - xmin) -md.geometry.base = - md.materials.rho_ice / md.materials.rho_water * md.geometry.thickness +md.geometry.base = -md.materials.rho_ice / md.materials.rho_water * md.geometry.thickness md.geometry.surface = md.geometry.base + md.geometry.thickness md.geometry.bed = md.geometry.base - 10 Index: /issm/trunk-jpl/test/Par/SquareThermal.py =================================================================== --- /issm/trunk-jpl/test/Par/SquareThermal.py (revision 24260) +++ /issm/trunk-jpl/test/Par/SquareThermal.py (revision 24261) @@ -11,5 +11,5 @@ h = 1000. md.geometry.thickness = h * np.ones((md.mesh.numberofvertices)) -md.geometry.base = - 1000. * np.ones((md.mesh.numberofvertices)) +md.geometry.base = -1000. * np.ones((md.mesh.numberofvertices)) md.geometry.surface = md.geometry.base + md.geometry.thickness @@ -49,3 +49,3 @@ md.thermal.spctemperature[:] = md.initialization.temperature md.basalforcings.geothermalflux = np.zeros((md.mesh.numberofvertices)) -md.basalforcings.geothermalflux[np.nonzero(md.mask.groundedice_levelset > 0.)[0]] = 1. * 10**- 3 #1 mW / m^2 +md.basalforcings.geothermalflux[np.nonzero(md.mask.groundedice_levelset > 0.)[0]] = 1. * 10**-3 #1 mW / m^2