Index: /issm/trunk-jpl/test/NightlyRun/runme.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/runme.py (revision 25177) +++ /issm/trunk-jpl/test/NightlyRun/runme.py (revision 25178) @@ -1,10 +1,11 @@ #!/usr/bin/env python +import argparse +from glob import glob import os -import argparse +from sys import float_info +from traceback import format_exc + import numpy as np -from traceback import format_exc -from sys import float_info -from glob import glob -from GetIds import * + try: from parallelrange import parallelrange @@ -12,7 +13,8 @@ import devpath from parallelrange import parallelrange -from IdToName import IdToName from arch import archread from arch import archwrite +from GetIds import * +from IdToName import IdToName @@ -182,5 +184,5 @@ # Matlab uses base 1, so use base 1 in labels archive = np.array(archread(archive_file, archive_name + '_field' + str(k + 1))) - #Because np.array is weird (str(np.array(None)) becomes 'None' but np.array(None) is never equal to None, it basically becomes a type of string in an array): + # NOTE: str(np.array(None)) becomes 'None' but np.array(None) is never equal to None: it basically becomes a type of string in an array if str(archive) == 'None': raise NameError("Field name '" + archive_name + '_field' + str(k + 1) + "' does not exist in archive file.") @@ -196,9 +198,9 @@ #disp test result if (np.any(error_diff > tolerance) or np.isnan(error_diff)): - print(('ERROR difference: {} > {} test id: {} test name: {} field: {}'.format(error_diff, tolerance, id, id_string, fieldname))) + print(('ERROR difference: {:7.2g} > {:7.2g} test id: {} test name: {} field: {}'.format(error_diff, tolerance, id, id_string, fieldname))) errorcount += 1 erroredtest_list.append(id) else: - print(('SUCCESS difference: {} < {} test id: {} test name: {} field: {}'.format(error_diff, tolerance, id, id_string, fieldname))) + print(('SUCCESS difference: {:7.2g} < {:7.2g} test id: {} test name: {} field: {}'.format(error_diff, tolerance, id, id_string, fieldname))) except Exception as message: Index: /issm/trunk-jpl/test/NightlyRun/test2010.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test2010.py (revision 25177) +++ /issm/trunk-jpl/test/NightlyRun/test2010.py (revision 25178) @@ -19,16 +19,16 @@ #parameterize solidearth solution: #solidearth loading: {{{ -late = sum(md.mesh.lat[md.mesh.elements - 1], 1) / 3 -longe = sum(md.mesh.long[md.mesh.elements - 1], 1) / 3 +late = md.mesh.lat[md.mesh.elements - 1].sum(axis=1) / 3 +longe = md.mesh.long[md.mesh.elements - 1].sum(axis=1) / 3 -md.solidearth.surfaceload.icethicknesschange = np.zeros(md.mesh.numberofelements) +md.solidearth.surfaceload.icethicknesschange = np.zeros((md.mesh.numberofelements, 1)) 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] +#NOTE: Python does not include last element in array slices: (6:7) -> [5:7] md.solidearth.surfaceload.icethicknesschange[pos[5:7]] = -1 md.solidearth.sealevel = np.zeros(md.mesh.numberofvertices) md.dsl.global_average_thermosteric_sea_level_change = np.zeros((2, 1)) -md.dsl.sea_surface_height_change_above_geoid = np.zeros(md.mesh.numberofvertices + 1) -md.dsl.sea_water_pressure_change_at_sea_floor = np.zeros(md.mesh.numberofvertices + 1) +md.dsl.sea_surface_height_change_above_geoid = np.zeros((md.mesh.numberofvertices + 1, 1)) +md.dsl.sea_water_pressure_change_at_sea_floor = np.zeros((md.mesh.numberofvertices + 1, 1)) md.solidearth.ocean_area_scaling = 1 @@ -40,8 +40,8 @@ #mask: {{{ mask = gmtmask(md.mesh.lat, md.mesh.long) -icemask = np.ones(md.mesh.numberofvertices) +icemask = np.ones((md.mesh.numberofvertices, 1)) pos = np.where(mask == 0) icemask[pos[0]] = -1 -pos = np.where(np.sum(mask[md.mesh.elements - 1], 1) < 3) +pos = np.where(mask[md.mesh.elements - 1].sum(axis=1) < 3)[0] icemask[md.mesh.elements[pos, :] - 1] = -1 md.mask.ice_levelset = icemask @@ -50,27 +50,23 @@ #make sure that the elements that have loads are fully grounded pos = np.nonzero(md.solidearth.surfaceload.icethicknesschange)[0] -md.mask.ocean_levelset = -np.ones(md.mesh.numberofvertices) +md.mask.ocean_levelset[md.mesh.elements[pos, :] - 1] = 1 #make sure wherever there is an ice load, that the mask is set to ice: +md.mask.ice_levelset = np.ones((md.mesh.numberofvertices, 1)) #pos = np.nonzero(md.solidearth.surfaceload.icethicknesschange)[0] # Do we need to do this twice? -md.mask.ice_levelset[md.mesh.elements[pos, :] - 1] = 1 - -#make sure wherever there is an ice load, that the mask is set to ice -md.mask.ice_levelset = np.ones(md.mesh.numberofvertices) -icemask[md.mesh.elements[pos, :] - 1] = -1 -md.mask.ice_levelset = icemask +md.mask.ice_levelset[md.mesh.elements[pos, :] - 1] = -1 # }}} #geometry {{{ di = md.materials.rho_ice / md.materials.rho_water -md.geometry.thickness = np.ones(md.mesh.numberofvertices) -md.geometry.surface = (1 - di) * np.zeros(md.mesh.numberofvertices) +md.geometry.thickness = np.ones((md.mesh.numberofvertices, 1)) +md.geometry.surface = (1 - di) * np.zeros((md.mesh.numberofvertices, 1)) md.geometry.base = md.geometry.surface - md.geometry.thickness md.geometry.bed = md.geometry.base # }}} #materials {{{ -md.initialization.temperature = 273.25 * np.ones(md.mesh.numberofvertices) +md.initialization.temperature = 273.25 * np.ones((md.mesh.numberofvertices, 1)) md.materials.rheology_B = paterson(md.initialization.temperature) -md.materials.rheology_n = 3 * np.ones(md.mesh.numberofelements) +md.materials.rheology_n = 3 * np.ones((md.mesh.numberofelements, 1)) # }}} #Miscellaneous {{{