Index: /issm/trunk-jpl/src/m/boundaryconditions/PattynSMB.py =================================================================== --- /issm/trunk-jpl/src/m/boundaryconditions/PattynSMB.py (revision 24259) +++ /issm/trunk-jpl/src/m/boundaryconditions/PattynSMB.py (revision 24260) @@ -32,5 +32,5 @@ # Here, -0.012 is the atmospheric Lapse rate from sea level in deg / m. # It is multiplied by surface elevation from sea level - Tma = - 15.15 - 0.012 * md.geometry.surface + Tma = -15.15 - 0.012 * md.geometry.surface # Calculate summer temperature, Eqn (12) Index: /issm/trunk-jpl/src/m/boundaryconditions/SetIceSheetBC.py =================================================================== --- /issm/trunk-jpl/src/m/boundaryconditions/SetIceSheetBC.py (revision 24259) +++ /issm/trunk-jpl/src/m/boundaryconditions/SetIceSheetBC.py (revision 24260) @@ -31,5 +31,5 @@ print(" boundary conditions for stressbalance model: spc set as zero") - #No ice front - > do nothing + #No ice front -> do nothing #Create zeros basalforcings and smb @@ -51,5 +51,5 @@ md.thermal.spctemperature[pos] = md.initialization.temperature[pos] #impose observed temperature on surface if not isinstance(md.basalforcings.geothermalflux, np.ndarray) or not np.size(md.basalforcings.geothermalflux) == md.mesh.numberofvertices: - md.basalforcings.geothermalflux = 50. * 10**- 3 * np.ones((md.mesh.numberofvertices)) #50 mW / m^2 + md.basalforcings.geothermalflux = 50. * 10**-3 * np.ones((md.mesh.numberofvertices)) #50 mW / m^2 else: print(" no thermal boundary conditions created: no observed temperature found") Index: /issm/trunk-jpl/src/m/boundaryconditions/love_numbers.py =================================================================== --- /issm/trunk-jpl/src/m/boundaryconditions/love_numbers.py (revision 24259) +++ /issm/trunk-jpl/src/m/boundaryconditions/love_numbers.py (revision 24260) @@ -4,5 +4,5 @@ def love_numbers(value, * varargin): '''LOVE_NUMBERS: provide love numbers (value 'h', 'k', 'l', 'gamma' and 'lambda' - retrieved from: http: / / www.srosat.com / iag - jsg / loveNb.php + retrieved from: http://www.srosat.com/iag-jsg/loveNb.php Usage: series = love_numbers(value) series = love_numbers(value, reference_frame) @@ -10054,5 +10054,5 @@ if frame == 'CF': # from Blewitt, 2003, JGR if value == 'h': - series[1] = - 0.269 + series[1] = -0.269 elif value == 'k': series[1] = 0.021 Index: /issm/trunk-jpl/src/m/inversions/parametercontroldrag.py =================================================================== --- /issm/trunk-jpl/src/m/inversions/parametercontroldrag.py (revision 24259) +++ /issm/trunk-jpl/src/m/inversions/parametercontroldrag.py (revision 24260) @@ -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', 10^-4, 'optscal', [10^7 10^8]) See also PARAMETERCONTROLB Index: /issm/trunk-jpl/src/m/materials/cuffey.py =================================================================== --- /issm/trunk-jpl/src/m/materials/cuffey.py (revision 24259) +++ /issm/trunk-jpl/src/m/materials/cuffey.py (revision 24260) @@ -26,5 +26,5 @@ rigidity = np.zeros_like(T) - pos = np.nonzero(T <= - 45) + pos = np.nonzero(T <= -45) if len(pos): rigidity[pos] = 10**8 * (-0.000396645116301 * (T[pos] + 50)**3 + 0.013345579471334 * (T[pos] + 50)**2 - 0.356868703259105 * (T[pos] + 50) + 7.272363035371383) Index: /issm/trunk-jpl/src/m/materials/nye.py =================================================================== --- /issm/trunk-jpl/src/m/materials/nye.py (revision 24259) +++ /issm/trunk-jpl/src/m/materials/nye.py (revision 24260) @@ -32,13 +32,13 @@ warnings.warn('H2O ICE - GUARANTEED MELTING. Some temperature values are beyond 273.15K.') - Rg = 8.3144598 # J mol^ - 1 K^ - 1 + Rg = 8.3144598 # J mol^-1 K^-1 if ice_type == 1: # CO2 ice - A_const = 10**(10.8) # s^ - 1 MPa - Q = 63000. # J mol^ - 1 + A_const = 10**(10.8) # s^-1 MPa + Q = 63000. # J mol^-1 n = 7. # Glen's exponent elif ice_type == 2: # H2O ice - A_const = 9 * 10**4 # s^ - 1 MPa - Q = 60000. # J mol^ - 1 + A_const = 9 * 10**4 # s^-1 MPa + Q = 60000. # J mol^-1 n = 3. # Glen's exponent else: @@ -46,5 +46,5 @@ # Arrhenius Law - A = A_const * np.exp(-1 * Q / (T * Rg)) # s^ - 1 MPa + A = A_const * np.exp(-1 * Q / (T * Rg)) # s^-1 MPa rigidity = A**(-1 / n) * 10**6 # s^(1 / n) Pa Index: /issm/trunk-jpl/src/m/materials/paterson.py =================================================================== --- /issm/trunk-jpl/src/m/materials/paterson.py (revision 24259) +++ /issm/trunk-jpl/src/m/materials/paterson.py (revision 24260) @@ -28,7 +28,7 @@ # n = 3; T = temperature-273 # %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) + # 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) # %Convert into rigidity B # B = A.^(-1 / n) * 10^3; %s^(1 / 3)Pa @@ -38,5 +38,5 @@ rigidity = np.zeros_like(T) - pos1 = np.nonzero(T <= - 45)[0] + pos1 = np.nonzero(T <= -45)[0] if len(pos1): rigidity[pos1] = 10**8 * (-0.000292866376675 * (T[pos1] + 50)**3 + 0.011672640664130 * (T[pos1] + 50)**2 - 0.325004442485481 * (T[pos1] + 50) + 6.524779401948101) Index: /issm/trunk-jpl/src/m/mech/thomasparams.py =================================================================== --- /issm/trunk-jpl/src/m/mech/thomasparams.py (revision 24259) +++ /issm/trunk-jpl/src/m/mech/thomasparams.py (revision 24260) @@ -127,5 +127,5 @@ # a < -1 in areas of strong lateral compression or longitudinal compression and - # theta flips sign at a = - 2 + # theta flips sign at a = -2 pos = np.nonzero(np.abs((np.abs(a) - 2.)) < 1.e-3) if len(pos) > 0: Index: /issm/trunk-jpl/src/m/mesh/ComputeMetric.py =================================================================== --- /issm/trunk-jpl/src/m/mesh/ComputeMetric.py (revision 24259) +++ /issm/trunk-jpl/src/m/mesh/ComputeMetric.py (revision 24260) @@ -11,5 +11,5 @@ Example: - metric = ComputeMetric(hessian, 2 / 9, 10^ - 1, 100, 10^5, []) + metric = ComputeMetric(hessian, 2 / 9, 10^-1, 100, 10^5, []) """ @@ -41,5 +41,5 @@ v2y[pos3] = 1. - #Compute new metric (for each node M = V * Lambda * V^ - 1) + #Compute new metric (for each node M = V * Lambda * V^-1) metric = np.vstack((((v1x * v2y - v1y * v2x)**(-1) * (lambda1 * v2y * v1x - lambda2 * v1y * v2x)).reshape(-1, ), Index: /issm/trunk-jpl/src/m/mesh/bamg.py =================================================================== --- /issm/trunk-jpl/src/m/mesh/bamg.py (revision 24259) +++ /issm/trunk-jpl/src/m/mesh/bamg.py (revision 24260) @@ -19,5 +19,5 @@ BAMG - mesh generation - Available options (for more details see ISSM website http: / / issm.jpl.nasa.gov / ): + Available options (for more details see ISSM website http://issm.jpl.nasa.gov/): - domain : followed by an ARGUS file that prescribes the domain outline @@ -33,5 +33,5 @@ - anisomax : maximum ratio between the smallest and largest edges (default is 10^30) - - coeff : coefficient applied to the metric (2 - > twice as many elements, default is 1) + - 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 - err : error used to generate the metric from a field @@ -40,13 +40,13 @@ to apply several fields, use one column per field - gradation : maximum ratio between two adjacent edges - - Hessiantype : 0 - > use double P2 projection (default) - 1 - > use Green formula + - Hessiantype : 0 -> use double P2 projection (default) + 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) - maxsubdiv : maximum subdivision of exisiting elements (default is 10) - metric : matrix (numberofnodes x 3) used as a metric - - Metrictype : 1 - > absolute error c / (err coeff^2) * Abs(H) (default) - 2 - > relative error c / (err coeff^2) * Abs(H) / max(s, cutoff * max(s)) - 3 - > rescaled absolute error c / (err coeff^2) * Abs(H) / (smax - smin) + - Metrictype : 1 -> absolute error c / (err coeff^2) * Abs(H) (default) + 2 -> relative error c / (err coeff^2) * Abs(H) / max(s, cutoff * max(s)) + 3 -> rescaled absolute error c / (err coeff^2) * Abs(H) / (smax - smin) - nbjacoby : correction used by Hessiantype = 1 (default is 1) - nbsmooth : number of metric smoothing procedure (default is 3) @@ -378,5 +378,5 @@ bamg_options['anisomax'] = options.getfieldvalue('anisomax', 10.**18) bamg_options['coeff'] = options.getfieldvalue('coeff', 1.) - bamg_options['cutoff'] = options.getfieldvalue('cutoff', 10.**- 5) + bamg_options['cutoff'] = options.getfieldvalue('cutoff', 10.**-5) bamg_options['err'] = options.getfieldvalue('err', np.array([[0.01]])) bamg_options['errg'] = options.getfieldvalue('errg', 0.1) @@ -384,5 +384,5 @@ bamg_options['gradation'] = options.getfieldvalue('gradation', 1.5) bamg_options['Hessiantype'] = options.getfieldvalue('Hessiantype', 0) - bamg_options['hmin'] = options.getfieldvalue('hmin', 10.**- 100) + bamg_options['hmin'] = options.getfieldvalue('hmin', 10.**-100) bamg_options['hmax'] = options.getfieldvalue('hmax', 10.**100) bamg_options['hminVertices'] = options.getfieldvalue('hminVertices', np.empty((0, 1))) Index: /issm/trunk-jpl/src/m/mesh/bamgflowband.py =================================================================== --- /issm/trunk-jpl/src/m/mesh/bamgflowband.py (revision 24259) +++ /issm/trunk-jpl/src/m/mesh/bamgflowband.py (revision 24260) @@ -18,7 +18,7 @@ Example: - x =np.arrange(1, 3001, 100) + x = np.arrange(1, 3001, 100) h = linspace(1000, 300, numel(x)) - b= - 917 / 1023 * h + b= -917 / 1023 * h md = bamgflowband(model, b + h, b, 'hmax', 80, 'vertical', 1, 'Markers', m) """ Index: /issm/trunk-jpl/src/m/solve/parseresultsfromdisk.py =================================================================== --- /issm/trunk-jpl/src/m/solve/parseresultsfromdisk.py (revision 24259) +++ /issm/trunk-jpl/src/m/solve/parseresultsfromdisk.py (revision 24260) @@ -59,7 +59,7 @@ #Get time and step - if loadres['step'] != - 9999.: + if loadres['step'] != -9999.: saveres[index].__dict__['step'] = loadres['step'] - if loadres['time'] != - 9999.: + if loadres['time'] != -9999.: saveres[index].__dict__['time'] = loadres['time'] @@ -200,21 +200,21 @@ field = field * yts elif fieldname == 'TotalFloatingBmb': - field = field / 10.**12 * yts #(GigaTon / year) + field = field / 10.**12 * yts #(GigaTon/year) elif fieldname == 'TotalFloatingBmbScaled': - field = field / 10.**12 * yts #(GigaTon / year) + field = field / 10.**12 * yts #(GigaTon/year) elif fieldname == 'TotalGroundedBmb': - field = field / 10.**12 * yts #(GigaTon / year) + field = field / 10.**12 * yts #(GigaTon/year) elif fieldname == 'TotalGroundedBmbScaled': - field = field / 10.**12 * yts #(GigaTon / year) + field = field / 10.**12 * yts #(GigaTon/year) elif fieldname == 'TotalSmb': - field = field / 10.**12 * yts #(GigaTon / year) + field = field / 10.**12 * yts #(GigaTon/year) elif fieldname == 'TotalSmbScaled': - field = field / 10.**12 * yts #(GigaTon / year) + field = field / 10.**12 * yts #(GigaTon/year) elif fieldname == 'GroundinglineMassFlux': - field = field / 10.**12 * yts #(GigaTon / year) + field = field / 10.**12 * yts #(GigaTon/year) elif fieldname == 'IcefrontMassFlux': - field = field / 10.**12 * yts #(GigaTon / year) + field = field / 10.**12 * yts #(GigaTon/year) elif fieldname == 'IcefrontMassFluxLevelset': - field = field / 10.**12 * yts #(GigaTon / year) + field = field / 10.**12 * yts #(GigaTon/year) elif fieldname == 'SmbMassBalance': field = field * yts @@ -255,5 +255,5 @@ field = temp_field - if time != - 9999: + if time != -9999: time = time / yts