Index: /issm/trunk-jpl/test/NightlyRun/GetIds.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/GetIds.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/GetIds.py (revision 24214) @@ -1,3 +1,3 @@ -#! /usr/bin/env python +#! / usr / bin / env python from IdToName import * from IdFromString import * @@ -9,5 +9,5 @@ GetIds - output ids from a given array of IDs and test names - the test names can be any string or sub-string present + the test names can be any string or sub - string present in the test's name (first line of corresponding file) @@ -18,6 +18,6 @@ ids = GetIds('Dakota') ids = GetIds([101, 102...]) - ids = GetIds([\'Dakota\',\'Slr\'...]) - ids = GetIds([[101, 102...],[\'Dakota\',\'Slr\'...]]) + ids = GetIds([\'Dakota\', \'Slr\'...]) + ids = GetIds([[101, 102...], [\'Dakota\', \'Slr\'...]]) """ @@ -30,5 +30,5 @@ # fail silently return [] - #raise RuntimeError('runme.py: GetIds.py: No tests with names matching "'+ids_names+'" were found. Note that name checking is case sensitive. Test names are in the first line of a given test eg: "Square" would include test101.py: "SquareShelfConstrainedStressSSA2d"') + #raise RuntimeError('runme.py: GetIds.py: No tests with names matching "' + ids_names + '" were found. Note that name checking is case sensitive. Test names are in the first line of a given test eg: "Square" would include test101.py: "SquareShelfConstrainedStressSSA2d"') if type(ids_names) == int: @@ -37,7 +37,7 @@ # fail silently return [] - #raise RuntimeError('runme.py: GetIds.py: No tests with ids matching "'+ids_names+'" were found. Check that there is a test file named "test'+str(ids_names)+'.py"') + #raise RuntimeError('runme.py: GetIds.py: No tests with ids matching "' + ids_names + '" were found. Check that there is a test file named "test' + str(ids_names) + '.py"') - # many inputs of either ids or test names + # many inputs of either ids or test names if type(ids_names) == list and len(ids_names) > 0: # is everything a string or int? @@ -49,7 +49,7 @@ raise RuntimeError('runme.py: GetIds.py: No tests with names matching "' + ids_names + '" were found. Note that name checking is case sensitive.') - # many inputs of both ids and test names - # ids_names[0] -> ids_names by id - # ids_names[1] -> ids_names by test name + # many inputs of both ids and test names + # 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: @@ -60,7 +60,7 @@ raise RuntimeError('runme.py: GetIds.py: No tests with names matching "' + ids_names + '" were found. Note that name checking is case sensitive.') - # no recognizable ids or id formats + # 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/IdFromString.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/IdFromString.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/IdFromString.py (revision 24214) @@ -1,3 +1,3 @@ -#! /usr/bin/env python +#! / usr / bin / env python from IdToName import IdToName import os @@ -14,8 +14,8 @@ ids = IdFromString('Parallel') ids = IdFromString('79North') - ids = IdFromString('*') + ids = IdFromString(' * ') """ - #Check input +#Check input if not isinstance(string, str): raise TypeError('IdFromString error message: input argument is not a string.') @@ -23,5 +23,5 @@ string = string.replace('"', '') - #Get the test ids and names and scan for matches +#Get the test ids and names and scan for matches ids = [] @@ -30,16 +30,16 @@ if f.endswith('.py') and f.startswith('test'): # all tests look like: "testwxyz.py" so 5th to 3rd to last is always the full id - s = int(f[4:-3]) + s = int(f[4: - 3]) name = IdToName(s) - if (string == '*') or (name is not None and string in name): + if (string == ' * ') or (name is not None and string in name): ids.append(s) idnames.append(name) - #Return if no test found +#Return if no test found if not ids: print("No test matches '%s'." % string) return ids - #Display names +#Display names if verbose: idnames = [i for _, i in sorted(zip(ids, idnames), key=lambda pair: pair[0])] Index: /issm/trunk-jpl/test/NightlyRun/IdToName.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/IdToName.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/IdToName.py (revision 24214) @@ -1,8 +1,8 @@ -#! /usr/bin/env python +#! / usr / bin / env python def IdToName(test_id): """ - IDTONAME- return name of test + IDTONAME - return name of test Usage: @@ -12,5 +12,5 @@ file_text = infile.readline() - string = '#Test Name:' - name = file_text[len(string) + 1:-1] + string = ' #Test Name:' + name = file_text[len(string) + 1: - 1] return name Index: /issm/trunk-jpl/test/NightlyRun/runme.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/runme.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/runme.py (revision 24214) @@ -1,3 +1,3 @@ -#!/usr/bin/env python +#! / usr / bin / env python import os import argparse @@ -18,13 +18,12 @@ def runme(id=None, exclude=None, benchmark='nightly', procedure='check', output='none', rank=1, numprocs=1): - """ RUNME - test deck for ISSM nightly runs - In a test deck directory (tests/Vertification/NightlyRun for example) + In a test deck directory (tests / Vertification / NightlyRun for example) The following command will launch all the existing tests: - >> runme() + >> runme() To run the tests 101 and 102: - >> runme(id = [101, 102]) + >> runme(id = [101, 102]) etc... @@ -37,6 +36,6 @@ 'benchmark' 'all' (all of the tests) - 'nightly' (nightly run/ daily run) - 'ismip' : validation of ismip-hom tests + 'nightly' (nightly run / daily run) + 'ismip' : validation of ismip - hom tests 'eismint': validation of eismint tests 'thermal': validation of thermal tests @@ -56,6 +55,6 @@ runme('SquareShelf') runme(exclude = 2001) - runme(exclude='Dakota', benchmark='all') - runme(id = [[101, 102],['Dakota', 'Slr']]) + runme(exclude = 'Dakota', benchmark = 'all') + runme(id = [[101, 102], ['Dakota', 'Slr']]) """ #Get ISSM_DIR variable @@ -69,26 +68,25 @@ print(("runme warning: benchmark '{}' not supported, defaulting to test 'nightly'.".format(benchmark))) benchmark = 'nightly' - # }}} - #GET procedure {{{ + # }}} + #GET procedure {{{ if procedure not in ['check', 'update']: print(("runme warning: procedure '{}' not supported, defaulting to test 'check'.".format(procedure))) procedure = 'check' - # }}} - #GET output {{{ + # }}} + #GET output {{{ if output not in ['nightly', 'none']: print(("runme warning: output '{}' not supported, defaulting to test 'none'.".format(output))) output = 'none' - # }}} - #GET RANK and NUMPROCS for multithreaded runs {{{ + # }}} + #GET RANK and NUMPROCS for multithreaded runs {{{ if (numprocs < rank): numprocs = 1 - # }}} - #GET ids {{{ - flist = glob('test*.py') #File name must start with 'test' and must end by '.py' and must be different than 'test.py' - list_ids = [int(file[4:-3]) for file in flist if not file == 'test.py'] #Keep test id only (skip 'test' and '.py') - - i1, i2 = parallelrange(rank, numprocs, len(list_ids)) #Get tests for this cpu only + # }}} + #GET ids {{{ + flist = glob('test*.py') #File name must start with 'test' and must end by '.py' and must be different than 'test.py' + list_ids = [int(file[4: -3]) for file in flist if not file == 'test.py'] #Keep test id only (skip 'test' and '.py') + + i1, i2 = parallelrange(rank, numprocs, len(list_ids)) #Get tests for this cpu only list_ids = list_ids[i1:i2 + 1] - if np.size(id) > 0 and id is not None: test_ids = set(GetIds(id)).intersection(set(list_ids)) @@ -101,5 +99,4 @@ #GET exclude {{{ exclude_ids = GetIds(exclude) - test_ids = test_ids.difference(exclude_ids) # }}} @@ -131,6 +128,8 @@ #Loop over tests and launch sequence root = os.getcwd() + errorcount = 0 + erroredtest_list = [] for id in test_ids: - print(("----------------starting:{}-----------------------".format(id))) + print(("----------------starting:{}----------------------- ".format(id))) try: #Execute test @@ -154,9 +153,9 @@ elif len(field.shape) == 0: field = field.reshape(1, 1) - # Matlab uses base 1, so use base 1 in labels + # Matlab uses base 1, so use base 1 in labels archwrite(archive_file, archive_name + '_field' + str(k + 1), field) print(("File {} saved. \n".format(os.path.join('..', 'Archives', archive_name + '.arch')))) - #ELSE: CHECK TEST + #ELSE: CHECK TEST else: #load archive @@ -192,7 +191,9 @@ error_diff = error_diff[0] - #disp test result + #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))) + errorcount += 1 + np.append(erroredtest_list, id) else: print(('SUCCESS difference: {} < {} test id: {} test name: {} field: {}'.format(error_diff, tolerance, id, id_string, fieldname))) @@ -204,9 +205,9 @@ fid = open(os.path.join(ISSM_DIR, 'nightlylog', 'pythonerror.log'), 'a') fid.write('%s' % message) - fid.write('\n------------------------------------------------------------------\n') + fid.write('\n------------------------------------------------------------------ \n') fid.close() - print(('FAILURE difference: N/A test id: {} test name: {} field: {}'.format(id, id_string, fieldname))) + print(('FAILURE difference: N / A test id: {} test name: {} field: {}'.format(id, id_string, fieldname))) else: - print(('FAILURE difference: N/A test id: {} test name: {} field: {}'.format(id, id_string, fieldname))) + print(('FAILURE difference: N / A test id: {} test name: {} field: {}'.format(id, id_string, fieldname))) raise RuntimeError(message) @@ -217,12 +218,15 @@ fid = open(os.path.join(ISSM_DIR, 'nightlylog', 'pythonerror.log'), 'a') fid.write('%s' % message) - fid.write('\n------------------------------------------------------------------\n') + fid.write('\n------------------------------------------------------------------ \n') fid.close() - print(('FAILURE difference: N/A test id: {} test name: {} field: {}'.format(id, id_string, 'N/A'))) + print(('FAILURE difference: N / A test id: {} test name: {} field: {}'.format(id, id_string, 'N/A'))) else: - print(('FAILURE difference: N/A test id: {} test name: {} field: {}'.format(id, id_string, 'N/A'))) + print(('FAILURE difference: N / A test id: {} test name: {} field: {}'.format(id, id_string, 'N/A'))) raise RuntimeError(message) - print(("----------------finished:{}-----------------------".format(id))) + print(("---------------- finished:{}----------------------- ".format(id))) + + if errorcount > 0: + print("{} errors were detected in test {}".format(errorcount, erroredtest_list)) return @@ -231,5 +235,5 @@ if 'PYTHONSTARTUP' in os.environ: PYTHONSTARTUP = os.environ['PYTHONSTARTUP'] - #print 'PYTHONSTARTUP =', PYTHONSTARTUP +#print 'PYTHONSTARTUP = ', PYTHONSTARTUP if os.path.exists(PYTHONSTARTUP): try: @@ -241,13 +245,13 @@ parser = argparse.ArgumentParser(description='RUNME - test deck for ISSM nightly runs') - parser.add_argument('-i', '--id', nargs='*', type=int, help='followed by the list of ids requested', default=[]) - parser.add_argument('-in', '--include_name', nargs='*', type=str, help='followed by the list of test names requested', default=[]) - parser.add_argument('-e', '--exclude', nargs='+', type=int, help='ids to be excluded from the test', default=[]) - parser.add_argument('-en', '--exclude_name', nargs='+', type=str, help='test names to be excluded from the test', default=[]) - parser.add_argument('-b', '--benchmark', help='nightly/ismip/eismint/thermal/mesh/...', default='nightly') - parser.add_argument('-p', '--procedure', help='check/update', default='check') - parser.add_argument('-o', '--output', help='nightly/daily/none', default='none') - parser.add_argument('-r', '--rank', type=int, help='rank', default=1) - parser.add_argument('-n', '--numprocs', type=int, help='numprocs', default=1) + parser.add_argument(' -i', '--id', nargs=' * ', type=int, help='followed by the list of ids requested', default=[]) + parser.add_argument(' -in', '--include_name', nargs=' * ', type=str, help='followed by the list of test names requested', default=[]) + parser.add_argument(' -e', '--exclude', nargs=' + ', type=int, help='ids to be excluded from the test', default=[]) + parser.add_argument(' -en', '--exclude_name', nargs=' + ', type=str, help='test names to be excluded from the test', default=[]) + parser.add_argument(' -b', '--benchmark', help='nightly/ismip/eismint/thermal/mesh/...', default='nightly') + parser.add_argument(' -p', '--procedure', help='check/update', default='check') + parser.add_argument(' -o', '--output', help='nightly/daily/none', default='none') + parser.add_argument(' -r', '--rank', type=int, help='rank', default=1) + parser.add_argument(' -n', '--numprocs', type=int, help='numprocs', default=1) args = parser.parse_args() Index: /issm/trunk-jpl/test/NightlyRun/test1101.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1101.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test1101.py (revision 24214) @@ -10,5 +10,5 @@ """ -This test is a test from the ISMP-HOM Intercomparison project. +This test is a test from the ISMP - HOM Intercomparison project. Pattyn and Payne 2006 """ @@ -22,9 +22,9 @@ for L in L_list: - nx = 20 #numberof nodes in x direction + nx = 20 #numberof nodes in x direction ny = 20 md = model() md = squaremesh(md, L, L, nx, ny) - md = setmask(md, '', '') #ice sheet test + md = setmask(md, '', '') #ice sheet test md = parameterize(md, '../Par/ISMIPA.py') md.extrude(9, 1.) @@ -32,5 +32,5 @@ md = setflowequation(md, 'HO', 'all') - #Create dirichlet on the bed only +#Create dirichlet on the bed only md.stressbalance.spcvx = np.nan * np.ones((md.mesh.numberofvertices)) md.stressbalance.spcvy = np.nan * np.ones((md.mesh.numberofvertices)) @@ -41,5 +41,5 @@ md.stressbalance.spcvy[pos] = 0. - #Create MPCs to have periodic boundary conditions +#Create MPCs to have periodic boundary conditions posx = np.where(md.mesh.x == 0.)[0] posx2 = np.where(md.mesh.x == np.max(md.mesh.x))[0] @@ -50,9 +50,9 @@ md.stressbalance.vertex_pairing = np.vstack((np.vstack((posx + 1, posx2 + 1)).T, np.vstack((posy + 1, posy2 + 1)).T)) - #Compute the stressbalance +#Compute the stressbalance md.cluster = generic('name', gethostname(), 'np', 8) md = solve(md, 'Stressbalance') - #Plot the results and save them +#Plot the results and save them vx = md.results.StressbalanceSolution.Vx vy = md.results.StressbalanceSolution.Vy @@ -62,53 +62,53 @@ maxvx.append(np.max(vx[-md.mesh.numberofvertices2d:])) - #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') +#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') if printingflag: pass # set(gcf, 'Color', 'w') # 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') +# 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') if printingflag: pass # set(gcf, 'Color', 'w') # 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') +# 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') if printingflag: pass # set(gcf, 'Color', 'w') # printmodel(['ismipaHOvz' num2str(L)], 'png', 'margin', 'on', 'marginsize', 25, 'frame', 'off', 'resolution', 1.5, 'hardcopy', 'off') -# shutil.move("ismipaHOvz%d.png" % L, ISSM_DIR+'/website/doc_pdf/validation/Images/ISMIP/TestA') +# shutil.move("ismipaHOvz%d.png" % L, ISSM_DIR + '/website/doc_pdf/validation/Images/ISMIP/TestA') if (L == 5000.): pass -# plotmodel(md, 'data', vx, 'sectionvalue', '../Exp/ISMIP5000.exp', 'layer', md.mesh.numberoflayers,... -# 'resolution',[10 10], 'ylim',[10 18], 'xlim',[0 5000], 'title', '', 'xlabel', '') +# plotmodel(md, 'data', vx, 'sectionvalue', '../Exp/ISMIP5000.exp', 'layer', md.mesh.numberoflayers, ... +# 'resolution', [10 10], 'ylim', [10 18], 'xlim', [0 5000], 'title', '', 'xlabel', '') elif (L == 10000.): pass -# plotmodel(md, 'data', vx, 'sectionvalue', '../Exp/ISMIP10000.exp', 'layer', md.mesh.numberoflayers,... -# 'resolution',[10 10], 'ylim',[10 30], 'xlim',[0 10000], 'title', '', 'xlabel', '') +# plotmodel(md, 'data', vx, 'sectionvalue', '../Exp/ISMIP10000.exp', 'layer', md.mesh.numberoflayers, ... +# 'resolution', [10 10], 'ylim', [10 30], 'xlim', [0 10000], 'title', '', 'xlabel', '') elif (L == 20000.): pass -# plotmodel(md, 'data', vx, 'sectionvalue', '../Exp/ISMIP20000.exp', 'layer', md.mesh.numberoflayers,... -# 'resolution',[10 10], 'ylim',[0 50], 'xlim',[0 20000], 'title', '', 'xlabel', '') +# plotmodel(md, 'data', vx, 'sectionvalue', '../Exp/ISMIP20000.exp', 'layer', md.mesh.numberoflayers, ... +# 'resolution', [10 10], 'ylim', [0 50], 'xlim', [0 20000], 'title', '', 'xlabel', '') elif (L == 40000.): pass -# plotmodel(md, 'data', vx, 'sectionvalue', '../Exp/ISMIP40000.exp', 'layer', md.mesh.numberoflayers,... -# 'resolution',[10 10], 'ylim',[0 80], 'xlim',[0 40000], 'title', '', 'xlabel', '') +# plotmodel(md, 'data', vx, 'sectionvalue', '../Exp/ISMIP40000.exp', 'layer', md.mesh.numberoflayers, ... +# 'resolution', [10 10], 'ylim', [0 80], 'xlim', [0 40000], 'title', '', 'xlabel', '') elif (L == 80000.): pass -# plotmodel(md, 'data', vx, 'sectionvalue', '../Exp/ISMIP80000.exp', 'layer', md.mesh.numberoflayers,... -# 'resolution',[10 10], 'ylim',[0 100], 'xlim',[0 80000], 'title', '', 'xlabel', '') +# plotmodel(md, 'data', vx, 'sectionvalue', '../Exp/ISMIP80000.exp', 'layer', md.mesh.numberoflayers, ... +# 'resolution', [10 10], 'ylim', [0 100], 'xlim', [0 80000], 'title', '', 'xlabel', '') elif (L == 160000.): pass -# plotmodel(md, 'data', vx, 'sectionvalue', '../Exp/ISMIP160000.exp', 'layer', md.mesh.numberoflayers,... -# 'resolution',[10 10], 'ylim',[0 120], 'xlim',[0 160000], 'title', '', 'xlabel', '') +# plotmodel(md, 'data', vx, 'sectionvalue', '../Exp/ISMIP160000.exp', 'layer', md.mesh.numberoflayers, ... +# 'resolution', [10 10], 'ylim', [0 120], 'xlim', [0 160000], 'title', '', 'xlabel', '') if printingflag: pass # set(gcf, 'Color', 'w') # printmodel(['ismipaHOvxsec' num2str(L)], 'png', 'margin', 'on', 'marginsize', 25, 'frame', 'off', 'resolution', 1.5, 'hardcopy', 'off') -# shutil.move("ismipaHOvxsec%d.png" % L, ISSM_DIR+'/website/doc_pdf/validation/Images/ISMIP/TestA') +# shutil.move("ismipaHOvxsec%d.png" % L, ISSM_DIR + '/website/doc_pdf/validation/Images/ISMIP/TestA') #Now plot the min and max values of vx for each size of the square @@ -118,5 +118,5 @@ # set(gcf, 'Color', 'w') # printmodel('ismipaHOminvx', 'png', 'margin', 'on', 'marginsize', 25, 'frame', 'off', 'resolution', 1.5, 'hardcopy', 'off') -# shutil.move('ismipaHOminvx.png', ISSM_DIR+'/website/doc_pdf/validation/Images/ISMIP/TestA') +# shutil.move('ismipaHOminvx.png', ISSM_DIR + '/website/doc_pdf/validation/Images/ISMIP/TestA') #plot([5 10 20 40 80 160], maxvx)ylim([0 120])xlim([0 160]) if printingflag: @@ -124,5 +124,5 @@ # set(gcf, 'Color', 'w') # printmodel('ismipaHOmaxvx', 'png', 'margin', 'on', 'marginsize', 25, 'frame', 'off', 'resolution', 1.5, 'hardcopy', 'off') -# shutil.move('ismipaHOmaxvx.png', ISSM_DIR+'/website/doc_pdf/validation/Images/ISMIP/TestA') +# shutil.move('ismipaHOmaxvx.png', ISSM_DIR + '/website/doc_pdf/validation/Images/ISMIP/TestA') #Fields and tolerances to track changes Index: /issm/trunk-jpl/test/NightlyRun/test1102.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1102.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test1102.py (revision 24214) @@ -10,5 +10,5 @@ """ -This test is a test from the ISMP-HOM Intercomparison project. +This test is a test from the ISMP - HOM Intercomparison project. Pattyn and Payne 2006 """ @@ -22,16 +22,16 @@ for L in L_list: - nx = 20 #numberof nodes in x direction + nx = 20 #numberof nodes in x direction ny = 20 md = model() md = squaremesh(md, L, L, nx, ny) - md = setmask(md, '', '') #ice sheet test + md = setmask(md, '', '') #ice sheet test -# #Find elements at the corner and extract model -# posnodes = np.nonzero(np.logical_and.reduce(np.logical_or.reduce(md.mesh.x = 0., md.mesh.x = np.max(md.mesh.x)), np.logical_or.reduce(md.mesh.y = 0., md.mesh.y = np.max(md.mesh.y)))) -# a = np.nonzero(ismember(md.mesh.elements, posnodes))[0] -# elements = np.ones((md.mesh.numberofelements), int) -# elements[a]=0 -# md.modelextract(elements) + # #Find elements at the corner and extract model + # posnodes = np.nonzero(np.logical_and.reduce(np.logical_or.reduce(md.mesh.x = 0., md.mesh.x = np.max(md.mesh.x)), np.logical_or.reduce(md.mesh.y = 0., md.mesh.y = np.max(md.mesh.y)))) + # a = np.nonzero(ismember(md.mesh.elements, posnodes))[0] + # elements = np.ones((md.mesh.numberofelements), int) + # elements[a] = 0 + # md.modelextract(elements) md = parameterize(md, '../Par/ISMIPA.py') @@ -52,5 +52,5 @@ md = solve(md, 'Stressbalance') - #Plot the results and save them +#Plot the results and save them vx = md.results.StressbalanceSolution.Vx vy = md.results.StressbalanceSolution.Vy @@ -62,60 +62,60 @@ #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 / 10^3], 'ylim', [0 L / 10^3], 'unit', 'km', 'figure', 2) if printingflag: pass -# set(gcf, 'Color', 'w') -# 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) + # set(gcf, 'Color', 'w') + # 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) if printingflag: pass -# set(gcf, 'Color', 'w') -# 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) + # set(gcf, 'Color', 'w') + # 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) if printingflag: pass -# set(gcf, 'Color', 'w') -# printmodel(['ismipaFSvz' num2str(L)], 'png', 'margin', 'on', 'marginsize', 25, 'frame', 'off', 'resolution', 1.5, 'hardcopy', 'off') -# shutil.move("ismipaFSvz%d.png" % L, ISSM_DIR+'/website/doc_pdf/validation/Images/ISMIP/TestA') + # set(gcf, 'Color', 'w') + # printmodel(['ismipaFSvz' num2str(L)], 'png', 'margin', 'on', 'marginsize', 25, 'frame', 'off', 'resolution', 1.5, 'hardcopy', 'off') + # shutil.move("ismipaFSvz%d.png" % L, ISSM_DIR + '/website/doc_pdf/validation/Images/ISMIP/TestA') if (L == 5000.): pass -# plotmodel(md, 'data', vx, 'sectionvalue', '../Exp/ISMIP5000.exp', 'layer', md.mesh.numberoflayers,... -# 'resolution',[10 10], 'ylim',[10 18], 'xlim',[0 5000], 'title', '', 'xlabel', '') + # plotmodel(md, 'data', vx, 'sectionvalue', '../Exp/ISMIP5000.exp', 'layer', md.mesh.numberoflayers, ... + # 'resolution', [10 10], 'ylim', [10 18], 'xlim', [0 5000], 'title', '', 'xlabel', '') elif (L == 10000.): pass -# plotmodel(md, 'data', vx, 'sectionvalue', '../Exp/ISMIP10000.exp', 'layer', md.mesh.numberoflayers,... -# 'resolution',[10 10], 'ylim',[10 30], 'xlim',[0 10000], 'title', '', 'xlabel', '') + # plotmodel(md, 'data', vx, 'sectionvalue', '../Exp/ISMIP10000.exp', 'layer', md.mesh.numberoflayers, ... + # 'resolution', [10 10], 'ylim', [10 30], 'xlim', [0 10000], 'title', '', 'xlabel', '') elif (L == 20000.): pass -# plotmodel(md, 'data', vx, 'sectionvalue', '../Exp/ISMIP20000.exp', 'layer', md.mesh.numberoflayers,... -# 'resolution',[10 10], 'ylim',[0 50], 'xlim',[0 20000], 'title', '', 'xlabel', '') + # plotmodel(md, 'data', vx, 'sectionvalue', '../Exp/ISMIP20000.exp', 'layer', md.mesh.numberoflayers, ... + # 'resolution', [10 10], 'ylim', [0 50], 'xlim', [0 20000], 'title', '', 'xlabel', '') elif (L == 40000.): pass -# plotmodel(md, 'data', vx, 'sectionvalue', '../Exp/ISMIP40000.exp', 'layer', md.mesh.numberoflayers,... -# 'resolution',[10 10], 'ylim',[0 80], 'xlim',[0 40000], 'title', '', 'xlabel', '') + # plotmodel(md, 'data', vx, 'sectionvalue', '../Exp/ISMIP40000.exp', 'layer', md.mesh.numberoflayers, ... + # 'resolution', [10 10], 'ylim', [0 80], 'xlim', [0 40000], 'title', '', 'xlabel', '') elif (L == 80000.): pass -# plotmodel(md, 'data', vx, 'sectionvalue', '../Exp/ISMIP80000.exp', 'layer', md.mesh.numberoflayers,... -# 'resolution',[10 10], 'ylim',[0 100], 'xlim',[0 80000], 'title', '', 'xlabel', '') + # plotmodel(md, 'data', vx, 'sectionvalue', '../Exp/ISMIP80000.exp', 'layer', md.mesh.numberoflayers, ... + # 'resolution', [10 10], 'ylim', [0 100], 'xlim', [0 80000], 'title', '', 'xlabel', '') elif (L == 160000.): pass -# plotmodel(md, 'data', vx, 'sectionvalue', '../Exp/ISMIP160000.exp', 'layer', md.mesh.numberoflayers,... -# 'resolution',[10 10], 'ylim',[0 120], 'xlim',[0 160000], 'title', '', 'xlabel', '') + # plotmodel(md, 'data', vx, 'sectionvalue', '../Exp/ISMIP160000.exp', 'layer', md.mesh.numberoflayers, ... + # 'resolution', [10 10], 'ylim', [0 120], 'xlim', [0 160000], 'title', '', 'xlabel', '') if printingflag: pass -# set(gcf, 'Color', 'w') -# printmodel(['ismipaFSvxsec' num2str(L)], 'png', 'margin', 'on', 'marginsize', 25, 'frame', 'off', 'resolution', 1.5, 'hardcopy', 'off') -# shutil.move("ismipaFSvxsec.png" % L, ISSM_DIR+'/website/doc_pdf/validation/Images/ISMIP/TestA') + # set(gcf, 'Color', 'w') + # printmodel(['ismipaFSvxsec' num2str(L)], 'png', 'margin', 'on', 'marginsize', 25, 'frame', 'off', 'resolution', 1.5, 'hardcopy', 'off') + # shutil.move("ismipaFSvxsec.png" % L, ISSM_DIR + '/website/doc_pdf/validation/Images/ISMIP/TestA') -#Now plot the min and max values of vx for each size of the square -#plot([5 10 20 40 80 160], minvx)ylim([0 18]) + #Now plot the min and max values of vx for each size of the square + #plot([5 10 20 40 80 160], minvx)ylim([0 18]) if printingflag: pass # set(gcf, 'Color', 'w') # printmodel('ismipaFSminvx', 'png', 'margin', 'on', 'marginsize', 25, 'frame', 'off', 'resolution', 1.5, 'hardcopy', 'off') -# shutil.move('ismipaFSminvx.png', ISSM_DIR+'/website/doc_pdf/validation/Images/ISMIP/TestA') +# shutil.move('ismipaFSminvx.png', ISSM_DIR + '/website/doc_pdf/validation/Images/ISMIP/TestA') #plot([5 10 20 40 80 160], maxvx)ylim([0 120]) if printingflag: @@ -123,5 +123,5 @@ # set(gcf, 'Color', 'w') # printmodel('ismipaFSmaxvx', 'png', 'margin', 'on', 'marginsize', 25, 'frame', 'off', 'resolution', 1.5, 'hardcopy', 'off') -# shutil.move('ismipaFSmaxvx.png', ISSM_DIR+'/website/doc_pdf/validation/Images/ISMIP/TestA') +# shutil.move('ismipaFSmaxvx.png', ISSM_DIR + '/website/doc_pdf/validation/Images/ISMIP/TestA') #Fields and tolerances to track changes Index: /issm/trunk-jpl/test/NightlyRun/test1103.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1103.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test1103.py (revision 24214) @@ -10,5 +10,5 @@ """ -This test is a test from the ISMP-HOM Intercomparison project. +This test is a test from the ISMP - HOM Intercomparison project. Pattyn and Payne 2006 """ @@ -22,9 +22,9 @@ for L in L_list: - nx = 20 #numberof nodes in x direction + nx = 20 #numberof nodes in x direction ny = 20 md = model() md = squaremesh(md, L, L, nx, ny) - md = setmask(md, '', '') #ice sheet test + md = setmask(md, '', '') #ice sheet test md = parameterize(md, '../Par/ISMIPB.py') md.extrude(10, 1.) @@ -32,5 +32,5 @@ md = setflowequation(md, 'HO', 'all') - #Create dirichlet on the bed only +#Create dirichlet on the bed only md.stressbalance.spcvx = np.nan * np.ones((md.mesh.numberofvertices)) md.stressbalance.spcvy = np.nan * np.ones((md.mesh.numberofvertices)) @@ -40,18 +40,18 @@ md.stressbalance.spcvy[pos] = 0. - #Create MPCs to have periodic boundary conditions +#Create MPCs to have periodic boundary conditions posx = np.where(md.mesh.x == 0.)[0] posx2 = np.where(md.mesh.x == np.max(md.mesh.x))[0] - posy = np.where(np.logical_and.reduce((md.mesh.y == 0., md.mesh.x != 0., md.mesh.x != np.max(md.mesh.x))))[0] #Don't take the same nodes two times + posy = np.where(np.logical_and.reduce((md.mesh.y == 0., md.mesh.x != 0., md.mesh.x != np.max(md.mesh.x))))[0] #Don't take the same nodes two times posy2 = np.where(np.logical_and.reduce((md.mesh.y == np.max(md.mesh.y), md.mesh.x != 0., md.mesh.x != np.max(md.mesh.x))))[0] md.stressbalance.vertex_pairing = np.vstack((np.vstack((posx + 1, posx2 + 1)).T, np.vstack((posy + 1, posy2 + 1)).T)) - #Compute the stressbalance +#Compute the stressbalance md.cluster = generic('name', gethostname(), 'np', 8) md = solve(md, 'Stressbalance') - #Plot the results and save them +#Plot the results and save them vx = md.results.StressbalanceSolution.Vx vy = md.results.StressbalanceSolution.Vy @@ -61,47 +61,47 @@ maxvx.append(np.max(vx[md.mesh.numberofvertices2d:])) - #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') +#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') if printingflag: pass # set(gcf, 'Color', 'w') # 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') +# 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') if printingflag: pass # set(gcf, 'Color', 'w') # printmodel(['ismipbHOvz' num2str(L)], 'png', 'margin', 'on', 'marginsize', 25, 'frame', 'off', 'resolution', 1.5, 'hardcopy', 'off') -# shutil.move("ismipbHOvz%d.png" % L, ISSM_DIR+'/website/doc_pdf/validation/Images/ISMIP/TestB') +# shutil.move("ismipbHOvz%d.png" % L, ISSM_DIR + '/website/doc_pdf/validation/Images/ISMIP/TestB') if (L == 5000.): pass -# plotmodel(md, 'data', vx, 'sectionvalue', '../Exp/ISMIP5000.exp', 'layer', md.mesh.numberoflayers,... -# 'resolution',[10 10], 'ylim',[6 16], 'xlim',[0 5000], 'title', '', 'xlabel', '') +# plotmodel(md, 'data', vx, 'sectionvalue', '../Exp/ISMIP5000.exp', 'layer', md.mesh.numberoflayers, ... +# 'resolution', [10 10], 'ylim', [6 16], 'xlim', [0 5000], 'title', '', 'xlabel', '') elif (L == 10000.): pass -# plotmodel(md, 'data', vx, 'sectionvalue', '../Exp/ISMIP10000.exp', 'layer', md.mesh.numberoflayers,... -# 'resolution',[10 10], 'ylim',[0 40], 'xlim',[0 10000], 'title', '', 'xlabel', '') +# plotmodel(md, 'data', vx, 'sectionvalue', '../Exp/ISMIP10000.exp', 'layer', md.mesh.numberoflayers, ... +# 'resolution', [10 10], 'ylim', [0 40], 'xlim', [0 10000], 'title', '', 'xlabel', '') elif (L == 20000.): pass -# plotmodel(md, 'data', vx, 'sectionvalue', '../Exp/ISMIP20000.exp', 'layer', md.mesh.numberoflayers,... -# 'resolution',[10 10], 'ylim',[0 60], 'xlim',[0 20000], 'title', '', 'xlabel', '') +# plotmodel(md, 'data', vx, 'sectionvalue', '../Exp/ISMIP20000.exp', 'layer', md.mesh.numberoflayers, ... +# 'resolution', [10 10], 'ylim', [0 60], 'xlim', [0 20000], 'title', '', 'xlabel', '') elif (L == 40000.): pass -# plotmodel(md, 'data', vx, 'sectionvalue', '../Exp/ISMIP40000.exp', 'layer', md.mesh.numberoflayers,... -# 'resolution',[10 10], 'ylim',[0 100], 'xlim',[0 40000], 'title', '', 'xlabel', '') +# plotmodel(md, 'data', vx, 'sectionvalue', '../Exp/ISMIP40000.exp', 'layer', md.mesh.numberoflayers, ... +# 'resolution', [10 10], 'ylim', [0 100], 'xlim', [0 40000], 'title', '', 'xlabel', '') elif (L == 80000.): pass -# plotmodel(md, 'data', vx, 'sectionvalue', '../Exp/ISMIP80000.exp', 'layer', md.mesh.numberoflayers,... -# 'resolution',[10 10], 'ylim',[0 120], 'xlim',[0 80000], 'title', '', 'xlabel', '') +# plotmodel(md, 'data', vx, 'sectionvalue', '../Exp/ISMIP80000.exp', 'layer', md.mesh.numberoflayers, ... +# 'resolution', [10 10], 'ylim', [0 120], 'xlim', [0 80000], 'title', '', 'xlabel', '') elif (L == 160000.): pass -# plotmodel(md, 'data', vx, 'sectionvalue', '../Exp/ISMIP160000.exp', 'layer', md.mesh.numberoflayers,... -# 'resolution',[10 10], 'ylim',[0 120], 'xlim',[0 160000], 'title', '', 'xlabel', '') +# plotmodel(md, 'data', vx, 'sectionvalue', '../Exp/ISMIP160000.exp', 'layer', md.mesh.numberoflayers, ... +# 'resolution', [10 10], 'ylim', [0 120], 'xlim', [0 160000], 'title', '', 'xlabel', '') if printingflag: pass # set(gcf, 'Color', 'w') # printmodel(['ismipbHOvxsec' num2str(L)], 'png', 'margin', 'on', 'marginsize', 25, 'frame', 'off', 'resolution', 1.5, 'hardcopy', 'off') -# shutil.move("ismipbHOvxsec%d.png" % L, ISSM_DIR+'/website/doc_pdf/validation/Images/ISMIP/TestB') +# shutil.move("ismipbHOvxsec%d.png" % L, ISSM_DIR + '/website/doc_pdf/validation/Images/ISMIP/TestB') #Now plot the min and max values of vx for each size of the square @@ -111,5 +111,5 @@ # set(gcf, 'Color', 'w') # printmodel('ismipbHOminvx', 'png', 'margin', 'on', 'marginsize', 25, 'frame', 'off', 'resolution', 1.5, 'hardcopy', 'off') -# shutil.move('ismipbHOminvx.png', ISSM_DIR+'/website/doc_pdf/validation/Images/ISMIP/TestB') +# shutil.move('ismipbHOminvx.png', ISSM_DIR + '/website/doc_pdf/validation/Images/ISMIP/TestB') #plot([5 10 20 40 80 160], maxvx)ylim([0 120])xlim([0 160]) if printingflag: @@ -117,5 +117,5 @@ # set(gcf, 'Color', 'w') # printmodel('ismipbHOmaxvx', 'png', 'margin', 'on', 'marginsize', 25, 'frame', 'off', 'resolution', 1.5, 'hardcopy', 'off') -# shutil.move('ismipbHOmaxvx.png', ISSM_DIR+'/website/doc_pdf/validation/Images/ISMIP/TestB') +# shutil.move('ismipbHOmaxvx.png', ISSM_DIR + '/website/doc_pdf/validation/Images/ISMIP/TestB') #Fields and tolerances to track changes Index: /issm/trunk-jpl/test/NightlyRun/test1104.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1104.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test1104.py (revision 24214) @@ -10,5 +10,5 @@ """ -This test is a test from the ISMP-HOM Intercomparison project. +This test is a test from the ISMP - HOM Intercomparison project. Pattyn and Payne 2006 """ @@ -18,14 +18,14 @@ for L in L_list: - nx = 20 #numberof nodes in x direction + nx = 20 #numberof nodes in x direction ny = 20 md = model() md = squaremesh(md, L, L, nx, ny) - md = setmask(md, '', '') #ice sheet test + md = setmask(md, '', '') #ice sheet test md = parameterize(md, '../Par/ISMIPB.py') md.extrude(10, 1.) md = setflowequation(md, 'HO', 'all') - #Create dirichlet on the bed only +#Create dirichlet on the bed only md.stressbalance.spcvx = np.nan * np.ones((md.mesh.numberofvertices)) md.stressbalance.spcvy = np.nan * np.ones((md.mesh.numberofvertices)) @@ -36,14 +36,14 @@ md.stressbalance.spcvy[pos] = 0. - #Create MPCs to have periodic boundary conditions +#Create MPCs to have periodic boundary conditions posx = np.where(md.mesh.x == 0.)[0] posx2 = np.where(md.mesh.x == np.max(md.mesh.x))[0] - posy = np.where(np.logical_and.reduce((md.mesh.y == 0., md.mesh.x != 0., md.mesh.x != np.max(md.mesh.x))))[0] #Don't take the same nodes two times + posy = np.where(np.logical_and.reduce((md.mesh.y == 0., md.mesh.x != 0., md.mesh.x != np.max(md.mesh.x))))[0] #Don't take the same nodes two times posy2 = np.where(np.logical_and.reduce((md.mesh.y == np.max(md.mesh.y), md.mesh.x != 0., md.mesh.x != np.max(md.mesh.x))))[0] md.stressbalance.vertex_pairing = np.vstack((np.vstack((posx + 1, posx2 + 1)).T, np.vstack((posy + 1, posy2 + 1)).T)) print(np.shape(md.stressbalance.vertex_pairing)) - #Compute the stressbalance +#Compute the stressbalance md.stressbalance.abstol = np.nan md.cluster = generic('name', gethostname(), 'np', 8) @@ -56,5 +56,5 @@ md = solve(md, 'Stressbalance') - #Plot the results and save them +#Plot the results and save them vx = md.results.StressbalanceSolution.Vx vy = md.results.StressbalanceSolution.Vy @@ -62,5 +62,5 @@ results.append(md.results.StressbalanceSolution) -# plotmodel(md, 'data', vx, 'data', vy, 'data', vz, 'layer#all', md.mesh.numberoflayers) +# plotmodel(md, 'data', vx, 'data', vy, 'data', vz, 'layer #all', md.mesh.numberoflayers) #Fields and tolerances to track changes Index: /issm/trunk-jpl/test/NightlyRun/test1105.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1105.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test1105.py (revision 24214) @@ -10,5 +10,5 @@ """ -This test is a test from the ISMP-HOM Intercomparison project. +This test is a test from the ISMP - HOM Intercomparison project. Pattyn and Payne 2006 """ @@ -21,10 +21,10 @@ maxvx = [] -for L in L_list: #in m (3 times the desired length for BC problems) - nx = 30 #number of nodes in x direction +for L in L_list: #in m (3 times the desired length for BC problems) + nx = 30 #number of nodes in x direction ny = 30 md = model() md = squaremesh(md, L, L, nx, ny) - md = setmask(md, '', '') #ice sheet test + md = setmask(md, '', '') #ice sheet test md = parameterize(md, '../Par/ISMIPC.py') md.extrude(10, 1.) @@ -32,5 +32,5 @@ md = setflowequation(md, 'HO', 'all') - #Create MPCs to have periodic boundary conditions +#Create MPCs to have periodic boundary conditions md.stressbalance.spcvx = np.nan * np.ones((md.mesh.numberofvertices)) md.stressbalance.spcvy = np.nan * np.ones((md.mesh.numberofvertices)) @@ -40,10 +40,10 @@ posx2 = np.where(np.logical_and.reduce((md.mesh.x == L, md.mesh.y != 0., md.mesh.y != L)))[0] - posy = np.where(np.logical_and.reduce((md.mesh.y == 0., md.mesh.x != 0., md.mesh.x != L)))[0] #Don't take the same nodes two times + posy = np.where(np.logical_and.reduce((md.mesh.y == 0., md.mesh.x != 0., md.mesh.x != L)))[0] #Don't take the same nodes two times posy2 = np.where(np.logical_and.reduce((md.mesh.y == L, md.mesh.x != 0., md.mesh.x != L)))[0] md.stressbalance.vertex_pairing = np.vstack((np.vstack((posx + 1, posx2 + 1)).T, np.vstack((posy + 1, posy2 + 1)).T)) - #Add spc on the corners +#Add spc on the corners pos = np.where(np.logical_and.reduce((np.logical_or(md.mesh.x == 0., md.mesh.x == L), np.logical_or(md.mesh.y == 0., md.mesh.y == L), md.mesh.vertexonbase))) md.stressbalance.spcvx[pos] = 0. @@ -51,30 +51,30 @@ 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 +#Spc the bed at zero for vz pos = np.where(md.mesh.vertexonbase) md.stressbalance.spcvz[pos] = 0. - #Compute the stressbalance +#Compute the stressbalance md.cluster = generic('name', gethostname(), 'np', 8) md = solve(md, 'Stressbalance') - #Plot the results and save them +#Plot the results and save them vx = md.results.StressbalanceSolution.Vx vy = md.results.StressbalanceSolution.Vy @@ -84,53 +84,53 @@ maxvx.append(np.max(vx[-md.mesh.numberofvertices2d:])) - #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) +#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) if printingflag: pass # set(gcf, 'Color', 'w') # 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) +# 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) if printingflag: pass # set(gcf, 'Color', 'w') # 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) +# 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) if printingflag: pass # set(gcf, 'Color', 'w') # printmodel(['ismipcHOvz' num2str(L)], 'png', 'margin', 'on', 'marginsize', 25, 'frame', 'off', 'resolution', 1.5, 'hardcopy', 'off') -# shutil.move("ismipcHOvz%d.png" % L, ISSM_DIR+'/website/doc_pdf/validation/Images/ISMIP/TestC') +# shutil.move("ismipcHOvz%d.png" % L, ISSM_DIR + '/website/doc_pdf/validation/Images/ISMIP/TestC') if (L == 5000.): pass -# plotmodel(md, 'data', vx, 'sectionvalue', '../Exp/ISMIP5000.exp', 'layer', md.mesh.numberoflayers,... -# 'resolution',[10 10], 'ylim',[0 20], 'xlim',[0 5000], 'title', '', 'xlabel', '', 'figure', 5) +# plotmodel(md, 'data', vx, 'sectionvalue', '../Exp/ISMIP5000.exp', 'layer', md.mesh.numberoflayers, ... +# 'resolution', [10 10], 'ylim', [0 20], 'xlim', [0 5000], 'title', '', 'xlabel', '', 'figure', 5) elif (L == 10000.): pass -# plotmodel(md, 'data', vx, 'sectionvalue', '../Exp/ISMIP10000.exp', 'layer', md.mesh.numberoflayers,... -# 'resolution',[10 10], 'ylim',[13 18], 'xlim',[0 10000], 'title', '', 'xlabel', '') +# plotmodel(md, 'data', vx, 'sectionvalue', '../Exp/ISMIP10000.exp', 'layer', md.mesh.numberoflayers, ... +# 'resolution', [10 10], 'ylim', [13 18], 'xlim', [0 10000], 'title', '', 'xlabel', '') elif (L == 20000.): pass -# plotmodel(md, 'data', vx, 'sectionvalue', '../Exp/ISMIP20000.exp', 'layer', md.mesh.numberoflayers,... -# 'resolution',[10 10], 'ylim',[14 22], 'xlim',[0 20000], 'title', '', 'xlabel', '') +# plotmodel(md, 'data', vx, 'sectionvalue', '../Exp/ISMIP20000.exp', 'layer', md.mesh.numberoflayers, ... +# 'resolution', [10 10], 'ylim', [14 22], 'xlim', [0 20000], 'title', '', 'xlabel', '') elif (L == 40000.): pass -# plotmodel(md, 'data', vx, 'sectionvalue', '../Exp/ISMIP40000.exp', 'layer', md.mesh.numberoflayers,... -# 'resolution',[10 10], 'ylim',[10 40], 'xlim',[0 40000], 'title', '', 'xlabel', '') +# plotmodel(md, 'data', vx, 'sectionvalue', '../Exp/ISMIP40000.exp', 'layer', md.mesh.numberoflayers, ... +# 'resolution', [10 10], 'ylim', [10 40], 'xlim', [0 40000], 'title', '', 'xlabel', '') elif (L == 80000.): pass -# plotmodel(md, 'data', vx, 'sectionvalue', '../Exp/ISMIP80000.exp', 'layer', md.mesh.numberoflayers,... -# 'resolution',[10 10], 'ylim',[0 80], 'xlim',[0 80000], 'title', '', 'xlabel', '') +# plotmodel(md, 'data', vx, 'sectionvalue', '../Exp/ISMIP80000.exp', 'layer', md.mesh.numberoflayers, ... +# 'resolution', [10 10], 'ylim', [0 80], 'xlim', [0 80000], 'title', '', 'xlabel', '') elif (L == 160000.): pass -# plotmodel(md, 'data', vx, 'sectionvalue', '../Exp/ISMIP160000.exp', 'layer', md.mesh.numberoflayers,... -# 'resolution',[10 10], 'ylim',[0 200], 'xlim',[0 160000], 'title', '', 'xlabel', '') +# plotmodel(md, 'data', vx, 'sectionvalue', '../Exp/ISMIP160000.exp', 'layer', md.mesh.numberoflayers, ... +# 'resolution', [10 10], 'ylim', [0 200], 'xlim', [0 160000], 'title', '', 'xlabel', '') if printingflag: pass # set(gcf, 'Color', 'w') # printmodel(['ismipcHOvxsec' num2str(L)], 'png', 'margin', 'on', 'marginsize', 25, 'frame', 'off', 'resolution', 1.5, 'hardcopy', 'off') -# shutil.move("ismipcHOvxsec%d.png" % L, ISSM_DIR+'/website/doc_pdf/validation/Images/ISMIP/TestC') +# shutil.move("ismipcHOvxsec%d.png" % L, ISSM_DIR + '/website/doc_pdf/validation/Images/ISMIP/TestC') #Now plot the min and max values of vx for each size of the square @@ -140,5 +140,5 @@ # set(gcf, 'Color', 'w') # printmodel('ismipcHOminvx', 'png', 'margin', 'on', 'marginsize', 25, 'frame', 'off', 'resolution', 1.5, 'hardcopy', 'off') -# shutil.move('ismipcHOminvx.png', ISSM_DIR+'/website/doc_pdf/validation/Images/ISMIP/TestC') +# shutil.move('ismipcHOminvx.png', ISSM_DIR + '/website/doc_pdf/validation/Images/ISMIP/TestC') #plot([5 10 20 40 80 160], maxvx)ylim([0 200]) xlim([0 160]) if printingflag: @@ -146,5 +146,5 @@ # set(gcf, 'Color', 'w') # printmodel('ismipcHOmaxvx', 'png', 'margin', 'on', 'marginsize', 25, 'frame', 'off', 'resolution', 1.5, 'hardcopy', 'off') -# shutil.move('ismipcHOmaxvx.png', ISSM_DIR+'/website/doc_pdf/validation/Images/ISMIP/TestC') +# shutil.move('ismipcHOmaxvx.png', ISSM_DIR + '/website/doc_pdf/validation/Images/ISMIP/TestC') #Fields and tolerances to track changes Index: /issm/trunk-jpl/test/NightlyRun/test1106.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1106.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test1106.py (revision 24214) @@ -10,19 +10,19 @@ """ -This test is a test from the ISMP-HOM Intercomparison project. +This test is a test from the ISMP - HOM Intercomparison project. Pattyn and Payne 2006 """ -L_list = [80000.] +L_list = [80000] results = [] for L in L_list: - md = triangle(model(), "../Exp/Square_{}.exp".format(L), L / 10.) #size 3*L - md = setmask(md, '', '') #ice sheet test + md = triangle(model(), "../Exp/Square_{}.exp".format(L), L / 10.) #size 3 * L + md = setmask(md, '', '') #ice sheet test md = parameterize(md, '../Par/ISMIPC.py') md.friction.coefficient = np.sqrt(md.constants.yts * (1000. + 1000. * np.sin(md.mesh.x * 2. * np.pi / L) * np.sin(md.mesh.y * 2. * np.pi / L))) md.extrude(10, 1.) - #Add spc on the borders +#Add spc on the borders pos = np.where(np.logical_or.reduce((md.mesh.x == 0., md.mesh.x == np.max(md.mesh.x), md.mesh.y == 0., md.mesh.y == np.max(md.mesh.y)))) md.stressbalance.spcvx[pos] = 0. @@ -30,28 +30,28 @@ 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') - #Compute the stressbalance +#Compute the stressbalance md.cluster = generic('name', gethostname(), 'np', 8) md = solve(md, 'Stressbalance') - #Plot the results and save them +#Plot the results and save them vx = md.results.StressbalanceSolution.Vx vy = md.results.StressbalanceSolution.Vy @@ -59,5 +59,5 @@ results.append(md.results.StressbalanceSolution) -# plotmodel(md, 'data', vx, 'data', vy, 'data', vz, 'layer#all', md.mesh.numberoflayers) +# plotmodel(md, 'data', vx, 'data', vy, 'data', vz, 'layer #all', md.mesh.numberoflayers) #Fields and tolerances to track changes Index: /issm/trunk-jpl/test/NightlyRun/test1107.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1107.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test1107.py (revision 24214) @@ -10,5 +10,5 @@ """ -This test is a test from the ISMP-HOM Intercomparison project. +This test is a test from the ISMP - HOM Intercomparison project. Pattyn and Payne 2006 """ @@ -22,9 +22,9 @@ for L in L_list: - nx = 30 #numberof nodes in x direction + nx = 30 #numberof nodes in x direction ny = 30 md = model() md = squaremesh(md, L, L, nx, ny) - md = setmask(md, '', '') #ice sheet test + md = setmask(md, '', '') #ice sheet test md = parameterize(md, '../Par/ISMIPD.py') md.extrude(10, 1.) @@ -32,10 +32,10 @@ md = setflowequation(md, 'HO', 'all') - #We need one grd on dirichlet: the 4 corners are set to zero +#We need one grd on dirichlet: the 4 corners are set to zero md.stressbalance.spcvx = np.nan * np.ones((md.mesh.numberofvertices)) md.stressbalance.spcvy = np.nan * np.ones((md.mesh.numberofvertices)) md.stressbalance.spcvz = np.nan * np.ones((md.mesh.numberofvertices)) - #Create MPCs to have periodic boundary conditions +#Create MPCs to have periodic boundary conditions # posx = find(md.mesh.x = 0. & ~(md.mesh.y = 0. & md.mesh.vertexonbase) & ~(md.mesh.y = L & md.mesh.vertexonbase)) posx = np.where(np.logical_and.reduce((md.mesh.x == 0., np.logical_not(np.logical_and(md.mesh.y == 0., md.mesh.vertexonbase)), np.logical_not(np.logical_and(md.mesh.y == L, md.mesh.vertexonbase)))))[0] @@ -43,10 +43,10 @@ posx2 = np.where(np.logical_and.reduce((md.mesh.x == np.max(md.mesh.x), np.logical_not(np.logical_and(md.mesh.y == 0., md.mesh.vertexonbase)), np.logical_not(np.logical_and(md.mesh.y == L, md.mesh.vertexonbase)))))[0] - posy = np.where(np.logical_and.reduce((md.mesh.y == 0., md.mesh.x != 0., md.mesh.x != np.max(md.mesh.x))))[0] #Don't take the same nodes two times + posy = np.where(np.logical_and.reduce((md.mesh.y == 0., md.mesh.x != 0., md.mesh.x != np.max(md.mesh.x))))[0] #Don't take the same nodes two times posy2 = np.where(np.logical_and.reduce((md.mesh.y == np.max(md.mesh.y), md.mesh.x != 0., md.mesh.x != np.max(md.mesh.x))))[0] md.stressbalance.vertex_pairing = np.vstack((np.vstack((posx + 1, posx2 + 1)).T, np.vstack((posy + 1, posy2 + 1)).T)) - #Add spc on the corners +#Add spc on the corners pos = np.where(np.logical_and.reduce((np.logical_or(md.mesh.x == 0., md.mesh.x == L), np.logical_or(md.mesh.y == 0., md.mesh.y == L), md.mesh.vertexonbase))) md.stressbalance.spcvy[:] = 0. @@ -65,13 +65,13 @@ md.stressbalance.spcvx[pos] = 16.91 - #Spc the bed at zero for vz +#Spc the bed at zero for vz pos = np.where(md.mesh.vertexonbase) md.stressbalance.spcvz[pos] = 0. - #Compute the stressbalance +#Compute the stressbalance md.cluster = generic('name', gethostname(), 'np', 8) md = solve(md, 'Stressbalance') - #Plot the results and save them +#Plot the results and save them vx = md.results.StressbalanceSolution.Vx vy = md.results.StressbalanceSolution.Vy @@ -81,47 +81,47 @@ maxvx.append(np.max(vx[-md.mesh.numberofvertices2d:])) - #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) +#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) if printingflag: pass # set(gcf, 'Color', 'w') # 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) +# 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) if printingflag: pass # set(gcf, 'Color', 'w') # printmodel(['ismipdHOvz' num2str(L)], 'png', 'margin', 'on', 'marginsize', 25, 'frame', 'off', 'resolution', 1.5, 'hardcopy', 'off') -# shutil.move("ismipdHOvz%d.png" % L, ISSM_DIR+'/website/doc_pdf/validation/Images/ISMIP/TestD') +# shutil.move("ismipdHOvz%d.png" % L, ISSM_DIR + '/website/doc_pdf/validation/Images/ISMIP/TestD') if (L == 5000.): pass -# plotmodel(md, 'data', vx, 'sectionvalue', '../Exp/ISMIP5000.exp', 'layer', md.mesh.numberoflayers,... -# 'resolution',[10 10], 'ylim',[0 20], 'xlim',[0 5000], 'title', '', 'xlabel', '', 'figure', 4) +# plotmodel(md, 'data', vx, 'sectionvalue', '../Exp/ISMIP5000.exp', 'layer', md.mesh.numberoflayers, ... +# 'resolution', [10 10], 'ylim', [0 20], 'xlim', [0 5000], 'title', '', 'xlabel', '', 'figure', 4) elif (L == 10000.): pass -# plotmodel(md, 'data', vx, 'sectionvalue', '../Exp/ISMIP10000.exp', 'layer', md.mesh.numberoflayers,... -# 'resolution',[10 10], 'ylim',[0 20], 'xlim',[0 10000], 'title', '', 'xlabel', '', 'figure', 4) +# plotmodel(md, 'data', vx, 'sectionvalue', '../Exp/ISMIP10000.exp', 'layer', md.mesh.numberoflayers, ... +# 'resolution', [10 10], 'ylim', [0 20], 'xlim', [0 10000], 'title', '', 'xlabel', '', 'figure', 4) elif (L == 20000.): pass -# plotmodel(md, 'data', vx, 'sectionvalue', '../Exp/ISMIP20000.exp', 'layer', md.mesh.numberoflayers,... -# 'resolution',[10 10], 'ylim',[0 30], 'xlim',[0 20000], 'title', '', 'xlabel', '', 'figure', 4) +# plotmodel(md, 'data', vx, 'sectionvalue', '../Exp/ISMIP20000.exp', 'layer', md.mesh.numberoflayers, ... +# 'resolution', [10 10], 'ylim', [0 30], 'xlim', [0 20000], 'title', '', 'xlabel', '', 'figure', 4) elif (L == 40000.): pass -# plotmodel(md, 'data', vx, 'sectionvalue', '../Exp/ISMIP40000.exp', 'layer', md.mesh.numberoflayers,... -# 'resolution',[10 10], 'ylim',[10 60], 'xlim',[0 40000], 'title', '', 'xlabel', '', 'figure', 4) +# plotmodel(md, 'data', vx, 'sectionvalue', '../Exp/ISMIP40000.exp', 'layer', md.mesh.numberoflayers, ... +# 'resolution', [10 10], 'ylim', [10 60], 'xlim', [0 40000], 'title', '', 'xlabel', '', 'figure', 4) elif (L == 80000.): pass -# plotmodel(md, 'data', vx, 'sectionvalue', '../Exp/ISMIP80000.exp', 'layer', md.mesh.numberoflayers,... -# 'resolution',[10 10], 'ylim',[0 200], 'xlim',[0 80000], 'title', '', 'xlabel', '', 'figure', 4) +# plotmodel(md, 'data', vx, 'sectionvalue', '../Exp/ISMIP80000.exp', 'layer', md.mesh.numberoflayers, ... +# 'resolution', [10 10], 'ylim', [0 200], 'xlim', [0 80000], 'title', '', 'xlabel', '', 'figure', 4) elif (L == 160000.): pass -# plotmodel(md, 'data', vx, 'sectionvalue', '../Exp/ISMIP160000.exp', 'layer', md.mesh.numberoflayers,... -# 'resolution',[10 10], 'ylim',[0 400], 'xlim',[0 160000], 'title', '', 'xlabel', '', 'figure', 4) +# plotmodel(md, 'data', vx, 'sectionvalue', '../Exp/ISMIP160000.exp', 'layer', md.mesh.numberoflayers, ... +# 'resolution', [10 10], 'ylim', [0 400], 'xlim', [0 160000], 'title', '', 'xlabel', '', 'figure', 4) if printingflag: pass # set(gcf, 'Color', 'w') # printmodel(['ismipdHOvxsec' num2str(L)], 'png', 'margin', 'on', 'marginsize', 25, 'frame', 'off', 'resolution', 1.5, 'hardcopy', 'off') -# shutil.move("ismipdHOvxsec%d.png" % L, ISSM_DIR+'/website/doc_pdf/validation/Images/ISMIP/TestD') +# shutil.move("ismipdHOvxsec%d.png" % L, ISSM_DIR + '/website/doc_pdf/validation/Images/ISMIP/TestD') #Now plot the min and max values of vx for each size of the square @@ -131,5 +131,5 @@ # set(gcf, 'Color', 'w') # printmodel('ismipdHOminvx', 'png', 'margin', 'on', 'marginsize', 25, 'frame', 'off', 'resolution', 1.5, 'hardcopy', 'off') -# shutil.move('ismipdHOminvx.png', ISSM_DIR+'/website/doc_pdf/validation/Images/ISMIP/TestD') +# shutil.move('ismipdHOminvx.png', ISSM_DIR + '/website/doc_pdf/validation/Images/ISMIP/TestD') #plot([5 10 20 40 80 160], maxvx)ylim([0 300])xlim([0 160]) if printingflag: @@ -137,5 +137,5 @@ # set(gcf, 'Color', 'w') # printmodel('ismipdHOmaxvx', 'png', 'margin', 'on', 'marginsize', 25, 'frame', 'off', 'resolution', 1.5, 'hardcopy', 'off') -# shutil.move('ismipdHOmaxvx.png', ISSM_DIR+'/website/doc_pdf/validation/Images/ISMIP/TestD') +# shutil.move('ismipdHOmaxvx.png', ISSM_DIR + '/website/doc_pdf/validation/Images/ISMIP/TestD') #Fields and tolerances to track changes Index: /issm/trunk-jpl/test/NightlyRun/test1108.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1108.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test1108.py (revision 24214) @@ -13,5 +13,5 @@ """ -This test is a test from the ISMP-HOM Intercomparison project. +This test is a test from the ISMP - HOM Intercomparison project. Pattyn and Payne 2006 """ @@ -22,9 +22,9 @@ for L in L_list: - nx = 30 #numberof nodes in x direction + nx = 30 #numberof nodes in x direction ny = 30 md = model() md = squaremesh(md, L, L, nx, ny) - md = setmask(md, '', '') #ice sheet test + md = setmask(md, '', '') #ice sheet test md = parameterize(md, '../Par/ISMIPD.py') md.extrude(10, 1.) @@ -32,5 +32,5 @@ md = setflowequation(md, 'HO', 'all') - #We need one grd on dirichlet: the 4 corners are set to zero +#We need one grd on dirichlet: the 4 corners are set to zero md.stressbalance.spcvx = np.nan * np.ones((md.mesh.numberofvertices)) md.stressbalance.spcvy = np.nan * np.ones((md.mesh.numberofvertices)) @@ -48,14 +48,14 @@ md.stressbalance.spcvz[pos] = 0. - #Create MPCs to have periodic boundary conditions +#Create MPCs to have periodic boundary conditions posx = np.nonzero(md.mesh.x == 0.)[0] posx2 = np.nonzero(md.mesh.x == np.max(md.mesh.x))[0] - posy = np.intersect1d(np.intersect1d(np.where(md.mesh.y == 0.), np.where(md.mesh.x != 0.)), np.where(md.mesh.x != np.max(md.mesh.x)))[0] #Don't take the same nodes two times + posy = np.intersect1d(np.intersect1d(np.where(md.mesh.y == 0.), np.where(md.mesh.x != 0.)), np.where(md.mesh.x != np.max(md.mesh.x)))[0] #Don't take the same nodes two times posy2 = np.intersect1d(np.intersect1d(np.where(md.mesh.y == np.max(md.mesh.y)), np.where(md.mesh.x != 0.)), np.where(md.mesh.x != np.max(md.mesh.x)))[0] - md.stressbalance.vertex_pairing = np.vstack((np.hstack((posx.reshape(-1, 1) + 1, posx2.reshape(-1, 1) + 1)), np.hstack((posy.reshape(-1, 1) + 1, posy2.reshape(-1, 1) + 1)))) + md.stressbalance.vertex_pairing = np.vstack((np.hstack((posx.reshape(- 1, 1) + 1, posx2.reshape(- 1, 1) + 1)), np.hstack((posy.reshape(- 1, 1) + 1, posy2.reshape(- 1, 1) + 1)))) - #Compute the stressbalance +#Compute the stressbalance md.cluster = generic('name', gethostname(), 'np', 8) md.verbose = verbose('convergence', True) @@ -64,15 +64,15 @@ md.stressbalance.abstol = np.nan md.stressbalance.vertex_pairing = np.empty((0, 2)) - #We need one grid on dirichlet: the 4 corners are set to zero +#We need one grid on dirichlet: the 4 corners are set to zero md.stressbalance.spcvx = np.nan * np.ones((md.mesh.numberofvertices)) md.stressbalance.spcvy = np.nan * np.ones((md.mesh.numberofvertices)) md.stressbalance.spcvz = np.nan * np.ones((md.mesh.numberofvertices)) - pos = np.nonzero(logical_or.reduce_n(md.mesh.y == 0., md.mesh.x == 0., md.mesh.x == np.max(md.mesh.x), md.mesh.y == np.max(md.mesh.y))) #Don't take the same nodes two times - md.stressbalance.spcvx[pos] = md.results.StressbalanceSolution.Vx[pos] - md.stressbalance.spcvy[pos] = md.results.StressbalanceSolution.Vy[pos] + pos = np.nonzero(np.logical_or.reduce((md.mesh.y == 0., md.mesh.x == 0., md.mesh.x == np.max(md.mesh.x), md.mesh.y == np.max(md.mesh.y)))) #Don't take the same nodes two times + md.stressbalance.spcvx[pos] = np.squeeze(md.results.StressbalanceSolution.Vx[pos]) + md.stressbalance.spcvy[pos] = np.squeeze(md.results.StressbalanceSolution.Vy[pos]) md = setflowequation(md, 'FS', 'all') md = solve(md, 'Stressbalance') - #Plot the results and save them +#Plot the results and save them vx = md.results.StressbalanceSolution.Vx vy = md.results.StressbalanceSolution.Vy @@ -80,5 +80,5 @@ results.append(md.results.StressbalanceSolution) -# plotmodel(md, 'data', vx, 'data', vy, 'data', vz, 'layer#all', md.mesh.numberoflayers) +# plotmodel(md, 'data', vx, 'data', vy, 'data', vz, 'layer #all', md.mesh.numberoflayers) #Fields and tolerances to track changes Index: /issm/trunk-jpl/test/NightlyRun/test1109.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1109.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test1109.py (revision 24214) @@ -10,10 +10,10 @@ from squaremesh import * -#This test is a test from the ISMP-HOM Intercomparison project. +#This test is a test from the ISMP - HOM Intercomparison project. #TestE #Four tests to run: - Pattyn frozen -# - Stokes frozen -# - Pattyn with some sliding -# - Stokes with some sliding +# - Stokes frozen +# - Pattyn with some sliding +# - Stokes with some sliding printingflag = False results = [] @@ -35,19 +35,19 @@ md = setflowequation(md, 'FS', 'all') - #Create MPCs to have periodic boundary conditions +#Create MPCs to have periodic boundary conditions posx = np.where(md.mesh.x == 0.)[0] posx2 = np.where(md.mesh.x == max(md.mesh.x))[0] md.stressbalance.vertex_pairing = np.column_stack((posx, posx2)) - #Create spcs on the bed +#Create spcs on the bed pos = np.where(md.mesh.vertexonbase)[0] - md.stressbalance.spcvx = float('NaN') * np.ones((md.mesh.numberofvertices,)) - md.stressbalance.spcvy = float('NaN') * np.ones((md.mesh.numberofvertices,)) - md.stressbalance.spcvz = float('NaN') * np.ones((md.mesh.numberofvertices,)) + md.stressbalance.spcvx = float('NaN') * np.ones((md.mesh.numberofvertices, )) + md.stressbalance.spcvy = float('NaN') * np.ones((md.mesh.numberofvertices, )) + md.stressbalance.spcvz = float('NaN') * np.ones((md.mesh.numberofvertices, )) md.stressbalance.spcvx[pos] = 0. md.stressbalance.spcvy[pos] = 0. md.stressbalance.spcvz[pos] = 0. - #Remove the spc where there is some sliding (case 3 and 4): +#Remove the spc where there is some sliding (case 3 and 4): if i == 2 or i == 3: pos = np.intersect1d(np.where((md.mesh.y / max(md.mesh.y)) >= 0.44), np.where((md.mesh.y / max(md.mesh.y)) <= 0.5))[0] @@ -56,5 +56,5 @@ md.stressbalance.spcvz[pos] = float('NaN') - #Compute the stressbalance +#Compute the stressbalance md.cluster = generic('name', gethostname(), 'np', 8) md = solve(md, 'Stressbalance') Index: /issm/trunk-jpl/test/NightlyRun/test1110.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1110.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test1110.py (revision 24214) @@ -10,5 +10,5 @@ from squaremesh import * -#This test is a test from the ISMP-HOM Intercomparison project. +#This test is a test from the ISMP - HOM Intercomparison project. #TestF printingflag = False @@ -16,10 +16,10 @@ for i in range(4): - L == 100000. #in m + L = 100000. #in m nx = 30 #numberof nodes in x direction ny = 30 md = model() md = squaremesh(md, L, L, nx, ny) -# md = triangle(md, '../Exp/SquareISMIP.exp', 5500.) + # md = triangle(md, '../Exp/SquareISMIP.exp', 5500.) md = setmask(md, '', '') #ice sheet test md = parameterize(md, '../Par/ISMIPF.py') @@ -31,7 +31,7 @@ md = setflowequation(md, 'FS', 'all') - md.stressbalance.spcvx = float('NaN') * np.ones((md.mesh.numberofvertices,)) - md.stressbalance.spcvy = float('NaN') * np.ones((md.mesh.numberofvertices,)) - md.stressbalance.spcvz = float('NaN') * np.ones((md.mesh.numberofvertices,)) + md.stressbalance.spcvx = float('NaN') * np.ones((md.mesh.numberofvertices, )) + md.stressbalance.spcvy = float('NaN') * np.ones((md.mesh.numberofvertices, )) + md.stressbalance.spcvz = float('NaN') * np.ones((md.mesh.numberofvertices, )) if (i == 0 or i == 2): #Create dirichlet on the bed if no slip @@ -83,5 +83,5 @@ 'title', '', 'xlabel', '', - 'ylabel', 'Velocity (m/yr)', + 'ylabel', 'Velocity (m / yr)', 'linewidth', 3, 'grid', 'on', @@ -94,5 +94,5 @@ 'title', '', 'xlabel', '', - 'ylabel', 'Velocity (m/yr)', + 'ylabel', 'Velocity (m / yr)', 'linewidth', 3, 'grid', 'on', @@ -115,5 +115,14 @@ #system(['mv ismipfFSvxsliding.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestF']) - plotmodel(md, 'data', (md.results.TransientSolution().Surface) - md.geometry.surface, 'layer', md.mesh.numberoflayers, 'sectionvalue', '../Exp/ISMIP100000.exp', 'title', '', 'xlabel', '', 'ylabel', 'Surface (m)', 'linewidth', 3, 'grid', 'on', 'unit', 'km', 'ylim', [-30, 50]) + plotmodel(md, 'data', (md.results.TransientSolution().Surface) - md.geometry.surface, + 'layer', md.mesh.numberoflayers, + 'sectionvalue', '../Exp/ISMIP100000.exp', + 'title', '', + 'xlabel', '', + 'ylabel', 'Surface (m)', + 'linewidth', 3, + 'grid', 'on', + 'unit', 'km', + 'ylim', [- 30, 50]) if printingflag: #set(gcf, 'Color', 'w') Index: /issm/trunk-jpl/test/NightlyRun/test119.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test119.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test119.py (revision 24214) @@ -12,5 +12,5 @@ #hVertices -md = bamg(model(), 'domain', '../Exp/Square.exp', 'hmax', 300000., 'hVertices', np.array([10000., 100000., 400000., 100000.]).reshape(-1, 1)) +md = bamg(model(), 'domain', '../Exp/Square.exp', 'hmax', 300000., 'hVertices', np.array([10000., 100000., 400000., 100000.]).reshape(- 1, 1)) x2 = md.mesh.x y2 = md.mesh.y Index: /issm/trunk-jpl/test/NightlyRun/test1201.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1201.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test1201.py (revision 24214) @@ -28,7 +28,7 @@ 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 +#Stabilization if stabilization == 2: md.masstransport.stabilization = 0 @@ -36,5 +36,5 @@ md.masstransport.stabilization = stabilization - #spc thickness +#spc thickness pos = np.where(md.mesh.y > 199999.9)[0] times = np.arange(0, 501) @@ -44,9 +44,9 @@ if stabilization == 3: pos = np.nonzero(np.isnan(md.masstransport.spcthickness)) - md.masstransport.spcthickness[pos] = 500. #No NaN for DG + md.masstransport.spcthickness[pos] = 500. #No NaN for DG - #solve +#solve md.transient.isstressbalance = False - md.settings.output_frequency = 500 #keep only last step + md.settings.output_frequency = 500 #keep only last step md.verbose = verbose() md = solve(md, 'Transient') @@ -54,8 +54,8 @@ #plot results -#[elements, x, y, z, s, h1]=SectionValues(md, results[0], '../Exp/CrossLineEISMINT.exp', 100.) -#[elements, x, y, z, s, h2]=SectionValues(md, results[1], '../Exp/CrossLineEISMINT.exp', 100.) -#[elements, x, y, z, s, h3]=SectionValues(md, results[2], '../Exp/CrossLineEISMINT.exp', 100.) -#[elements, x, y, z, s, hth]=SectionValues(md, 500+100*sin(2*pi/200*(500-md.mesh.y/400)), '../Exp/CrossLineEISMINT.exp', 100.) +#[elements, x, y, z, s, h1] = SectionValues(md, results[0], '../Exp/CrossLineEISMINT.exp', 100.) +#[elements, x, y, z, s, h2] = SectionValues(md, results[1], '../Exp/CrossLineEISMINT.exp', 100.) +#[elements, x, y, z, s, h3] = SectionValues(md, results[2], '../Exp/CrossLineEISMINT.exp', 100.) +#[elements, x, y, z, s, hth] = SectionValues(md, 500 + 100 * sin(2 * pi / 200 * (500 - md.mesh.y / 400)), '../Exp/CrossLineEISMINT.exp', 100.) #plot(s, h1, 'r', s, h2, 'b', s, h3, 'g', s, hth, 'k') #legend('Art. diff.', 'No Art. diff.', 'D.G.', 'Theoretical') Index: /issm/trunk-jpl/test/NightlyRun/test1202.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1202.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test1202.py (revision 24214) @@ -20,5 +20,5 @@ md = setmask(md, 'all', '') md = parameterize(md, '../Par/SquareEISMINT.py') -md = setflowequation(md, 'SSA', 'all') #SSA's model and 2d +md = setflowequation(md, 'SSA', 'all') #SSA's model and 2d #Compute solution for SSA's model @@ -30,5 +30,5 @@ vy = md.results.StressbalanceSolution.Vy -#plotmodel(md, 'data', vx, 'contourlevels',{0, 20, 40, 60, 60, 100, 120, 140, 160, 180,-20,-40,-60,-80,-100,-120,-140,-160,-180}, ... +#plotmodel(md, 'data', vx, 'contourlevels', {0, 20, 40, 60, 60, 100, 120, 140, 160, 180, - 20, - 40, - 60, - 80, - 100, - 120, - 140, - 160, - 180}, ... # 'contourcolor', 'k') if printingflag: @@ -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 24213) +++ /issm/trunk-jpl/test/NightlyRun/test1203.py (revision 24214) @@ -19,8 +19,8 @@ #test 5 and 6: md = model() -md = triangle(md, '../Exp/SquareEISMINT.exp', 5100.) #test3 +md = triangle(md, '../Exp/SquareEISMINT.exp', 5100.) #test3 md = setmask(md, 'all', '') md = parameterize(md, '../Par/SquareEISMINT.py') -md = setflowequation(md, 'SSA', 'all') #SSA's model and 2d +md = setflowequation(md, 'SSA', 'all') #SSA's model and 2d #Impose a non zero velocity on the upper boundary condition (y = max(y)) @@ -38,5 +38,5 @@ #plot results -#plotmodel(md, 'data', vx, 'contourlevels',{0, 20, 40, 60, 80, 100,-20,-40,-60,-80,-100},... +#plotmodel(md, 'data', vx, 'contourlevels', {0, 20, 40, 60, 80, 100, - 20, - 40, - 60, - 80, - 100}, ... # 'contourcolor', 'k') if printingflag: @@ -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/test1204.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1204.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test1204.py (revision 24214) @@ -22,5 +22,5 @@ md = setmask(md, 'all', '') md = parameterize(md, '../Par/SquareEISMINT.py') -md = setflowequation(md, 'SSA', 'all') #SSA's model and 2d +md = setflowequation(md, 'SSA', 'all') #SSA's model and 2d #Impose a non zero velocity on the upper boundary condition (y = max(y)) @@ -43,5 +43,5 @@ md = solve(md, 'Transient') -#plotmodel(md, 'data',(md.results.TransientSolution(end).Vx)) +#plotmodel(md, 'data', (md.results.TransientSolution(end).Vx)) if printingflag: pass @@ -50,5 +50,5 @@ # system(['mv eisminttrans2vx.png ' ISSM_DIR '/website/doc_pdf/validation/Images/EISMINT/IceShelf ']) -#plotmodel(md, 'data',(md.results.TransientSolution(end).Vy)) +#plotmodel(md, 'data', (md.results.TransientSolution(end).Vy)) if printingflag: pass @@ -57,5 +57,5 @@ # system(['mv eisminttrans2vy.png ' ISSM_DIR '/website/doc_pdf/validation/Images/EISMINT/IceShelf ']) -#plotmodel(md, 'data',(md.results.TransientSolution(end).Thickness)) +#plotmodel(md, 'data', (md.results.TransientSolution(end).Thickness)) if printingflag: pass Index: /issm/trunk-jpl/test/NightlyRun/test1205.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1205.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test1205.py (revision 24214) @@ -22,11 +22,11 @@ md = model() md = roundmesh(md, 750000., resolution) -md = setmask(md, '', '') #We can not test iceshelves nor ice rises with this analytical solution +md = setmask(md, '', '') #We can not test iceshelves nor ice rises with this analytical solution md = parameterize(md, '../Par/RoundSheetStaticEISMINT.py') #Calculation of the analytical 2d velocity field constant = 0.3 -vx_obs = constant / 2. * md.mesh.x * (md.geometry.thickness)**-1 -vy_obs = constant / 2. * md.mesh.y * (md.geometry.thickness)**-1 +vx_obs = constant / 2. * md.mesh.x * (md.geometry.thickness)**- 1 +vy_obs = constant / 2. * md.mesh.y * (md.geometry.thickness)**- 1 vel_obs = np.sqrt((md.inversion.vx_obs)**2 + (md.inversion.vy_obs)**2) @@ -58,7 +58,7 @@ #Plot of the velocity from the exact and calculated solutions #figure(1) -#set(gcf, 'Position',[1 1 1580 1150]) +#set(gcf, 'Position', [1 1 1580 1150]) #subplot(2, 2, 1) -#p = patch('Faces', md.mesh.elements2d, 'Vertices',[md.mesh.x2d md.mesh.y2d], 'FaceVertexCData',... +#p = patch('Faces', md.mesh.elements2d, 'Vertices', [md.mesh.x2d md.mesh.y2d], 'FaceVertexCData', ... #vel, 'FaceColor', 'interp', 'EdgeColor', 'none') #title('Modelled velocity', 'FontSize', 14, 'FontWeight', 'bold') @@ -67,5 +67,5 @@ #subplot(2, 2, 2) -#p = patch('Faces', md.mesh.elements2d, 'Vertices',[md.mesh.x2d md.mesh.y2d], 'FaceVertexCData',... +#p = patch('Faces', md.mesh.elements2d, 'Vertices', [md.mesh.x2d md.mesh.y2d], 'FaceVertexCData', ... #vel_obs, 'FaceColor', 'interp', 'EdgeColor', 'none') #title('Analytical velocity', 'FontSize', 14, 'FontWeight', 'bold') @@ -75,9 +75,9 @@ #subplot(2, 2, 3) #hold on -#plot(sqrt((md.mesh.x(1:md.mesh.numberofvertices2d)).^2+(md.mesh.y(1:md.mesh.numberofvertices2d)).^2), vel, 'r.') -#plot(sqrt((md.mesh.x2d).^2+(md.mesh.y2d).^2), vel_obs, 'b.') +#plot(sqrt((md.mesh.x(1:md.mesh.numberofvertices2d)).^2 + (md.mesh.y(1:md.mesh.numberofvertices2d)).^2), vel, 'r.') +#plot(sqrt((md.mesh.x2d).^2 + (md.mesh.y2d).^2), vel_obs, 'b.') #title('Analytical vs calculated velocity', 'FontSize', 14, 'FontWeight', 'bold') #xlabel('distance to the center of the icesheet [m]', 'FontSize', 14, 'FontWeight', 'bold') -#ylabel('velocity [m/yr]', 'FontSize', 14, 'FontWeight', 'bold') +#ylabel('velocity [m / yr]', 'FontSize', 14, 'FontWeight', 'bold') #legend('calculated velocity', 'exact velocity') #axis([0 750000 0 200]) @@ -85,6 +85,6 @@ #subplot(2, 2, 4) -#p = patch('Faces', md.mesh.elements2d, 'Vertices',[md.mesh.x2d md.mesh.y2d], 'FaceVertexCData',... -#abs(vel-vel_obs)./vel_obs*100, 'FaceColor', 'interp', 'EdgeColor', 'none') +#p = patch('Faces', md.mesh.elements2d, 'Vertices', [md.mesh.x2d md.mesh.y2d], 'FaceVertexCData', ... +#abs(vel - vel_obs). / vel_obs * 100, 'FaceColor', 'interp', 'EdgeColor', 'none') #title('Relative misfit [%]', 'FontSize', 14, 'FontWeight', 'bold') #colorbar Index: /issm/trunk-jpl/test/NightlyRun/test1206.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1206.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test1206.py (revision 24214) @@ -22,11 +22,11 @@ md = model() md = roundmesh(md, 750000., resolution) -md = setmask(md, '', '') #We can not test iceshelves nor ice rises with this analytical solution +md = setmask(md, '', '') #We can not test iceshelves nor ice rises with this analytical solution md = parameterize(md, '../Par/RoundSheetStaticEISMINT.py') #Calculation of the analytical 2d velocity field constant = 0.3 -vx_obs = constant / 2. * md.mesh.x * (md.geometry.thickness)**-1 -vy_obs = constant / 2. * md.mesh.y * (md.geometry.thickness)**-1 +vx_obs = constant / 2. * md.mesh.x * (md.geometry.thickness)**- 1 +vy_obs = constant / 2. * md.mesh.y * (md.geometry.thickness)**- 1 vel_obs = np.sqrt((md.inversion.vx_obs)**2 + (md.inversion.vy_obs)**2) @@ -59,5 +59,5 @@ #figure(1) #subplot(2, 2, 1) -#p = patch('Faces', md.mesh.elements2d, 'Vertices',[md.mesh.x2d md.mesh.y2d], 'FaceVertexCData',... +#p = patch('Faces', md.mesh.elements2d, 'Vertices', [md.mesh.x2d md.mesh.y2d], 'FaceVertexCData', ... #vel, 'FaceColor', 'interp', 'EdgeColor', 'none') #title('Modelled velocity', 'FontSize', 14, 'FontWeight', 'bold') @@ -66,5 +66,5 @@ #subplot(2, 2, 2) -#p = patch('Faces', md.mesh.elements2d, 'Vertices',[md.mesh.x2d md.mesh.y2d], 'FaceVertexCData',... +#p = patch('Faces', md.mesh.elements2d, 'Vertices', [md.mesh.x2d md.mesh.y2d], 'FaceVertexCData', ... #vel_obs, 'FaceColor', 'interp', 'EdgeColor', 'none') #title('Analytical velocity', 'FontSize', 14, 'FontWeight', 'bold') @@ -74,9 +74,9 @@ #subplot(2, 2, 3) #hold on -#plot(sqrt((md.mesh.x(1:md.mesh.numberofvertices2d)).^2+(md.mesh.y(1:md.mesh.numberofvertices2d)).^2), vel, 'r.') -#plot(sqrt((md.mesh.x2d).^2+(md.mesh.y2d).^2), vel_obs, 'b.') +#plot(sqrt((md.mesh.x(1:md.mesh.numberofvertices2d)).^2 + (md.mesh.y(1:md.mesh.numberofvertices2d)).^2), vel, 'r.') +#plot(sqrt((md.mesh.x2d).^2 + (md.mesh.y2d).^2), vel_obs, 'b.') #title('Analytical vs calculated velocity', 'FontSize', 14, 'FontWeight', 'bold') #xlabel('distance to the center of the icesheet [m]', 'FontSize', 14, 'FontWeight', 'bold') -#ylabel('velocity [m/yr]', 'FontSize', 14, 'FontWeight', 'bold') +#ylabel('velocity [m / yr]', 'FontSize', 14, 'FontWeight', 'bold') #legend('calculated velocity', 'exact velocity') #axis([0 750000 0 200]) @@ -84,6 +84,6 @@ #subplot(2, 2, 4) -#p = patch('Faces', md.mesh.elements2d, 'Vertices',[md.mesh.x2d md.mesh.y2d], 'FaceVertexCData',... -#abs(vel-vel_obs)./vel_obs*100, 'FaceColor', 'interp', 'EdgeColor', 'none') +#p = patch('Faces', md.mesh.elements2d, 'Vertices', [md.mesh.x2d md.mesh.y2d], 'FaceVertexCData', ... +#abs(vel - vel_obs). / vel_obs * 100, 'FaceColor', 'interp', 'EdgeColor', 'none') #title('Relative misfit [%]', 'FontSize', 14, 'FontWeight', 'bold') #colorbar Index: /issm/trunk-jpl/test/NightlyRun/test1207.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1207.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test1207.py (revision 24214) @@ -22,11 +22,11 @@ md = model() md = roundmesh(md, 750000., resolution) -md = setmask(md, '', '') #We can not test iceshelves nor ice rises with this analytical solution +md = setmask(md, '', '') #We can not test iceshelves nor ice rises with this analytical solution md = parameterize(md, '../Par/RoundSheetStaticEISMINT.py') #Calculation of the analytical 2d velocity field constant = 0.3 -vx_obs = constant / 2. * md.mesh.x * (md.geometry.thickness)**-1 -vy_obs = constant / 2. * md.mesh.y * (md.geometry.thickness)**-1 +vx_obs = constant / 2. * md.mesh.x * (md.geometry.thickness)**- 1 +vy_obs = constant / 2. * md.mesh.y * (md.geometry.thickness)**- 1 vel_obs = np.sqrt((md.inversion.vx_obs)**2 + (md.inversion.vy_obs)**2) @@ -59,5 +59,5 @@ #figure(1) #subplot(2, 2, 1) -#p = patch('Faces', md.mesh.elements2d, 'Vertices',[md.mesh.x2d md.mesh.y2d], 'FaceVertexCData',... +#p = patch('Faces', md.mesh.elements2d, 'Vertices', [md.mesh.x2d md.mesh.y2d], 'FaceVertexCData', ... #vel, 'FaceColor', 'interp', 'EdgeColor', 'none') #title('Modelled velocity', 'FontSize', 14, 'FontWeight', 'bold') @@ -66,5 +66,5 @@ #subplot(2, 2, 2) -#p = patch('Faces', md.mesh.elements2d, 'Vertices',[md.mesh.x2d md.mesh.y2d], 'FaceVertexCData',... +#p = patch('Faces', md.mesh.elements2d, 'Vertices', [md.mesh.x2d md.mesh.y2d], 'FaceVertexCData', ... #vel_obs, 'FaceColor', 'interp', 'EdgeColor', 'none') #title('Analytical velocity', 'FontSize', 14, 'FontWeight', 'bold') @@ -74,9 +74,9 @@ #subplot(2, 2, 3) #hold on -#plot(sqrt((md.mesh.x(1:md.mesh.numberofvertices2d)).^2+(md.mesh.y(1:md.mesh.numberofvertices2d)).^2), vel, 'r.') -#plot(sqrt((md.mesh.x2d).^2+(md.mesh.y2d).^2), vel_obs, 'b.') +#plot(sqrt((md.mesh.x(1:md.mesh.numberofvertices2d)).^2 + (md.mesh.y(1:md.mesh.numberofvertices2d)).^2), vel, 'r.') +#plot(sqrt((md.mesh.x2d).^2 + (md.mesh.y2d).^2), vel_obs, 'b.') #title('Analytical vs calculated velocity', 'FontSize', 14, 'FontWeight', 'bold') #xlabel('distance to the center of the icesheet [m]', 'FontSize', 14, 'FontWeight', 'bold') -#ylabel('velocity [m/yr]', 'FontSize', 14, 'FontWeight', 'bold') +#ylabel('velocity [m / yr]', 'FontSize', 14, 'FontWeight', 'bold') #legend('calculated velocity', 'exact velocity') #axis([0 750000 0 200]) @@ -84,6 +84,6 @@ #subplot(2, 2, 4) -#p = patch('Faces', md.mesh.elements2d, 'Vertices',[md.mesh.x2d md.mesh.y2d], 'FaceVertexCData',... -#abs(vel-vel_obs)./vel_obs*100, 'FaceColor', 'interp', 'EdgeColor', 'none') +#p = patch('Faces', md.mesh.elements2d, 'Vertices', [md.mesh.x2d md.mesh.y2d], 'FaceVertexCData', ... +#abs(vel - vel_obs). / vel_obs * 100, 'FaceColor', 'interp', 'EdgeColor', 'none') #title('Relative misfit [%]', 'FontSize', 14, 'FontWeight', 'bold') #colorbar Index: /issm/trunk-jpl/test/NightlyRun/test1301.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1301.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test1301.py (revision 24214) @@ -36,5 +36,5 @@ #analytical results #melting heat = geothermal flux -#Mb*L*rho = G => Mb = G/L*rho +#Mb * L * rho = G = > Mb = G / L * rho melting = md.basalforcings.geothermalflux / (md.materials.rho_ice * md.materials.latentheat) * md.constants.yts @@ -47,7 +47,7 @@ relative = np.abs((comp_melting - melting) / melting) * 100. relative[np.nonzero(comp_melting == melting)[0]] = 0. -#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') +#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') if printingflag: pass Index: /issm/trunk-jpl/test/NightlyRun/test1302.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1302.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test1302.py (revision 24214) @@ -11,6 +11,6 @@ """ -This file can be run to check that the advection-diffusion is correctly modeled. -There is u = v=0 and w = cst everywhere the only thermal boundary conditions are an imposed temperature +This file can be run to check that the advection - diffusion is correctly modeled. +There is u = v = 0 and w = cst everywhere the only thermal boundary conditions are an imposed temperature at upper surface and an impose flux at its base. """ @@ -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') @@ -36,8 +36,8 @@ md.thermal.stabilization = 2 #analytical results -#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 +#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 md.initialization.temperature = A * np.exp(alpha * md.mesh.z) + B @@ -50,8 +50,8 @@ relative = np.abs((comp_temp - md.initialization.temperature) / md.initialization.temperature) * 100. relative[np.nonzero(comp_temp == md.initialization.temperature)[0]] = 0. -#plotmodel(md, 'data', comp_temp, 'title', 'Modeled temperature [K]', 'data', md.initialization.temperature, 'view', 3,... -# 'title', 'Analytical temperature [K]', 'view', 3, 'data', comp_temp-md.initialization.temperature,... -# 'title', 'Absolute error [K]', 'view', 3, 'data', relative, 'title', 'Relative error [%]', 'view', 3,... -# 'figposition', 'mathieu', 'FontSize#all', 20) +#plotmodel(md, 'data', comp_temp, 'title', 'Modeled temperature [K]', 'data', md.initialization.temperature, 'view', 3, ... +# 'title', 'Analytical temperature [K]', 'view', 3, 'data', comp_temp - md.initialization.temperature, ... +# 'title', 'Absolute error [K]', 'view', 3, 'data', relative, 'title', 'Relative error [%]', 'view', 3, ... +# 'figposition', 'mathieu', 'FontSize #all', 20) if printingflag: pass Index: /issm/trunk-jpl/test/NightlyRun/test1303.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1303.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test1303.py (revision 24214) @@ -34,5 +34,5 @@ #analytical results -#d2T/dz2 = 0 T(bed)=10 T(surface)=0 => T = 0*(z-bed)/thickness+10*(surface-z)/thickness +#d2T / dz2 = 0 T(bed)=10 T(surface)=0 = > T = 0 * (z - bed) / thickness + 10 * (surface-z) / thickness #each layer of the 3d mesh must have a constant value md.initialization.temperature = 10. * (md.geometry.surface - md.mesh.z) / md.geometry.thickness @@ -46,8 +46,8 @@ relative = np.abs((comp_temp - md.initialization.temperature) / md.initialization.temperature) * 100. relative[np.nonzero(comp_temp == md.initialization.temperature)[0]] = 0. -#plotmodel(md, 'data', comp_temp, 'title', 'Modeled temperature [K]', 'data', md.initialization.temperature, 'view', 3,... -# 'title', 'Analytical temperature [K]', 'view', 3, 'data', comp_temp-md.initialization.temperature,... -# 'title', 'Absolute error [K]', 'view', 3, 'data', relative, 'title', 'Relative error [%]', 'view', 3,... -# 'figposition', 'mathieu', 'FontSize#all', 20) +#plotmodel(md, 'data', comp_temp, 'title', 'Modeled temperature [K]', 'data', md.initialization.temperature, 'view', 3, ... +# 'title', 'Analytical temperature [K]', 'view', 3, 'data', comp_temp - md.initialization.temperature, ... +# 'title', 'Absolute error [K]', 'view', 3, 'data', relative, 'title', 'Relative error [%]', 'view', 3, ... +# 'figposition', 'mathieu', 'FontSize #all', 20) if printingflag: pass Index: /issm/trunk-jpl/test/NightlyRun/test1304.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1304.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test1304.py (revision 24214) @@ -29,10 +29,10 @@ md.thermal.spctemperature[md.mesh.elements[pos2, 3:6] - 1] = 0. md.initialization.pressure = np.zeros((md.mesh.numberofvertices), int) -md.basalforcings.geothermalflux[:] = 0.1 #100mW/m^2 +md.basalforcings.geothermalflux[:] = 0.1 #100mW / m^2 #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 @@ -44,8 +44,8 @@ relative = np.abs((comp_temp - md.initialization.temperature) / md.initialization.temperature) * 100. relative[np.where(comp_temp == md.initialization.temperature)[0]] = 0. -#plotmodel(md, 'data', comp_temp, 'title', 'Modeled temperature [K]', 'data', md.initialization.temperature, 'view', 3,... -# 'title', 'Analytical temperature', 'view', 3, 'data', comp_temp-md.initialization.temperature,... -# 'title', 'Absolute error [K]', 'view', 3, 'data', relative, 'title', 'Relative error [%]', 'view', 3,... -# 'figposition', 'mathieu', 'FontSize#all', 20) +#plotmodel(md, 'data', comp_temp, 'title', 'Modeled temperature [K]', 'data', md.initialization.temperature, 'view', 3, ... +# 'title', 'Analytical temperature', 'view', 3, 'data', comp_temp - md.initialization.temperature, ... +# 'title', 'Absolute error [K]', 'view', 3, 'data', relative, 'title', 'Relative error [%]', 'view', 3, ... +# 'figposition', 'mathieu', 'FontSize #all', 20) if printingflag: pass Index: /issm/trunk-jpl/test/NightlyRun/test1501.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1501.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test1501.py (revision 24214) @@ -23,5 +23,5 @@ md.timestepping.final_time = 2000. -#Solve for thinning rate -> -1 * surface mass balance +#Solve for thinning rate-> - 1 * surface mass balance smb = 2. * np.ones((md.mesh.numberofvertices)) md.smb.mass_balance = smb @@ -37,11 +37,11 @@ smb = md.smb.mass_balance -#tooth= [ [ones(400, 1)*(smb') - 10.]' [ones(400, 1)*(smb')]' ] +#tooth= [ [ones(400, 1) * (smb') - 10.]' [ones(400, 1) * (smb')]' ] tooth = np.hstack((np.tile(smb - 10., (1, 400)), np.tile(smb, (1, 400)))) -#smb = [ [ones(399, 1)*(smb')]' smb tooth tooth] +#smb = [ [ones(399, 1) * (smb')]' smb tooth tooth] smb = np.hstack((np.tile(smb, (1, 399)), smb, tooth, tooth)) #md.smb.mass_balance= smb -#md.smb.mass_balance(end+1,:)=[1.:2000.] +#md.smb.mass_balance(end + 1, :) = [1.:2000.] md.smb.mass_balance = np.vstack((smb, np.arange(1, 2001))) @@ -112,5 +112,5 @@ x1 = md.mesh.x(index(:)) x2 = md.mesh.x(index(:, 2)) x3 = md.mesh.x(index(:, 3)) y1 = md.mesh.y(index(:)) y2 = md.mesh.y(index(:, 2)) y3 = md.mesh.y(index(:, 3)) - areas=(0.5*((x2-x1).*(y3-y1)-(y2-y1).*(x3-x1))) + areas=(0.5 * ((x2 - x1). * (y3 - y1) - (y2 - y1). * (x3 - x1))) thickness = [] @@ -120,5 +120,5 @@ for t = starttime:endtime thickness = [thickness (md.results.TransientSolution(t).Thickness)] - volume = [volume mean(md.results.TransientSolution(t).Thickness.value, 2).*areas] + volume = [volume mean(md.results.TransientSolution(t).Thickness.value, 2). * areas] massbal = [massbal (md.results.TransientSolution(t).SmbMassBalance)] velocity = [velocity (md.results.TransientSolution(t).Vel)] @@ -135,37 +135,37 @@ for i = ts - subplot(5, 9,[28:31 37:40]) - set(gca, 'pos', get(gca, 'pos')+[-0.08 -0.08 0.07 0.08]) + subplot(5, 9, [28:31 37:40]) + set(gca, 'pos', get(gca, 'pos') + [ - 0.08 - 0.08 0.07 0.08]) field = 'Thickness' %process data - [x y z elements is2d isplanet]=processmesh(md, results(i).(field), options) - [data datatype]=processdata(md, results(i).(field), options) - - titlestring = [field ' at time ' num2str(results(i).time/md.constants.yts) ' year'] + [x y z elements is2d isplanet] = processmesh(md, results(i).(field), options) + [data datatype] = processdata(md, results(i).(field), options) + + titlestring = [field ' at time ' num2str(results(i).time / md.constants.yts) ' year'] plot_unit(x, y, z, elements, data, is2d, isplanet, datatype, options) options = changefieldvalue(options, 'title', titlestring) options = addfielddefault(options, 'colorbar', 1) - options = changefieldvalue(options, 'caxis',[0 max(max(thickness))]) - applyoptions(md,[], options) - - subplot(5, 9,[33:36 42:45]) - set(gca, 'pos', get(gca, 'pos')+[-0.00 -0.08 0.07 0.08]) + options = changefieldvalue(options, 'caxis', [0 max(max(thickness))]) + applyoptions(md, [], options) + + subplot(5, 9, [33:36 42:45]) + set(gca, 'pos', get(gca, 'pos') + [ - 0.00 - 0.08 0.07 0.08]) field = 'Vel' %process data - [x y z elements is2d isplanet]=processmesh(md, results(i).(field), options) - [data datatype]=processdata(md, results(i).(field), options) - - titlestring = [field ' at time ' num2str(results(i).time/md.constants.yts) ' year'] + [x y z elements is2d isplanet] = processmesh(md, results(i).(field), options) + [data datatype] = processdata(md, results(i).(field), options) + + titlestring = [field ' at time ' num2str(results(i).time / md.constants.yts) ' year'] plot_unit(x, y, z, elements, data, is2d, isplanet, datatype, options) options = changefieldvalue(options, 'title', titlestring) options = addfielddefault(options, 'colorbar', 1) - options = changefieldvalue(options, 'caxis',[0 max(max(velocity))]) - applyoptions(md,[], options) + options = changefieldvalue(options, 'caxis', [0 max(max(velocity))]) + applyoptions(md, [], options) subplot(5, 4, 1:4) cla - set(gca, 'pos', get(gca, 'pos')+[-0.07 0.03 0.12 0.015]) + set(gca, 'pos', get(gca, 'pos') + [ - 0.07 0.03 0.12 0.015]) plot(starttime:endtime, mean(massbal), 'k', 'LineWidth', 4) hold on @@ -178,6 +178,6 @@ subplot(5, 4, 5:8) cla - set(gca, 'pos', get(gca, 'pos')+[-0.07 0.015 0.12 0.015]) - plot(starttime:endtime, sum(volume)/1000/1000/1000, 'LineWidth', 4) + set(gca, 'pos', get(gca, 'pos') + [ - 0.07 0.015 0.12 0.015]) + plot(starttime:endtime, sum(volume) / 1000 / 1000 / 1000, 'LineWidth', 4) hold on ya = ylim @@ -189,6 +189,6 @@ subplot(5, 4, 9:12) cla - set(gca, 'pos', get(gca, 'pos')+[-0.07 0 0.12 0.015]) - plot(starttime:endtime, mean(velocity)/1000, 'LineWidth', 4) + set(gca, 'pos', get(gca, 'pos') + [ - 0.07 0 0.12 0.015]) + plot(starttime:endtime, mean(velocity) / 1000, 'LineWidth', 4) hold on ya = ylim @@ -203,16 +203,16 @@ %initialize images and frame frame = getframe(gcf) - [images, map]=rgb2ind(frame.cdata, 256, 'nodither') + [images, map] = rgb2ind(frame.cdata, 256, 'nodither') images(1, 1, 1, length(ts))=0 else frame = getframe(gcf) - images(:,:, 1, count) = rgb2ind(frame.cdata, map, 'nodither') + images(:, :, 1, count) = rgb2ind(frame.cdata, map, 'nodither') end - count = count+1 + count = count + 1 end - filename='transawtooth2d.gif' + filename = 'transawtooth2d.gif' imwrite(images, map, filename, 'DelayTime', 1.0, 'LoopCount', inf) """ Index: /issm/trunk-jpl/test/NightlyRun/test1502.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1502.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test1502.py (revision 24214) @@ -24,5 +24,5 @@ md.timestepping.final_time = 2000. -#Solve for thinning rate -> -1 * surface mass balance +#Solve for thinning rate-> - 1 * surface mass balance smb = 2. * np.ones((md.mesh.numberofvertices)) md.smb.mass_balance = smb @@ -38,11 +38,11 @@ smb = md.smb.mass_balance -#tooth= [ [ones(400, 1)*(smb') - 10.]' [ones(400, 1)*(smb')]' ] +#tooth= [ [ones(400, 1) * (smb') - 10.]' [ones(400, 1) * (smb')]' ] tooth = np.hstack((np.tile(smb - 10., (1, 400)), np.tile(smb, (1, 400)))) -#smb = [ [ones(399, 1)*(smb')]' smb tooth tooth] +#smb = [ [ones(399, 1) * (smb')]' smb tooth tooth] smb = np.hstack((np.tile(smb, (1, 399)), smb, tooth, tooth)) #md.smb.mass_balance= smb -#md.smb.mass_balance(end+1,:)=[1.:2000.] +#md.smb.mass_balance(end + 1, :) = [1.:2000.] md.smb.mass_balance = np.vstack((smb, np.arange(1, 2001))) @@ -118,5 +118,5 @@ x1 = md.mesh.x(index(:)) x2 = md.mesh.x(index(:, 2)) x3 = md.mesh.x(index(:, 3)) y1 = md.mesh.y(index(:)) y2 = md.mesh.y(index(:, 2)) y3 = md.mesh.y(index(:, 3)) - areas=(0.5*((x2-x1).*(y3-y1)-(y2-y1).*(x3-x1))) + areas=(0.5 * ((x2 - x1). * (y3 - y1) - (y2 - y1). * (x3 - x1))) thickness = [] @@ -126,5 +126,5 @@ for t = starttime:endtime thickness = [thickness (md.results.TransientSolution(t).Thickness)] - volume = [volume mean(md.results.TransientSolution(t).Thickness.value, 2).*areas] + volume = [volume mean(md.results.TransientSolution(t).Thickness.value, 2). * areas] massbal = [massbal (md.results.TransientSolution(t).SmbMassBalance)] velocity = [velocity (md.results.TransientSolution(t).Vel)] @@ -142,37 +142,37 @@ for i = ts - subplot(5, 9,[28:31 37:40]) - set(gca, 'pos', get(gca, 'pos')+[-0.08 -0.08 0.07 0.08]) + subplot(5, 9, [28:31 37:40]) + set(gca, 'pos', get(gca, 'pos') + [ - 0.08 - 0.08 0.07 0.08]) field = 'Thickness' %process data - [x y z elements is2d isplanet]=processmesh(md, results(i).(field), options) - [data datatype]=processdata(md, results(i).(field), options) - - titlestring = [field ' at time ' num2str(results(i).time/md.constants.yts) ' year'] + [x y z elements is2d isplanet] = processmesh(md, results(i).(field), options) + [data datatype] = processdata(md, results(i).(field), options) + + titlestring = [field ' at time ' num2str(results(i).time / md.constants.yts) ' year'] plot_unit(x, y, z, elements, data, is2d, isplanet, datatype, options) options = changefieldvalue(options, 'title', titlestring) options = addfielddefault(options, 'colorbar', 1) - options = changefieldvalue(options, 'caxis',[0 max(max(thickness))]) - applyoptions(md,[], options) - - subplot(5, 9,[33:36 42:45]) - set(gca, 'pos', get(gca, 'pos')+[-0.01 -0.08 0.07 0.08]) + options = changefieldvalue(options, 'caxis', [0 max(max(thickness))]) + applyoptions(md, [], options) + + subplot(5, 9, [33:36 42:45]) + set(gca, 'pos', get(gca, 'pos') + [ - 0.01 - 0.08 0.07 0.08]) field = 'Vel' %process data - [x y z elements is2d isplanet]=processmesh(md, results(i).(field), options) - [data datatype]=processdata(md, results(i).(field), options) - - titlestring = [field ' at time ' num2str(results(i).time/md.constants.yts) ' year'] + [x y z elements is2d isplanet] = processmesh(md, results(i).(field), options) + [data datatype] = processdata(md, results(i).(field), options) + + titlestring = [field ' at time ' num2str(results(i).time / md.constants.yts) ' year'] plot_unit(x, y, z, elements, data, is2d, isplanet, datatype, options) options = changefieldvalue(options, 'title', titlestring) options = addfielddefault(options, 'colorbar', 1) - options = changefieldvalue(options, 'caxis',[0 max(max(velocity))]) - applyoptions(md,[], options) + options = changefieldvalue(options, 'caxis', [0 max(max(velocity))]) + applyoptions(md, [], options) subplot(5, 4, 1:4) cla - set(gca, 'pos', get(gca, 'pos')+[-0.07 0.03 0.12 0.015]) + set(gca, 'pos', get(gca, 'pos') + [ - 0.07 0.03 0.12 0.015]) plot(starttime:endtime, mean(massbal), 'k', 'LineWidth', 4) hold on @@ -185,6 +185,6 @@ subplot(5, 4, 5:8) cla - set(gca, 'pos', get(gca, 'pos')+[-0.07 0.015 0.12 0.015]) - plot(starttime:endtime, sum(volume)/1000/1000/1000, 'LineWidth', 4) + set(gca, 'pos', get(gca, 'pos') + [ - 0.07 0.015 0.12 0.015]) + plot(starttime:endtime, sum(volume) / 1000 / 1000 / 1000, 'LineWidth', 4) hold on ya = ylim @@ -196,6 +196,6 @@ subplot(5, 4, 9:12) cla - set(gca, 'pos', get(gca, 'pos')+[-0.07 0 0.12 0.015]) - plot(starttime:endtime, mean(velocity)/1000, 'LineWidth', 4) + set(gca, 'pos', get(gca, 'pos') + [ - 0.07 0 0.12 0.015]) + plot(starttime:endtime, mean(velocity) / 1000, 'LineWidth', 4) hold on ya = ylim @@ -210,16 +210,16 @@ %initialize images and frame frame = getframe(gcf) - [images, map]=rgb2ind(frame.cdata, 256, 'nodither') + [images, map] = rgb2ind(frame.cdata, 256, 'nodither') images(1, 1, 1, length(ts))=0 else frame = getframe(gcf) - images(:,:, 1, count) = rgb2ind(frame.cdata, map, 'nodither') + images(:, :, 1, count) = rgb2ind(frame.cdata, map, 'nodither') end - count = count+1 + count = count + 1 end - filename='transawtooth3d.gif' + filename = 'transawtooth3d.gif' imwrite(images, map, filename, 'DelayTime', 1.0, 'LoopCount', inf) """ Index: /issm/trunk-jpl/test/NightlyRun/test1601.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1601.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test1601.py (revision 24214) @@ -34,5 +34,5 @@ md = solve(md, 'Stressbalance') vel1 = md.results.StressbalanceSolution.Vel -#plotmodel(md, 'data', vel0, 'data', vel1, 'data', vel1-vel0, 'title', 'Cartesian CS', 'title', 'Rotated CS', 'title', 'difference') +#plotmodel(md, 'data', vel0, 'data', vel1, 'data', vel1 - vel0, 'title', 'Cartesian CS', 'title', 'Rotated CS', 'title', 'difference') print("Error between Cartesian and rotated CS: {}".format(np.max(np.abs(vel0 - vel1)) / (np.max(np.abs(vel0)) + sys.float_info.epsilon))) @@ -45,5 +45,5 @@ vel2 = md.results.StressbalanceSolution.Vel -#plotmodel(md, 'data', vel0, 'data', vel2, 'data', vel2-vel0, 'title', 'Cartesian CS', 'title', 'Rotated CS', 'title', 'difference') +#plotmodel(md, 'data', vel0, 'data', vel2, 'data', vel2 - vel0, 'title', 'Cartesian CS', 'title', 'Rotated CS', 'title', 'difference') print("Error between Cartesian and rotated CS: {}".format(np.max(np.abs(vel0 - vel2)) / (np.max(np.abs(vel0)) + sys.float_info.epsilon))) Index: /issm/trunk-jpl/test/NightlyRun/test1602.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1602.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test1602.py (revision 24214) @@ -36,5 +36,5 @@ vel1 = md.results.StressbalanceSolution.Vel -#plotmodel(md, 'data', vel0, 'data', vel1, 'data', vel1-vel0, 'title', 'Cartesian CS', 'title', 'Rotated CS', 'title', 'difference', 'view#all', 2) +#plotmodel(md, 'data', vel0, 'data', vel1, 'data', vel1 - vel0, 'title', 'Cartesian CS', 'title', 'Rotated CS', 'title', 'difference', 'view #all', 2) print("Error between Cartesian and rotated CS: {}".format(np.max(np.abs(vel0 - vel1)) / (np.max(np.abs(vel0)) + sys.float_info.epsilon))) Index: /issm/trunk-jpl/test/NightlyRun/test2001.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test2001.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test2001.py (revision 24214) @@ -17,5 +17,5 @@ #Indicate what you want to compute -md.gia.cross_section_shape = 1 # for square-edged x-section +md.gia.cross_section_shape = 1 # for square-edged x - section #Define loading history (see test2001.m for the description) Index: /issm/trunk-jpl/test/NightlyRun/test2002.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test2002.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test2002.py (revision 24214) @@ -23,9 +23,9 @@ late = np.sum(md.mesh.lat[md.mesh.elements - 1], axis=1) / 3 longe = np.sum(md.mesh.long[md.mesh.elements - 1], axis=1) / 3 -pos = np.where(late < -80) -md.slr.deltathickness[pos] = -100 +pos = np.where(late < - 80) +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 +pos = np.where(np.logical_and.reduce((late > 70, late < 80, longe > - 60, longe < - 30))) +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 @@ -76,7 +76,7 @@ #New stuff -md.slr.spcthickness = np.nan * np.ones((md.mesh.numberofvertices,)) -md.slr.Ngia = np.zeros((md.mesh.numberofvertices,)) -md.slr.Ugia = np.zeros((md.mesh.numberofvertices,)) +md.slr.spcthickness = np.nan * np.ones((md.mesh.numberofvertices, )) +md.slr.Ngia = np.zeros((md.mesh.numberofvertices, )) +md.slr.Ugia = np.zeros((md.mesh.numberofvertices, )) #Miscellaneous Index: /issm/trunk-jpl/test/NightlyRun/test2003.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test2003.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test2003.py (revision 24214) @@ -16,15 +16,15 @@ #parameterize slr solution: #slr loading: {{{ -md.slr.deltathickness = np.zeros((md.mesh.numberofelements,)) -md.slr.sealevel = np.zeros((md.mesh.numberofvertices,)) -md.slr.steric_rate = np.zeros((md.mesh.numberofvertices,)) +md.slr.deltathickness = np.zeros((md.mesh.numberofelements, )) +md.slr.sealevel = np.zeros((md.mesh.numberofvertices, )) +md.slr.steric_rate = np.zeros((md.mesh.numberofvertices, )) #antarctica #Access every element in lat using the indices in elements -#-1 to convert to base 0 indexing, 1 (not 2, in matlab) to sum over rows +# - 1 to convert to base 0 indexing, 1 (not 2, in matlab) to sum over rows late = sum(md.mesh.lat[md.mesh.elements - 1], 1) / 3 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 +pos = np.intersect1d(np.array(np.where(late < - 75)), np.array(np.where(longe < 0))) +md.slr.deltathickness[pos] = - 1 #elastic loading from love numbers: @@ -42,18 +42,18 @@ mask = gmtmask(md.mesh.lat, md.mesh.long) -icemask = np.ones((md.mesh.numberofvertices,)) +icemask = np.ones((md.mesh.numberofvertices, )) 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 +#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 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,)) +md.mask.ocean_levelset = np.zeros((md.mesh.numberofvertices, )) pos = np.where(md.mask.ice_levelset == 1) md.mask.ocean_levelset[pos] = 1 #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.land_levelset = np.zeros((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 # }}} @@ -71,13 +71,13 @@ #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, )) +md.geometry.surface = (1 - di) * np.zeros((md.mesh.numberofvertices, )) 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, )) 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, )) #Miscellaneous @@ -85,7 +85,7 @@ #New stuff -md.slr.spcthickness = np.nan * np.ones((md.mesh.numberofvertices,)) -md.slr.Ngia = np.zeros((md.mesh.numberofvertices,)) -md.slr.Ugia = np.zeros((md.mesh.numberofvertices,)) +md.slr.spcthickness = np.nan * np.ones((md.mesh.numberofvertices, )) +md.slr.Ngia = np.zeros((md.mesh.numberofvertices, )) +md.slr.Ugia = np.zeros((md.mesh.numberofvertices, )) #Solution parameters Index: /issm/trunk-jpl/test/NightlyRun/test2010.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test2010.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test2010.py (revision 24214) @@ -20,11 +20,11 @@ longe = sum(md.mesh.long[md.mesh.elements - 1], 1) / 3 -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 +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 -md.slr.sealevel = np.zeros((md.mesh.numberofvertices,)) -md.slr.steric_rate = np.zeros((md.mesh.numberofvertices,)) +md.slr.sealevel = np.zeros((md.mesh.numberofvertices, )) +md.slr.steric_rate = np.zeros((md.mesh.numberofvertices, )) md.slr.ocean_area_scaling = 1 @@ -43,17 +43,17 @@ mask = gmtmask(md.mesh.lat, md.mesh.long) -icemask = np.ones((md.mesh.numberofvertices,)) +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,)) +md.mask.ocean_levelset = np.zeros((md.mesh.numberofvertices, )) pos = np.where(md.mask.ice_levelset == 1) md.mask.ocean_levelset[pos] = 1 #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.land_levelset = np.zeros((md.mesh.numberofvertices, )) +md.mask.groundedice_levelset = - np.ones((md.mesh.numberofvertices, )) #make sure that the elements that have loads are fully grounded: @@ -62,18 +62,18 @@ #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 # }}} #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, )) +md.geometry.surface = (1 - di) * np.zeros((md.mesh.numberofvertices, )) 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, )) 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, )) # }}} #Miscellaneous {{{ @@ -87,7 +87,7 @@ #New stuff -md.slr.spcthickness = np.nan * np.ones((md.mesh.numberofvertices,)) -md.slr.Ngia = np.zeros((md.mesh.numberofvertices,)) -md.slr.Ugia = np.zeros((md.mesh.numberofvertices,)) +md.slr.spcthickness = np.nan * np.ones((md.mesh.numberofvertices, )) +md.slr.Ngia = np.zeros((md.mesh.numberofvertices, )) +md.slr.Ugia = np.zeros((md.mesh.numberofvertices, )) #eustatic + rigid + elastic run: @@ -105,11 +105,11 @@ moizz = md.results.SealevelriseSolution.SealevelInertiaTensorZZ -# analytical moi => just checking FOR ICE only!!! {{{ -# ...have to mute ** slr induced MOI in Tria.cpp ** prior to the comparison -#rad_e = rad_e*1e3 # now in meters +# analytical moi = > just checking FOR ICE only!!! {{{ +# ...have to mute**slr induced MOI in Tria.cpp**prior to the comparison +#rad_e = rad_e * 1e3 # now in meters #areas = GetAreasSphericalTria(md.mesh.elements, md.mesh.lat, md.mesh.long, rad_e) -#lat = late*pi/180 lon = longe*pi/180 -#moi_xz = sum(-md.materials.rho_freshwater.*md.slr.deltathickness.*areas.*rad_e^2.*sin(lat).*cos(lat).*cos(lon)) -#moi_yz = sum(-md.materials.rho_freshwater.*md.slr.deltathickness.*areas.*rad_e^2.*sin(lat).*cos(lat).*sin(lon)) +#lat = late * pi / 180 lon = longe * pi / 180 +#moi_xz = sum(- md.materials.rho_freshwater. * md.slr.deltathickness. * areas. * rad_e^2. * sin(lat). * cos(lat). * cos(lon)) +#moi_yz = sum(- md.materials.rho_freshwater. * md.slr.deltathickness. * areas. * rad_e^2. * sin(lat). * cos(lat). * sin(lon)) # }}} Index: /issm/trunk-jpl/test/NightlyRun/test2051.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test2051.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test2051.py (revision 24214) @@ -14,5 +14,5 @@ # indicate what you want to compute -md.gia.cross_section_shape = 1 # for square-edged x-section +md.gia.cross_section_shape = 1 # for square-edged x - section # define loading history Index: /issm/trunk-jpl/test/NightlyRun/test2052.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test2052.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test2052.py (revision 24214) @@ -14,5 +14,5 @@ #indicate what you want to compute -md.gia.cross_section_shape = 1 # for square-edged x-section +md.gia.cross_section_shape = 1 # for square-edged x - section #define loading history Index: /issm/trunk-jpl/test/NightlyRun/test2053.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test2053.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test2053.py (revision 24214) @@ -14,5 +14,5 @@ #indicate what you want to compute -md.gia.cross_section_shape = 1 # for square-edged x-section +md.gia.cross_section_shape = 1 # for square-edged x - section #define loading history Index: /issm/trunk-jpl/test/NightlyRun/test2071.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test2071.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test2071.py (revision 24214) @@ -14,5 +14,5 @@ #indicate what you want to compute -md.gia.cross_section_shape = 1 # for square-edged x-section +md.gia.cross_section_shape = 1 # for square-edged x - section #define loading history Index: /issm/trunk-jpl/test/NightlyRun/test2072.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test2072.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test2072.py (revision 24214) @@ -14,5 +14,5 @@ #indicate what you want to compute -md.gia.cross_section_shape = 1 # for square-edged x-section +md.gia.cross_section_shape = 1 # for square-edged x - section #define loading history Index: /issm/trunk-jpl/test/NightlyRun/test2073.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test2073.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test2073.py (revision 24214) @@ -14,5 +14,5 @@ #indicate what you want to compute -md.gia.cross_section_shape = 1 # for square-edged x-section +md.gia.cross_section_shape = 1 # for square-edged x - section #define loading history Index: /issm/trunk-jpl/test/NightlyRun/test2081.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test2081.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test2081.py (revision 24214) @@ -14,5 +14,5 @@ #indicate what you want to compute -md.gia.cross_section_shape = 2 # for square-edged x-section +md.gia.cross_section_shape = 2 # for square-edged x - section #define loading history Index: /issm/trunk-jpl/test/NightlyRun/test2082.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test2082.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test2082.py (revision 24214) @@ -14,5 +14,5 @@ #indicate what you want to compute -md.gia.cross_section_shape = 2 # for square-edged x-section +md.gia.cross_section_shape = 2 # for square-edged x - section #define loading history Index: /issm/trunk-jpl/test/NightlyRun/test2083.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test2083.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test2083.py (revision 24214) @@ -14,5 +14,5 @@ #indicate what you want to compute -md.gia.cross_section_shape = 2 # for square-edged x-section +md.gia.cross_section_shape = 2 # for square-edged x - section #define loading history Index: /issm/trunk-jpl/test/NightlyRun/test2084.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test2084.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test2084.py (revision 24214) @@ -1,9 +1,9 @@ #Test Name: GiaCaron #Forward Love number solution for a viscoelastic earth, -#model M3-L70-V01 from Spada, G., Barletta, V. R., Klemann, V., Riva, R. E. M., +#model M3 - L70 - V01 from Spada, G., Barletta, V. R., Klemann, V., Riva, R. E. M., #Martinec, Z., Gasperini, P., Lund, B., Wolf, D., Vermeersen, L. L. A. #and King, M. A. (2011), A benchmark study for glacial isostatic #adjustment codes. Geophysical Journal International, -#185: 106-132. doi:10.1111/j.1365-246X.2011.04952.x +#185: 106 - 132. doi:10.1111 / j.1365 - 246X.2011.04952.x from model import * @@ -26,17 +26,17 @@ md.materials.numlayers = 6 md.materials.radius = np.array([10, 1222.5, 3.4800e+03, 5.7010e+03, 5.9510e+03, - 6.3010e+03, 6.3710e+03]).reshape(-1, 1) * 1e3 + 6.3010e+03, 6.3710e+03]).reshape(- 1, 1) * 1e3 md.materials.density = np.array([1.0750e4, 1.0750e+04, 4.9780e+03, 3.8710e+03, - 3.4380e+03, 3.0370e+03]).reshape(-1, 1) + 3.4380e+03, 3.0370e+03]).reshape(- 1, 1) md.materials.lame_mu = np.array([1e-5, 0, 2.2834e+00, 1.0549e+00, 7.0363e-01, - 5.0605e-01]).reshape(-1, 1) * 1e11 + 5.0605e-01]).reshape(- 1, 1) * 1e11 md.materials.viscosity = np.array([0, 0, 2.0000e+00, 1.0000e+00, 1.0000e+00, - 1.0000e+25]).reshape(-1, 1) * 1e21 + 1.0000e+25]).reshape(- 1, 1) * 1e21 md.materials.lame_lambda = np.array(md.materials.lame_mu) * 0 + 5e14 -md.materials.issolid = np.array([1, 0, 1, 1, 1, 1]).reshape(-1, 1) +md.materials.issolid = np.array([1, 0, 1, 1, 1, 1]).reshape(- 1, 1) md.materials.isburgers = np.zeros((md.materials.numlayers, 1)) md.love.allow_layer_deletion = 1 -md.love.frequencies = (np.array([0]) * 2 * pi).reshape(-1, 1) / cst +md.love.frequencies = (np.array([0]) * 2 * pi).reshape(- 1, 1) / cst md.love.nfreq = len(md.love.frequencies) md.love.sh_nmax = 256 @@ -55,6 +55,5 @@ np.array(md.results.LoveSolution.LoveLr)[:, 0]] -md.love.frequencies = (np.array([1e-3, 1e-2, 1e-1, 1, -1e-3, -1e-2, -1e-1, - -1]) * 2 * pi).reshape(-1, 1) / cst +md.love.frequencies = (np.array([1e-3, 1e-2, 1e-1, 1, - 1e-3, - 1e-2, - 1e-1, -1]) * 2 * pi).reshape(- 1, 1) / cst md.love.nfreq = len(md.love.frequencies) md.love.sh_nmax = 256 @@ -77,6 +76,5 @@ md.love.forcing_type = 9 md.love.sh_nmin = 2 -md.love.frequencies = ((np.array([0, 1e-3, 1e-2, 1e-1, 1, -1e-3, - -1e-2, -1e-1, -1]) * 2 * pi).reshape(-1, 1) / cst) +md.love.frequencies = ((np.array([0, 1e-3, 1e-2, 1e-1, 1, - 1e-3, -1e-2, - 1e-1, - 1]) * 2 * pi).reshape(- 1, 1) / cst) md.love.nfreq = len(md.love.frequencies) @@ -96,26 +94,26 @@ np.array(md.results.LoveSolution.LoveLi)[:, 1:]] -#Many layers PREM-based model +#Many layers PREM - based model #data = load('../Data/PREM_500layers') #md.love.sh_nmin = 1 -#md.materials.radius = data(2:end-2, 1) -#md.materials.density = data(3:end-2, 2) -#md.materials.lame_lambda = data(3:end-2, 3) -#md.materials.lame_mu = data(3:end-2, 4) -#md.materials.issolid = data(3:end-2, 4)>0 +#md.materials.radius = data(2:end - 2, 1) +#md.materials.density = data(3:end - 2, 2) +#md.materials.lame_lambda = data(3:end - 2, 3) +#md.materials.lame_mu = data(3:end - 2, 4) +#md.materials.issolid = data(3:end - 2, 4) > 0 #ind = find(md.materials.issolid = 0) -#md.materials.density(ind(1))=sum((md.materials.radius(ind+1).^3-md.materials.radius(ind).^3).*md.materials.density(ind))/(md.materials.radius(ind(end)+1).^3-md.materials.radius(ind(1)+1).^3) -#md.materials.lame_lambda(ind(1))=sum((md.materials.radius(ind+1).^3-md.materials.radius(ind).^3).*md.materials.lame_lambda(ind))/(md.materials.radius(ind(end)+1).^3-md.materials.radius(ind(1)+1).^3) -#md.materials.lame_mu(ind(1))=sum((md.materials.radius(ind+1).^3-md.materials.radius(ind).^3).*md.materials.lame_mu(ind))/(md.materials.radius(ind(end)+1).^3-md.materials.radius(ind(1)).^3) -#md.materials.radius(ind(2:end)+1)=[] -#md.materials.density(ind(2:end))=[] -#md.materials.lame_lambda(ind(2:end))=[] -#md.materials.lame_mu(ind(2:end))=[] -#md.materials.issolid(ind(2:end))=[] +#md.materials.density(ind(1))=sum((md.materials.radius(ind + 1).^3 - md.materials.radius(ind).^3). * md.materials.density(ind)) / (md.materials.radius(ind(end) + 1).^3 - md.materials.radius(ind(1) + 1).^3) +#md.materials.lame_lambda(ind(1))=sum((md.materials.radius(ind + 1).^3 - md.materials.radius(ind).^3). * md.materials.lame_lambda(ind)) / (md.materials.radius(ind(end) + 1).^3 - md.materials.radius(ind(1) + 1).^3) +#md.materials.lame_mu(ind(1))=sum((md.materials.radius(ind + 1).^3 - md.materials.radius(ind).^3). * md.materials.lame_mu(ind)) / (md.materials.radius(ind(end) + 1).^3 - md.materials.radius(ind(1)).^3) +#md.materials.radius(ind(2:end) + 1) = [] +#md.materials.density(ind(2:end)) = [] +#md.materials.lame_lambda(ind(2:end)) = [] +#md.materials.lame_mu(ind(2:end)) = [] +#md.materials.issolid(ind(2:end)) = [] #md.materials.viscosity = 10.^interp1([0 3479e3 3480e3 3680e3 5720e3 5800e3 6270e3 6371e3], log10([1e8 1e8 5e21 1e23 1e22 1e20 1e21 1e40]), md.materials.radius(2:end), 'PCHIP') -#md.materials.viscosity = md.materials.viscosity.*md.materials.issolid +#md.materials.viscosity = md.materials.viscosity. * md.materials.issolid #md.materials.burgers_mu = md.materials.lame_mu #md.materials.burgers_viscosity = md.materials.viscosity -#md.materials.isburgers = md.materials.issolid*0 +#md.materials.isburgers = md.materials.issolid * 0 #md.love.forcing_type = 11 #md.materials.numlayers = len(md.materials.viscosity) @@ -135,5 +133,5 @@ # (md.results.LoveSolution.LoveLi[:][1:]), # ] -#Model VSS96 from Vermeersen, L.L.A., Sabadini, R. & Spada, G., 1996a. Analytical visco-elastic relaxation models, Geophys. Res. Lett., 23, 697-700. +#Model VSS96 from Vermeersen, L.L.A., Sabadini, R. & Spada, G., 1996a. Analytical visco - elastic relaxation models, Geophys. Res. Lett., 23, 697 - 700. md.materials.radius = np.array([10, 1222.5, 3480., 3600., 3630.5, 3700., 3900., 4000., @@ -141,10 +139,10 @@ 5400., 5500., 5600.5, 5650., 5701., 5736., 5771.5, 5821., 5951., 5970.5, 6016., 6061., 6150.5, 6151.5, - 6251., 6371.]).reshape(-1, 1) * 1e3 + 6251., 6371.]).reshape(- 1, 1) * 1e3 md.materials.lame_mu = np.array([1e-5, 0., 2.933, 2.8990002, 2.8550003, 2.7340002, 2.675, 2.559, 2.502, 2.388, 2.331, 2.215, 2.157, 2.039, 1.979, 1.8560001, 1.794, 1.73, 1.639, 1.2390001, 1.224, 1.21, 1.128, 0.97700006, 0.906, 0.79, 0.773, 0.741, 0.656, 0.665, - 0.602]).reshape(-1, 1) * 1e11 + 0.602]).reshape(- 1, 1) * 1e11 md.materials.density = np.array([10925., 10925., 5506.42, 5491.45, 5456.57, 5357.06, 5307.24, 5207.13, 5156.69, 5054.69, 5002.99, 4897.83, @@ -152,18 +150,18 @@ 4412.41, 3992.14, 3983.99, 3975.84, 3912.82, 3786.78, 3723.78, 3516.39, 3489.51, 3435.78, 3359.5, 3367.1, - 3184.3]).reshape(-1, 1) -md.materials.viscosity = np.array([0., 0., 7.999999999999999E+21, 8.5E+21, - 8.999999999999999E+21, 3.E+22, 4.E+22, - 5.0000000000000004E+22, 6.E+22, - 5.0000000000000004E+22, 4.5E+22, 3.E+22, - 2.5000000000000002E+22, 1.7999999999999998E+22, - 1.3E+22, 7.999999999999999E+21, 6.999999999999999E+21, - 6.5E+21, 6.E+21, 5.5E+21, 5.E+21, 4.4999999999999995E+21, - 3.9999999999999995E+21, 2.5E+21, - 1.9999999999999997E+21, 1.5E+21, 9.999999999999999E+20, - 6.E+20, 5.5000000000000007E+20, 2.E+20, - 1.E40]).reshape(-1, 1) + 3184.3]).reshape(- 1, 1) +md.materials.viscosity = np.array([0., 0., 7.999999999999999e+21, 8.5e+21, + 8.999999999999999e+21, 3.e+22, 4.e+22, + 5.0000000000000004e+22, 6.e+22, + 5.0000000000000004e+22, 4.5e+22, 3.e+22, + 2.5000000000000002e+22, 1.7999999999999998e+22, + 1.3e+22, 7.999999999999999e+21, 6.999999999999999e+21, + 6.5e+21, 6.e+21, 5.5e+21, 5.e+21, 4.4999999999999995e+21, + 3.9999999999999995e+21, 2.5e+21, + 1.9999999999999997e+21, 1.5e+21, 9.999999999999999e+20, + 6.e+20, 5.5000000000000007e+20, 2.e+20, + 1.E40]).reshape(- 1, 1) md.materials.lame_lambda = np.array(md.materials.lame_mu) * 0 + 5e14 -md.materials.issolid = np.ones(len(md.materials.lame_mu)).reshape(-1, 1) +md.materials.issolid = np.ones(len(md.materials.lame_mu)).reshape(- 1, 1) md.materials.issolid[1] = 0 md.materials.numlayers = len(md.materials.lame_mu) @@ -177,6 +175,6 @@ md = solve(md, 'lv') -md.love.frequencies = (np.array([0, 1e-3, 1e-2, 1, -1e-3, -1e-2, - -1]) * 2 * pi).reshape(-1, 1) / cst +md.love.frequencies = (np.array([0, 1e-3, 1e-2, 1, - 1e-3, - 1e-2, + -1]) * 2 * pi).reshape(- 1, 1) / cst md.love.nfreq = len(md.love.frequencies) Index: /issm/trunk-jpl/test/NightlyRun/test2085.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test2085.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test2085.py (revision 24214) @@ -1,4 +1,4 @@ #Test Name: LovenumberstAtDepth. -#Same as test #1 of test2084.m +#Same as test #1 of test2084.m from model import * @@ -21,14 +21,14 @@ md.materials.numlayers = 6 md.materials.radius = np.array([10, 1222.5, 3.4800e+03, 5.7010e+03, 5.9510e+03, 6.3010e+03, 6.3710e+03]).reshape(-1, 1) * 1e3 -md.materials.density = np.array([1.0750e4, 1.0750e+04, 4.9780e+03, 3.8710e+03, 3.4380e+03, 3.0370e+03]).reshape(-1, 1) -md.materials.lame_mu = np.array([1e-5, 0, 2.2834e+00, 1.0549e+00, 7.0363e-01, 5.0605e-01]).reshape(-1, 1) * 1e11 -md.materials.viscosity = np.array([0, 0, 2.0000e+00, 1.0000e+00, 1.0000e+00, 1.0000e+25]).reshape(-1, 1) * 1e21 +md.materials.density = np.array([1.0750e4, 1.0750e+04, 4.9780e+03, 3.8710e+03, 3.4380e+03, 3.0370e+03]).reshape(- 1, 1) +md.materials.lame_mu = np.array([1e-5, 0, 2.2834e+00, 1.0549e+00, 7.0363e-01, 5.0605e-01]).reshape(- 1, 1) * 1e11 +md.materials.viscosity = np.array([0, 0, 2.0000e+00, 1.0000e+00, 1.0000e+00, 1.0000e+25]).reshape(- 1, 1) * 1e21 md.materials.lame_lambda = np.array(md.materials.lame_mu) * 0 + 5e14 -md.materials.issolid = np.array([1, 0, 1, 1, 1, 1]).reshape(-1, 1) -md.materials.isburgers = np.zeros((md.materials.numlayers)).reshape(-1, 1) +md.materials.issolid = np.array([1, 0, 1, 1, 1, 1]).reshape(- 1, 1) +md.materials.isburgers = np.zeros((md.materials.numlayers)).reshape(- 1, 1) md.love.love_kernels = 1 md.love.allow_layer_deletion = 1 -md.love.frequencies = (np.array([0]) * 2 * pi).reshape(-1, 1) / cst +md.love.frequencies = (np.array([0]) * 2 * pi).reshape(- 1, 1) / cst md.love.nfreq = len(md.love.frequencies) md.love.sh_nmax = 2 Index: /issm/trunk-jpl/test/NightlyRun/test2101.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test2101.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test2101.py (revision 24214) @@ -17,13 +17,13 @@ #define load -md.esa.deltathickness = np.zeros((md.mesh.numberofelements,)) +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: nlov = 10000 -md.esa.love_h = np.array(love_numbers('h')) #Originally had CM arg +md.esa.love_h = np.array(love_numbers('h')) #Originally had CM arg md.esa.love_h = np.resize(md.esa.love_h, nlov + 1) -md.esa.love_l = np.array(love_numbers('l')) #Originally had CM arg +md.esa.love_l = np.array(love_numbers('l')) #Originally had CM arg md.esa.love_l = np.resize(md.esa.love_l, nlov + 1) @@ -33,10 +33,10 @@ #make sure wherever there is an ice load, that the mask is set to ice: -md.mask.ice_levelset = np.ones((md.mesh.numberofvertices,)) +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 @@ -52,13 +52,13 @@ #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, )) +md.geometry.surface = (1 - di) * np.zeros((md.mesh.numberofvertices, )) 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, )) 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, )) # }}} #Miscellaneous: {{{ Index: /issm/trunk-jpl/test/NightlyRun/test2110.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test2110.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test2110.py (revision 24214) @@ -12,8 +12,8 @@ #mesh earth: md = model() -md = roundmesh(md, 50000, 2000) # radius and element size (meters) +md = roundmesh(md, 50000, 2000) # radius and element size (meters) #define load -md.esa.deltathickness = np.zeros((md.mesh.numberofelements,)) +md.esa.deltathickness = np.zeros((md.mesh.numberofelements, )) disc_radius = 20 # km index = md.mesh.elements @@ -21,8 +21,8 @@ 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: -nlov = 10000 # horizontal displacements do not work for low degree truncation, e.g., 101 +nlov = 10000 # horizontal displacements do not work for low degree truncation, e.g., 101 md.esa.love_h = np.array(love_numbers('h')) md.esa.love_h = np.resize(md.esa.love_h, nlov + 1) @@ -32,10 +32,10 @@ #mask: {{{ #make sure wherever there is an ice load, that the mask is set to ice: -md.mask.ice_levelset = np.ones((md.mesh.numberofvertices,)) +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 @@ -44,13 +44,13 @@ #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, )) +md.geometry.surface = (1 - di) * np.zeros((md.mesh.numberofvertices, )) 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, )) 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, )) # }}} #Miscellaneous: {{{ Index: /issm/trunk-jpl/test/NightlyRun/test2111.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test2111.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test2111.py (revision 24214) @@ -1,4 +1,4 @@ #Test Name: Esa2Dsurface -#AIS -- southern hemisphere example for north-south, east-west components of horiz motion +#AIS - - southern hemisphere example for north - south, east - west components of horiz motion import numpy as np @@ -15,5 +15,5 @@ # }}} #define load: {{{ -md.esa.deltathickness = np.zeros((md.mesh.numberofelements,)) +md.esa.deltathickness = np.zeros((md.mesh.numberofelements, )) disc_radius = 500 # km index = md.mesh.elements @@ -21,8 +21,8 @@ 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: {{{ -nlov = 10000 # horizontal displacements do not work for low degree truncation, e.g., 101 +nlov = 10000 # horizontal displacements do not work for low degree truncation, e.g., 101 md.esa.love_h = np.array(love_numbers('h', 'CF')) md.esa.love_h = np.resize(md.esa.love_h, nlov + 1) @@ -32,10 +32,10 @@ #mask: {{{ #make sure wherever there is an ice load, that the mask is set to ice: -md.mask.ice_levelset = np.ones((md.mesh.numberofvertices,)) +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 @@ -43,18 +43,18 @@ #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, )) +md.geometry.surface = (1 - di) * np.zeros((md.mesh.numberofvertices, )) 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, )) 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, )) # }}} #additional parameters, miscellaneous: {{{ 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 24213) +++ /issm/trunk-jpl/test/NightlyRun/test2112.py (revision 24214) @@ -1,4 +1,4 @@ #Test Name: Esa2Dsurface -#AIS 2 -- load centered at the south pole! +#AIS 2 - - load centered at the south pole! import numpy as np from model import * @@ -14,5 +14,5 @@ # }}} #define load: {{{ -md.esa.deltathickness = np.zeros((md.mesh.numberofelements,)) +md.esa.deltathickness = np.zeros((md.mesh.numberofelements, )) disc_radius = 500 # km index = md.mesh.elements @@ -20,8 +20,8 @@ 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: {{{ -nlov = 10000 # horizontal displacements do not work for low degree truncation, e.g., 101 +nlov = 10000 # horizontal displacements do not work for low degree truncation, e.g., 101 md.esa.love_h = np.array(love_numbers('h', 'CF')) md.esa.love_h = np.resize(md.esa.love_h, nlov + 1) @@ -31,10 +31,10 @@ #mask: {{{ #make sure wherever there is an ice load, that the mask is set to ice: -md.mask.ice_levelset = np.ones((md.mesh.numberofvertices,)) +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 @@ -42,18 +42,18 @@ #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, )) +md.geometry.surface = (1 - di) * np.zeros((md.mesh.numberofvertices, )) 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, )) 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, )) # }}} #additional parameters, miscellaneous: {{{ 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 24213) +++ /issm/trunk-jpl/test/NightlyRun/test2113.py (revision 24214) @@ -1,4 +1,4 @@ #Test Name: Esa2Dsurface -#Northern hemisphere example for north-south, east-west components of horiz motion +#Northern hemisphere example for north - south, east - west components of horiz motion #Same as test2111.m except that AIS is assumed to have located in Northern Hemisphere @@ -16,5 +16,5 @@ # }}} #define load: {{{ -md.esa.deltathickness = np.zeros((md.mesh.numberofelements,)) +md.esa.deltathickness = np.zeros((md.mesh.numberofelements, )) disc_radius = 500 # km index = md.mesh.elements @@ -22,8 +22,8 @@ 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: {{{ -nlov = 10000 # horizontal displacements do not work for low degree truncation, e.g., 101 +nlov = 10000 # horizontal displacements do not work for low degree truncation, e.g., 101 md.esa.love_h = np.array(love_numbers('h', 'CF')) md.esa.love_h = np.resize(md.esa.love_h, nlov + 1) @@ -33,10 +33,10 @@ #mask: {{{ #make sure wherever there is an ice load, that the mask is set to ice: -md.mask.ice_levelset = np.ones((md.mesh.numberofvertices,)) +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 @@ -44,13 +44,13 @@ #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, )) +md.geometry.surface = (1 - di) * np.zeros((md.mesh.numberofvertices, )) 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, )) 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, )) # }}} #additional parameters, miscellaneous: {{{ Index: /issm/trunk-jpl/test/NightlyRun/test215.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test215.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test215.py (revision 24214) @@ -15,5 +15,5 @@ md.extrude(3, 1.) md = setflowequation(md, 'FS', 'all') -md.settings.solver_residue_threshold = 1.e-4; +md.settings.solver_residue_threshold = 1.e-4 # control parameters Index: /issm/trunk-jpl/test/NightlyRun/test217.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test217.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test217.py (revision 24214) @@ -19,5 +19,5 @@ # redo the parameter file for this special shelf. # constant thickness, constrained (vy = 0) flow into an icefront, -# from 0 m/yr at the grounding line. +# from 0 m / yr at the grounding line. # tighten @@ -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,11 +67,11 @@ 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') -# create analytical solution: strain rate is constant = ((rho_ice*g*h)/4B)^3 (Paterson, 4th Edition, page 292. -# ey_c=(md.materials.rho_ice*md.constants.g*(1-di)*md.geometry.thickness./(4*md.materials.rheology_B)).^3 -# vy_c = ey_c.*md.mesh.y*md.constants.yts +# create analytical solution: strain rate is constant = ((rho_ice * g * h) / 4B)^3 (Paterson, 4th Edition, page 292. +# ey_c=(md.materials.rho_ice * md.constants.g * (1 - di) * md.geometry.thickness. / (4 * md.materials.rheology_B)).^3 +# vy_c = ey_c. * md.mesh.y * md.constants.yts # Fields and tolerances to track changes Index: /issm/trunk-jpl/test/NightlyRun/test218.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test218.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test218.py (revision 24214) @@ -30,5 +30,5 @@ #redo the parameter file for this special shelf. #constant thickness, constrained (vy = 0) flow into an icefront, -#from 0 m/yr at the grounding line. +#from 0 m / yr at the grounding line. #needed later @@ -41,23 +41,23 @@ 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.thickness = h * np.ones((md.mesh.numberofvertices, )) +md.geometry.base = - md.materials.rho_ice / md.materials.rho_water * md.geometry.thickness md.geometry.surface = md.geometry.base + md.geometry.thickness #Initial velocity and pressure -md.initialization.vx = np.zeros((md.mesh.numberofvertices,)) -md.initialization.vy = np.zeros((md.mesh.numberofvertices,)) -md.initialization.vz = np.zeros((md.mesh.numberofvertices,)) -md.initialization.pressure = np.zeros((md.mesh.numberofvertices,)) +md.initialization.vx = np.zeros((md.mesh.numberofvertices, )) +md.initialization.vy = np.zeros((md.mesh.numberofvertices, )) +md.initialization.vz = np.zeros((md.mesh.numberofvertices, )) +md.initialization.pressure = np.zeros((md.mesh.numberofvertices, )) #Materials -md.initialization.temperature = (273. - 20.) * np.ones((md.mesh.numberofvertices,)) +md.initialization.temperature = (273. - 20.) * np.ones((md.mesh.numberofvertices, )) md.materials.rheology_B = paterson(md.initialization.temperature) -md.materials.rheology_n = 3. * np.ones((md.mesh.numberofelements,)) +md.materials.rheology_n = 3. * np.ones((md.mesh.numberofelements, )) #Boundary conditions: -md.stressbalance.spcvx = float('Nan') * np.ones((md.mesh.numberofvertices,)) -md.stressbalance.spcvy = float('Nan') * np.ones((md.mesh.numberofvertices,)) -md.stressbalance.spcvz = float('Nan') * np.ones((md.mesh.numberofvertices,)) +md.stressbalance.spcvx = float('Nan') * np.ones((md.mesh.numberofvertices, )) +md.stressbalance.spcvy = float('Nan') * np.ones((md.mesh.numberofvertices, )) +md.stressbalance.spcvz = float('Nan') * np.ones((md.mesh.numberofvertices, )) #constrain flanks to 0 normal velocity @@ -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,14 +106,15 @@ #imperative! -md.stressbalance.reltol = 10**-10 #tighten for qmu analysis +md.stressbalance.reltol = 10**- 10 #tighten for qmu analysis md.qmu.isdakota = 1 +md.debug.valgrind = True #solve -md.verbose = verbose('000000000') # this line is recommended +md.verbose = verbose('000000000') # this line is recommended md = solve(md, 'Stressbalance', 'overwrite', 'y') #Fields and tolerances to track changes md.qmu.results = md.results.dakota -md.results.dakota.importancefactors = importancefactors(md, 'scaled_MaterialsRheologyB', 'MaxVel').reshape(-1, 1) +md.results.dakota.importancefactors = importancefactors(md, 'scaled_MaterialsRheologyB', 'MaxVel').reshape(- 1, 1) field_names = ['importancefactors'] field_tolerances = [1e-10] Index: /issm/trunk-jpl/test/NightlyRun/test228.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test228.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test228.py (revision 24214) @@ -22,5 +22,5 @@ #Set up transient smb = np.ones((md.mesh.numberofvertices)) * 3.6 -smb = np.vstack((smb, smb * -1.)).T +smb = np.vstack((smb, smb * - 1.)).T md.smb.mass_balance = np.vstack((smb, [1.5, 3.])) Index: /issm/trunk-jpl/test/NightlyRun/test230.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test230.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test230.py (revision 24214) @@ -23,5 +23,5 @@ #Set up transient smb = np.ones((md.mesh.numberofvertices)) * 3.6 -smb = np.vstack((smb, smb * -1.)).T +smb = np.vstack((smb, smb * - 1.)).T md.smb.mass_balance = np.vstack((smb, [1.5, 3.])) Index: /issm/trunk-jpl/test/NightlyRun/test234.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test234.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test234.py (revision 24214) @@ -24,6 +24,6 @@ md.timestepping.final_time = 4 -smb = np.ones((md.mesh.numberofvertices,)) * 3.6 -smb = np.array([smb, smb * -1]).T +smb = np.ones((md.mesh.numberofvertices, )) * 3.6 +smb = np.array([smb, smb * - 1]).T md.smb.mass_balance = smb @@ -81,9 +81,9 @@ 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'] #solve -md.verbose = verbose('000000000') # this line is recommended +md.verbose = verbose('000000000') # this line is recommended md = solve(md, 'Transient', 'overwrite', 'y') md.qmu.results = md.results.dakota Index: /issm/trunk-jpl/test/NightlyRun/test235.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test235.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test235.py (revision 24214) @@ -24,6 +24,6 @@ md.timestepping.final_time = 4 -smb = np.ones((md.mesh.numberofvertices,)) * 3.6 -smb = np.array([smb, smb * -1]).T +smb = np.ones((md.mesh.numberofvertices, )) * 3.6 +smb = np.array([smb, smb * - 1]).T md.smb.mass_balance = smb @@ -77,9 +77,9 @@ 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'] #solve -md.verbose = verbose('000000000') # this line is recommended +md.verbose = verbose('000000000') # this line is recommended md = solve(md, 'Transient', 'overwrite', 'y') md.qmu.results = md.results.dakota Index: /issm/trunk-jpl/test/NightlyRun/test236.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test236.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test236.py (revision 24214) @@ -35,15 +35,15 @@ md.smb.temperatures_presentday[0:md.mesh.numberofvertices, imonth] = tmonth[imonth] md.smb.temperatures_lgm[0:md.mesh.numberofvertices, imonth] = tmonth[imonth] - 20. - # Time for the last line: +# Time for the last line: md.smb.temperatures_presentday[md.mesh.numberofvertices, imonth] = ((float(imonth) + 1.) / 12.) md.smb.temperatures_lgm[md.mesh.numberofvertices, imonth] = ((float(imonth) + 1.) / 12.) # creating initialization and spc temperatures initialization and spc -md.thermal.spctemperature = np.mean(md.smb.temperatures_lgm[0:md.mesh.numberofvertices, :], axis=1) #-10*ones(md.mesh.numberofvertices, 1) +md.thermal.spctemperature = np.mean(md.smb.temperatures_lgm[0:md.mesh.numberofvertices, :], axis=1) # - 10 * ones(md.mesh.numberofvertices, 1) md.thermal.spctemperature = np.tile(md.thermal.spctemperature, (int(md.timestepping.final_time / md.timestepping.time_step), 1)).T itemp = np.arange(0, md.timestepping.final_time, md.timestepping.time_step) md.thermal.spctemperature = np.vstack((md.thermal.spctemperature, itemp)) -md.initialization.temperature = md.smb.temperatures_lgm[0:md.mesh.numberofvertices, 0] #*ones(md.mesh.numberofvertices, 1) +md.initialization.temperature = md.smb.temperatures_lgm[0:md.mesh.numberofvertices, 0] # * ones(md.mesh.numberofvertices, 1) md.smb.initialize(md) @@ -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 24213) +++ /issm/trunk-jpl/test/NightlyRun/test237.py (revision 24214) @@ -11,5 +11,5 @@ from generic import generic -md = triangle(model(), '../Exp/Square.exp', 600000) #180000 +md = triangle(model(), '../Exp/Square.exp', 600000) #180000 md = setmask(md, 'all', '') md = parameterize(md, '../Par/SquareShelf.py') @@ -33,15 +33,15 @@ md.smb.temperatures_presentday[0:md.mesh.numberofvertices, imonth] = tmonth[imonth] md.smb.temperatures_lgm[0:md.mesh.numberofvertices, imonth] = tmonth[imonth] - 20. - # Time for the last line: +# Time for the last line: md.smb.temperatures_presentday[md.mesh.numberofvertices, imonth] = ((float(imonth) + 1.) / 12.) md.smb.temperatures_lgm[md.mesh.numberofvertices, imonth] = ((float(imonth) + 1.) / 12.) # creating initialization and spc temperatures initialization and spc -md.thermal.spctemperature = np.mean(md.smb.temperatures_lgm[0:md.mesh.numberofvertices, :], axis=1) #-10*ones(md.mesh.numberofvertices, 1) +md.thermal.spctemperature = np.mean(md.smb.temperatures_lgm[0:md.mesh.numberofvertices, :], axis=1) # - 10 * ones(md.mesh.numberofvertices, 1) md.thermal.spctemperature = np.tile(md.thermal.spctemperature, (int(md.timestepping.final_time / md.timestepping.time_step), 1)).T itemp = np.arange(0, md.timestepping.final_time, md.timestepping.time_step) md.thermal.spctemperature = np.vstack((md.thermal.spctemperature, itemp)) -md.initialization.temperature = md.smb.temperatures_lgm[0:md.mesh.numberofvertices, 0] #*ones(md.mesh.numberofvertices, 1) +md.initialization.temperature = md.smb.temperatures_lgm[0:md.mesh.numberofvertices, 0] # * ones(md.mesh.numberofvertices, 1) md.smb.initialize(md) @@ -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 24213) +++ /issm/trunk-jpl/test/NightlyRun/test238.py (revision 24214) @@ -29,9 +29,9 @@ for imonth in range(0, 12): md.smb.temperatures_presentday[0:md.mesh.numberofvertices, imonth] = tmonth[imonth] - # Time for the last line: +# Time for the last line: md.smb.temperatures_presentday[md.mesh.numberofvertices, imonth] = ((float(imonth) + 1.) / 12.) # creating initialization and spc temperatures initialization and spc -md.thermal.spctemperature = np.mean(md.smb.temperatures_presentday[0:md.mesh.numberofvertices, :], axis=1).reshape(-1, 1) +md.thermal.spctemperature = np.mean(md.smb.temperatures_presentday[0:md.mesh.numberofvertices, :], axis=1).reshape(- 1, 1) md.thermal.spctemperature = md.thermal.spctemperature - 10 md.initialization.temperature = md.thermal.spctemperature @@ -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 24213) +++ /issm/trunk-jpl/test/NightlyRun/test239.py (revision 24214) @@ -29,9 +29,9 @@ for imonth in range(0, 12): md.smb.temperatures_presentday[0:md.mesh.numberofvertices, imonth] = tmonth[imonth] - # Time for the last line: +# Time for the last line: md.smb.temperatures_presentday[md.mesh.numberofvertices, imonth] = (float(imonth) / 12.) # creating initialization and spc temperatures initialization and spc -md.thermal.spctemperature = np.mean(md.smb.temperatures_presentday[0:md.mesh.numberofvertices, :], axis=1).reshape(-1, 1) +md.thermal.spctemperature = np.mean(md.smb.temperatures_presentday[0:md.mesh.numberofvertices, :], axis=1).reshape(- 1, 1) md.thermal.spctemperature = md.thermal.spctemperature - 10 md.initialization.temperature = md.thermal.spctemperature @@ -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 24213) +++ /issm/trunk-jpl/test/NightlyRun/test240.py (revision 24214) @@ -29,9 +29,9 @@ for imonth in range(0, 12): md.smb.temperatures_presentday[0:md.mesh.numberofvertices, imonth] = tmonth[imonth] - # Time for the last line: +# Time for the last line: md.smb.temperatures_presentday[md.mesh.numberofvertices, imonth] = (float(imonth) / 12.) # creating initialization and spc temperatures initialization and spc -md.thermal.spctemperature = np.mean(md.smb.temperatures_presentday[0:md.mesh.numberofvertices, :], axis=1).reshape(-1, 1) +md.thermal.spctemperature = np.mean(md.smb.temperatures_presentday[0:md.mesh.numberofvertices, :], axis=1).reshape(- 1, 1) md.thermal.spctemperature = md.thermal.spctemperature - 10 md.initialization.temperature = md.thermal.spctemperature @@ -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/test241.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test241.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test241.py (revision 24214) @@ -23,5 +23,5 @@ #Set up transient smb = np.ones((md.mesh.numberofvertices)) * 3.6 -smb = np.vstack((smb, smb * -1.)).T +smb = np.vstack((smb, smb * - 1.)).T md.smb.mass_balance = np.vstack((smb, [1.5, 3.])) Index: /issm/trunk-jpl/test/NightlyRun/test242.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test242.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test242.py (revision 24214) @@ -24,5 +24,5 @@ #Set up transient smb = np.ones((md.mesh.numberofvertices)) * 3.6 -smb = np.vstack((smb, smb * -1.)).T +smb = np.vstack((smb, smb * - 1.)).T md.smb.mass_balance = np.vstack((smb, [1.5, 3.])) Index: /issm/trunk-jpl/test/NightlyRun/test2424.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test2424.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test2424.py (revision 24214) @@ -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 @@ -31,5 +31,5 @@ md.timestepping.time_step = .1 md.slr.sealevel = newforcing(md.timestepping.start_time, md.timestepping.final_time, - md.timestepping.time_step, -200., 200., md.mesh.numberofvertices) + md.timestepping.time_step, - 200., 200., md.mesh.numberofvertices) md.cluster = generic('name', gethostname(), 'np', 3) @@ -37,5 +37,5 @@ #we are checking that the grounding line position is near the theorical one, which is the 0 contour level -#of surface - sealevel - (1-di)* thickness +#of surface-sealevel - (1 - di) * thickness nsteps = len(md.results.TransientSolution) @@ -45,5 +45,5 @@ #time is off by the year constant for i in range(nsteps): - field_names.append('Time-' + str(md.results.TransientSolution[i].time) + '-yr-ice_levelset-S-sl-(1-di)*H') + field_names.append('Time-' + str(md.results.TransientSolution[i].time) + ' - yr - ice_levelset - S - sl - (1 - di) * H') field_tolerances.append(1e-12) - field_values.append(md.results.TransientSolution[i].MaskGroundediceLevelset.reshape(-1,) - (md.geometry.surface - md.results.TransientSolution[i].Sealevel.reshape(-1,) - (1 - md.materials.rho_ice / md.materials.rho_water) * md.geometry.thickness)) + field_values.append(md.results.TransientSolution[i].MaskGroundediceLevelset.reshape(- 1, ) - (md.geometry.surface - md.results.TransientSolution[i].Sealevel.reshape(- 1, ) - (1 - md.materials.rho_ice / md.materials.rho_water) * md.geometry.thickness)) Index: /issm/trunk-jpl/test/NightlyRun/test2425.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test2425.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test2425.py (revision 24214) @@ -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 @@ -39,5 +39,5 @@ md.geometry.bed = md.geometry.bed + 1000 md.geometry.surface = md.geometry.surface + 1000 -md.slr.sealevel = 1000 * np.ones((md.mesh.numberofvertices,)) +md.slr.sealevel = 1000 * np.ones((md.mesh.numberofvertices, )) md = solve(md, 'Transient', 'checkconsistency', 'no') Index: /issm/trunk-jpl/test/NightlyRun/test243.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test243.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test243.py (revision 24214) @@ -62,13 +62,13 @@ #Fields and tolerances to track changes field_names = ['SmbDz', 'SmbT', 'SmbD', 'SmbRe', 'SmbGdn', 'SmbGsp', 'SmbA', 'SmbEC', 'SmbMassBalance', 'SmbMAdd', 'SmbDzAdd', 'SmbFAC', 'SmbMeanSHF', 'SmbMeanLHF', 'SmbMeanULW', 'SmbNetLW', 'SmbNetSW'] -field_tolerances = [8e-10,5e-12,3e-10,8e-10,1e-11,2e-7,4e-11,4e-12,1e-12,1e-12,1e-12,2e-10,2e-11, 2e-11, 1e-11, 9e-10, 2e-11] +field_tolerances = [8e-10, 5e-12, 3e-10, 8e-10, 1e-11, 2e-7, 4e-11, 4e-12, 1e-12, 1e-12, 1e-12, 2e-10, 2e-11, 2e-11, 1e-11, 9e-10, 2e-11] #shape is different in python solution (fixed using reshape) which can cause test failure: -field_values = [md.results.TransientSolution[-1].SmbDz[0, 0:240].reshape(1, -1), - md.results.TransientSolution[-1].SmbT[0, 0:240].reshape(1, -1), - md.results.TransientSolution[-1].SmbD[0, 0:240].reshape(1, -1), - md.results.TransientSolution[-1].SmbRe[0, 0:240].reshape(1, -1), - md.results.TransientSolution[-1].SmbGdn[0, 0:240].reshape(1, -1), - md.results.TransientSolution[-1].SmbGsp[0, 0:240].reshape(1, -1), - md.results.TransientSolution[-1].SmbA[0, 0:240].reshape(1, -1), +field_values = [md.results.TransientSolution[-1].SmbDz[0, 0:240].reshape(1, - 1), + md.results.TransientSolution[-1].SmbT[0, 0:240].reshape(1, - 1), + md.results.TransientSolution[-1].SmbD[0, 0:240].reshape(1, - 1), + md.results.TransientSolution[-1].SmbRe[0, 0:240].reshape(1, - 1), + md.results.TransientSolution[-1].SmbGdn[0, 0:240].reshape(1, - 1), + md.results.TransientSolution[-1].SmbGsp[0, 0:240].reshape(1, - 1), + md.results.TransientSolution[-1].SmbA[0, 0:240].reshape(1, - 1), md.results.TransientSolution[-1].SmbEC[0], md.results.TransientSolution[-1].SmbMassBalance[0], Index: /issm/trunk-jpl/test/NightlyRun/test244.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test244.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test244.py (revision 24214) @@ -69,5 +69,5 @@ #partitioning md.qmu.numberofpartitions = md.mesh.numberofelements -md = partitioner(md, 'package', 'linear','type','element') +md = partitioner(md, 'package', 'linear', 'type', 'element') md.qmu.epartition = (md.qmu.epartition - 1) @@ -75,14 +75,14 @@ md.qmu.variables.surface_mass_balanceC = normal_uncertain.normal_uncertain('scaled_SmbC', 1, 0.5) Tmin = 273. -telms = np.atleast_2d(np.min(md.smb.Ta[0:-1, :], 1)) +telms = np.atleast_2d(np.min(md.smb.Ta[0: - 1, :], 1)) mint_on_partition = telms.flatten() for pa in range(np.size(mint_on_partition)): vi = np.where(md.qmu.epartition == pa) - mint = telms[0,vi] * 1.05 + mint = telms[0, vi] * 1.05 pos = np.where(mint < Tmin) mint[pos] = Tmin - mint_on_partition[pa] = max(mint / telms[0,vi]) + 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,9 +117,9 @@ -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'] #solve -md.verbose = verbose('000000000') # this line is recommended +md.verbose = verbose('000000000') # this line is recommended md = solve(md, 'Transient', 'overwrite', 'y') md.qmu.results = md.results.dakota Index: /issm/trunk-jpl/test/NightlyRun/test245.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test245.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test245.py (revision 24214) @@ -19,13 +19,13 @@ # initalize pdd fields md.smb.initialize(md) -md.smb.s0p = md.geometry.surface.reshape(-1, 1) -md.smb.s0t = md.geometry.surface.reshape(-1, 1) +md.smb.s0p = md.geometry.surface.reshape(- 1, 1) +md.smb.s0t = md.geometry.surface.reshape(- 1, 1) 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_mj_present = 10. * np.ones((md.mesh.numberofvertices,)) - md.smb.rlaps * md.geometry.surface / 1000. -precipitation = 5. * np.ones((md.mesh.numberofvertices,)) +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, )) for imonth in range(12): md.smb.monthlytemperatures[0:md.mesh.numberofvertices, imonth] = md.materials.meltingpoint + temp_ma_present + (temp_mj_present - temp_ma_present) * np.sin((imonth + 1. - 4.) * np.pi / 6.0) Index: /issm/trunk-jpl/test/NightlyRun/test250.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test250.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test250.py (revision 24214) @@ -23,6 +23,6 @@ md.timestepping.final_time = 4 -smb = np.ones((md.mesh.numberofvertices,)) * 3.6 -smb = np.array([smb, smb * -1]).T +smb = np.ones((md.mesh.numberofvertices, )) * 3.6 +smb = np.array([smb, smb * - 1]).T md.smb.mass_balance = smb @@ -79,9 +79,9 @@ 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'] #solve -md.verbose = verbose('000000000') # this line is recommended +md.verbose = verbose('000000000') # this line is recommended md = solve(md, 'Transient', 'overwrite', 'y') md.qmu.results = md.results.dakota Index: /issm/trunk-jpl/test/NightlyRun/test251.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test251.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test251.py (revision 24214) @@ -23,6 +23,6 @@ md.timestepping.final_time = 4 -smb = np.ones((md.mesh.numberofvertices,)) * 3.6 -smb = np.array([smb, smb * -1]).T +smb = np.ones((md.mesh.numberofvertices, )) * 3.6 +smb = np.array([smb, smb * - 1]).T md.smb.mass_balance = smb @@ -76,9 +76,9 @@ 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'] #solve -md.verbose = verbose('000000000') # this line is recommended +md.verbose = verbose('000000000') # this line is recommended md = solve(md, 'Transient', 'overwrite', 'y') md.qmu.results = md.results.dakota Index: /issm/trunk-jpl/test/NightlyRun/test252.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test252.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test252.py (revision 24214) @@ -42,11 +42,11 @@ md.smb.C = np.tile(np.conjugate(inputs[b'LP']['C']), (md.mesh.numberofelements, 1)).flatten() -md.smb.Ta = md.smb.Ta[:,0:365*8] -md.smb.V = md.smb.V[:,0:365*8] -md.smb.dswrf = md.smb.dswrf[:,0:365*8] -md.smb.dlwrf = md.smb.dlwrf[:,0:365*8] -md.smb.P = md.smb.P[:,0:365*8] -md.smb.eAir = md.smb.eAir[:,0:365*8] -md.smb.pAir = md.smb.pAir[:,0:365*8] +md.smb.Ta = md.smb.Ta[:, 0:365 * 8] +md.smb.V = md.smb.V[:, 0:365 * 8] +md.smb.dswrf = md.smb.dswrf[:, 0:365 * 8] +md.smb.dlwrf = md.smb.dlwrf[:, 0:365 * 8] +md.smb.P = md.smb.P[:, 0:365 * 8] +md.smb.eAir = md.smb.eAir[:, 0:365 * 8] +md.smb.pAir = md.smb.pAir[:, 0:365 * 8] md.smb.isclimatology = 1 @@ -70,18 +70,22 @@ #Fields and tolerances to track changes -field_names = ['SmbDz1','SmbT1' ,'SmbD1' ,'SmbRe1','SmbGdn1','SmbGsp1','SmbA1' ,'SmbEC1','SmbMassBalance1','SmbMAdd1','SmbDzAdd1','SmbFAC1','SmbDz2','SmbT2','SmbD2' ,'SmbRe2','SmbGdn2','SmbGsp2','SmbA2','SmbEC2','SmbMassBalance2','SmbMAdd2','SmbDzAdd2','SmbFAC2','SmbDz3','SmbT3','SmbD3','SmbRe3','SmbGdn3','SmbGsp3','SmbA3','SmbEC3','SmbMassBalance3','SmbMAdd3','SmbDzAdd3','SmbFAC3','SmbDz4','SmbT4' ,'SmbD4' ,'SmbRe4','SmbGdn4','SmbGsp4','SmbA4','SmbEC4','SmbMassBalance4','SmbMAdd4','SmbDzAdd4','SmbFAC4'] -field_tolerances = [1e-11,1e-12,1e-11,2e-11,1e-11,1e-11,1e-12,1e-12,1e-12,1e-12,1e-12,1e-11, - 1e-11,1e-12,1e-11,8e-10,1e-11,4e-11,1e-12,4e-12,1e-12,1e-12,1e-12,2e-11, - 1e-11,1e-12,1e-11,8e-10,1e-11,4e-11,1e-12,6e-12,6e-12,1e-12,1e-12,2e-11, - 2e-9,1e-11,3e-9,1e-9,1e-11,2e-7,7e-11,2e-12,3e-9,1e-12,1e-12,9e-11] + +field_names = ['SmbDz1', 'SmbT1', 'SmbD1', 'SmbRe1', 'SmbGdn1', 'SmbGsp1', 'SmbA1', 'SmbEC1', 'SmbMassBalance1', 'SmbMAdd1', 'SmbDzAdd1', 'SmbFAC1', + 'SmbDz2', 'SmbT2', 'SmbD2', 'SmbRe2', 'SmbGdn2', 'SmbGsp2', 'SmbA2', 'SmbEC2', 'SmbMassBalance2', 'SmbMAdd2', 'SmbDzAdd2', 'SmbFAC2', + 'SmbDz3', 'SmbT3', 'SmbD3', 'SmbRe3', 'SmbGdn3', 'SmbGsp3', 'SmbA3', 'SmbEC3', 'SmbMassBalance3', 'SmbMAdd3', 'SmbDzAdd3', 'SmbFAC3', + 'SmbDz4', 'SmbT4', 'SmbD4', 'SmbRe4', 'SmbGdn4', 'SmbGsp4', 'SmbA4', 'SmbEC4', 'SmbMassBalance4', 'SmbMAdd4', 'SmbDzAdd4', 'SmbFAC4'] +field_tolerances = [1e-11, 1e-12, 1e-11, 2e-11, 1e-11, 1e-11, 1e-12, 1e-12, 1e-12, 1e-12, 1e-12, 1e-11, + 1e-11, 1e-12, 1e-11, 8e-10, 1e-11, 4e-11, 1e-12, 4e-12, 1e-12, 1e-12, 1e-12, 2e-11, + 1e-11, 1e-12, 1e-11, 8e-10, 1e-11, 4e-11, 1e-12, 6e-12, 6e-12, 1e-12, 1e-12, 2e-11, + 2e-9, 1e-11, 3e-9, 1e-9, 1e-11, 2e-7, 7e-11, 2e-12, 3e-9, 1e-12, 1e-12, 9e-11] #shape is different in python solution (fixed using reshape) which can cause test failure: -field_values = [md.results.TransientSolution[0].SmbDz[0, 0:230].reshape(1, -1), - md.results.TransientSolution[0].SmbT[0, 0:230].reshape(1, -1), - md.results.TransientSolution[0].SmbD[0, 0:230].reshape(1, -1), - md.results.TransientSolution[0].SmbRe[0, 0:230].reshape(1, -1), - md.results.TransientSolution[0].SmbGdn[0, 0:230].reshape(1, -1), - md.results.TransientSolution[0].SmbGsp[0, 0:230].reshape(1, -1), - md.results.TransientSolution[0].SmbA[0, 0:230].reshape(1, -1), +field_values = [md.results.TransientSolution[0].SmbDz[0, 0:230].reshape(1, - 1), + md.results.TransientSolution[0].SmbT[0, 0:230].reshape(1, - 1), + md.results.TransientSolution[0].SmbD[0, 0:230].reshape(1, - 1), + md.results.TransientSolution[0].SmbRe[0, 0:230].reshape(1, - 1), + md.results.TransientSolution[0].SmbGdn[0, 0:230].reshape(1, - 1), + md.results.TransientSolution[0].SmbGsp[0, 0:230].reshape(1, - 1), + md.results.TransientSolution[0].SmbA[0, 0:230].reshape(1, - 1), md.results.TransientSolution[0].SmbEC[0], md.results.TransientSolution[0].SmbMassBalance[0], @@ -89,11 +93,11 @@ md.results.TransientSolution[0].SmbDzAdd[0], md.results.TransientSolution[0].SmbFAC[0], - md.results.TransientSolution[145].SmbDz[0, 0:230].reshape(1, -1), - md.results.TransientSolution[145].SmbT[0, 0:230].reshape(1, -1), - md.results.TransientSolution[145].SmbD[0, 0:230].reshape(1, -1), - md.results.TransientSolution[145].SmbRe[0, 0:230].reshape(1, -1), - md.results.TransientSolution[145].SmbGdn[0, 0:230].reshape(1, -1), - md.results.TransientSolution[145].SmbGsp[0, 0:230].reshape(1, -1), - md.results.TransientSolution[145].SmbA[0, 0:230].reshape(1, -1), + md.results.TransientSolution[145].SmbDz[0, 0:230].reshape(1, - 1), + md.results.TransientSolution[145].SmbT[0, 0:230].reshape(1, - 1), + md.results.TransientSolution[145].SmbD[0, 0:230].reshape(1, - 1), + md.results.TransientSolution[145].SmbRe[0, 0:230].reshape(1, - 1), + md.results.TransientSolution[145].SmbGdn[0, 0:230].reshape(1, - 1), + md.results.TransientSolution[145].SmbGsp[0, 0:230].reshape(1, - 1), + md.results.TransientSolution[145].SmbA[0, 0:230].reshape(1, - 1), md.results.TransientSolution[145].SmbEC[0], md.results.TransientSolution[145].SmbMassBalance[0], @@ -101,11 +105,11 @@ md.results.TransientSolution[145].SmbDzAdd[0], md.results.TransientSolution[145].SmbFAC[0], - md.results.TransientSolution[146].SmbDz[0, 0:230].reshape(1, -1), - md.results.TransientSolution[146].SmbT[0, 0:230].reshape(1, -1), - md.results.TransientSolution[146].SmbD[0, 0:230].reshape(1, -1), - md.results.TransientSolution[146].SmbRe[0, 0:230].reshape(1, -1), - md.results.TransientSolution[146].SmbGdn[0, 0:230].reshape(1, -1), - md.results.TransientSolution[146].SmbGsp[0, 0:230].reshape(1, -1), - md.results.TransientSolution[146].SmbA[0, 0:230].reshape(1, -1), + md.results.TransientSolution[146].SmbDz[0, 0:230].reshape(1, - 1), + md.results.TransientSolution[146].SmbT[0, 0:230].reshape(1, - 1), + md.results.TransientSolution[146].SmbD[0, 0:230].reshape(1, - 1), + md.results.TransientSolution[146].SmbRe[0, 0:230].reshape(1, - 1), + md.results.TransientSolution[146].SmbGdn[0, 0:230].reshape(1, - 1), + md.results.TransientSolution[146].SmbGsp[0, 0:230].reshape(1, - 1), + md.results.TransientSolution[146].SmbA[0, 0:230].reshape(1, - 1), md.results.TransientSolution[146].SmbEC[0], md.results.TransientSolution[146].SmbMassBalance[0], @@ -113,11 +117,11 @@ md.results.TransientSolution[146].SmbDzAdd[0], md.results.TransientSolution[146].SmbFAC[0], - md.results.TransientSolution[-1].SmbDz[0, 0:230].reshape(1, -1), - md.results.TransientSolution[-1].SmbT[0, 0:230].reshape(1, -1), - md.results.TransientSolution[-1].SmbD[0, 0:230].reshape(1, -1), - md.results.TransientSolution[-1].SmbRe[0, 0:230].reshape(1, -1), - md.results.TransientSolution[-1].SmbGdn[0, 0:230].reshape(1, -1), - md.results.TransientSolution[-1].SmbGsp[0, 0:230].reshape(1, -1), - md.results.TransientSolution[-1].SmbA[0, 0:230].reshape(1, -1), + md.results.TransientSolution[-1].SmbDz[0, 0:230].reshape(1, - 1), + md.results.TransientSolution[-1].SmbT[0, 0:230].reshape(1, - 1), + md.results.TransientSolution[-1].SmbD[0, 0:230].reshape(1, - 1), + md.results.TransientSolution[-1].SmbRe[0, 0:230].reshape(1, - 1), + md.results.TransientSolution[-1].SmbGdn[0, 0:230].reshape(1, - 1), + md.results.TransientSolution[-1].SmbGsp[0, 0:230].reshape(1, - 1), + md.results.TransientSolution[-1].SmbA[0, 0:230].reshape(1, - 1), md.results.TransientSolution[-1].SmbEC[0], md.results.TransientSolution[-1].SmbMassBalance[0], Index: /issm/trunk-jpl/test/NightlyRun/test260.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test260.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test260.py (revision 24214) @@ -13,7 +13,7 @@ md = setmask(md, 'all', '') md.materials = matenhancedice() -md.materials.rheology_B = 3.15e8 * np.ones(md.mesh.numberofvertices,) -md.materials.rheology_n = 3 * np.ones(md.mesh.numberofelements,) -md.materials.rheology_E = np.ones(md.mesh.numberofvertices,) +md.materials.rheology_B = 3.15e8 * np.ones(md.mesh.numberofvertices, ) +md.materials.rheology_n = 3 * np.ones(md.mesh.numberofelements, ) +md.materials.rheology_E = np.ones(md.mesh.numberofvertices, ) md = parameterize(md, '../Par/SquareShelf.py') md = setflowequation(md, 'SSA', 'all') Index: /issm/trunk-jpl/test/NightlyRun/test261.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test261.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test261.py (revision 24214) @@ -17,7 +17,7 @@ md.cluster = generic('name', gethostname(), 'np', 3) md.materials = matenhancedice() -md.materials.rheology_B = 3.15e8 * np.ones(md.mesh.numberofvertices,) -md.materials.rheology_n = 3 * np.ones(md.mesh.numberofelements,) -md.materials.rheology_E = np.ones(md.mesh.numberofvertices,) +md.materials.rheology_B = 3.15e8 * np.ones(md.mesh.numberofvertices, ) +md.materials.rheology_n = 3 * np.ones(md.mesh.numberofelements, ) +md.materials.rheology_E = np.ones(md.mesh.numberofvertices, ) md.transient.isstressbalance = 1 md.transient.ismasstransport = 0 Index: /issm/trunk-jpl/test/NightlyRun/test272.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test272.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test272.py (revision 24214) @@ -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/test293.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test293.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test293.py (revision 24214) @@ -19,5 +19,5 @@ md.basalforcings = md.basalforcings.initialize(md) md.transient.isgroundingline = 1 -md.geometry.bed = min(md.geometry.base) * np.ones(md.mesh.numberofvertices,) +md.geometry.bed = min(md.geometry.base) * np.ones(md.mesh.numberofvertices, ) md.transient.requested_outputs = ['default', 'BasalforcingsFloatingiceMeltingRate'] Index: /issm/trunk-jpl/test/NightlyRun/test3015.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test3015.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test3015.py (revision 24214) @@ -14,5 +14,5 @@ #This test runs test3005 with autodiff on, and checks that -#the value of the scalar forward difference match a step-wise differential +#the value of the scalar forward difference match a step - wise differential #First configure @@ -34,5 +34,5 @@ index = index - 1 -#parameters for the step-wise derivative +#parameters for the step - wise derivative delta = 0.001 h1 = md.geometry.thickness[index] @@ -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) @@ -82,5 +82,5 @@ dVdh_ad = md.results.MasstransportSolution.AutodiffJacobian -print("dV/dh: analytical: %16.16g\n using adolc: %16.16g\n" % (dVdh_an, dVdh_ad)) +print("dV / dh: analytical: %16.16g\n using adolc: %16.16g\n" % (dVdh_an, dVdh_ad)) #Fields and tolerances to track changes Index: /issm/trunk-jpl/test/NightlyRun/test3020.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test3020.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test3020.py (revision 24214) @@ -14,5 +14,5 @@ #This test runs test3020 with autodiff on, and checks that -#the value of the scalar forward difference match a step-wise differential +#the value of the scalar forward difference match a step - wise differential #First configure @@ -36,5 +36,5 @@ index = index - 1 -#parameters for the step-wise derivative +#parameters for the step - wise derivative delta = 0.00001 h1 = md.geometry.thickness[index] @@ -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) @@ -88,9 +88,9 @@ dMaxVdh_ad = md.results.TransientSolution[0].AutodiffJacobian[1] -print("dV/dh: analytical: %16.16g\n using adolc: %16.16g\n" % (dVdh_an, dVdh_ad)) -print("dMaxV/dh: analytical: %16.16g\n using adolc: %16.16g\n" % (dMaxVdh_an, dMaxVdh_ad)) +print("dV / dh: analytical: %16.16g\n using adolc: %16.16g\n" % (dVdh_an, dVdh_ad)) +print("dMaxV / dh: analytical: %16.16g\n using adolc: %16.16g\n" % (dMaxVdh_an, dMaxVdh_ad)) #Fields and tolerances to track changes -field_names = ['dV/dh-dV/dh0', 'dMaxV/dh-dMaxV/dh0'] +field_names = ['dV/dh - dV / dh0', 'dMaxV/dh - dMaxV / dh0'] field_tolerances = [1e-13, 1e-13] field_values = [dVdh_ad - dVdh_an, dMaxVdh_an - dMaxVdh_ad] Index: /issm/trunk-jpl/test/NightlyRun/test319.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test319.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test319.py (revision 24214) @@ -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 24213) +++ /issm/trunk-jpl/test/NightlyRun/test320.py (revision 24214) @@ -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 24213) +++ /issm/trunk-jpl/test/NightlyRun/test321.py (revision 24214) @@ -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 24213) +++ /issm/trunk-jpl/test/NightlyRun/test322.py (revision 24214) @@ -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 24213) +++ /issm/trunk-jpl/test/NightlyRun/test328.py (revision 24214) @@ -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/test330.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test330.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test330.py (revision 24214) @@ -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 24213) +++ /issm/trunk-jpl/test/NightlyRun/test3300.py (revision 24214) @@ -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 @@ -63,10 +63,10 @@ # totvol = np.zeros(4001) # time = np.arange(0.002, 8.001, 0.002) -# store = md.constants.g*md.hydrology.sediment_porosity*md.materials.rho_freshwater*((md.hydrology.sediment_compressibility/md.hydrology.sediment_porosity)+md.hydrology.water_compressibility) -# sedstore = 20.0*store +# store = md.constants.g * md.hydrology.sediment_porosity * md.materials.rho_freshwater * ((md.hydrology.sediment_compressibility / md.hydrology.sediment_porosity) + md.hydrology.water_compressibility) +# sedstore = 20.0 * store # for i in range(0, 4000): -# sedvol[i]=np.mean(md.results.TransientSolution[i].SedimentHead)*sedstore -# eplvol[i]=np.mean(md.results.TransientSolution[i].EplHead)*store*np.mean(md.results.TransientSolution[i].HydrologydcEplThicknessHydrostep) -# totvol[i+1]=totvol[i]+md.basalforcings.groundedice_melting_rate[0, i]*0.002 +# sedvol[i] = np.mean(md.results.TransientSolution[i].SedimentHead) * sedstore +# eplvol[i] = np.mean(md.results.TransientSolution[i].EplHead) * store * np.mean(md.results.TransientSolution[i].HydrologydcEplThicknessHydrostep) +# totvol[i + 1] = totvol[i] + md.basalforcings.groundedice_melting_rate[0, i] * 0.002 field_names = ['SedimentWaterHead5', 'EplWaterHead5', 'SedimentWaterHead40', 'EplWaterHead40'] Index: /issm/trunk-jpl/test/NightlyRun/test332.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test332.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test332.py (revision 24214) @@ -43,5 +43,5 @@ #you can also compare with an analitic solution, but it is exact #only if no limits are applied -#analitic=(md.mesh.y**2-2*md.mesh.y*1.0e6)*(-2.0/(2*md.constants.yts*md.hydrology.sediment_transmitivity)) +#analitic=(md.mesh.y**2 - 2 * md.mesh.y * 1.0e6) * (- 2.0 / (2 * md.constants.yts * md.hydrology.sediment_transmitivity)) field_names = ['SedimentWaterHead', 'SedimentHeadResidual'] field_tolerances = [1e-13, 3e-10] Index: /issm/trunk-jpl/test/NightlyRun/test334.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test334.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test334.py (revision 24214) @@ -43,5 +43,5 @@ #you can also compare with an analitic solution, but it is exact #only if no limits are applied -#analitic=(md.mesh.y.^2-2*md.mesh.y*1.0e6)*(-2.0/(2*md.constants.yts*md.hydrology.sediment_transmitivity)) +#analitic=(md.mesh.y.^2 - 2 * md.mesh.y * 1.0e6) * (- 2.0 / (2 * md.constants.yts * md.hydrology.sediment_transmitivity)) field_names = ['SedimentWaterHead', 'SedimentHeadResidual'] field_tolerances = [1e-13, 3e-10] Index: /issm/trunk-jpl/test/NightlyRun/test336.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test336.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test336.py (revision 24214) @@ -22,5 +22,5 @@ #Set up transient smb = np.ones((md.mesh.numberofvertices)) * 3.6 -smb = np.vstack((smb, smb * -1.)).T +smb = np.vstack((smb, smb * - 1.)).T md.smb = SMBcomponents() Index: /issm/trunk-jpl/test/NightlyRun/test337.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test337.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test337.py (revision 24214) @@ -23,5 +23,5 @@ #Set up transient smb = np.ones((md.mesh.numberofvertices)) * 3.6 -smb = np.vstack((smb, smb * -1.)).T +smb = np.vstack((smb, smb * - 1.)).T md.smb = SMBcomponents() Index: /issm/trunk-jpl/test/NightlyRun/test338.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test338.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test338.py (revision 24214) @@ -22,5 +22,5 @@ #Set up transient smb = np.ones((md.mesh.numberofvertices)) * 3.6 -smb = np.vstack((smb, smb * -1.)).T +smb = np.vstack((smb, smb * - 1.)).T md.smb = SMBmeltcomponents() Index: /issm/trunk-jpl/test/NightlyRun/test341.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test341.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test341.py (revision 24214) @@ -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/test342.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test342.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test342.py (revision 24214) @@ -15,6 +15,6 @@ md.basalforcings = plumebasalforcings() md.basalforcings = md.basalforcings.setdefaultparameters() -md.basalforcings.floatingice_melting_rate = np.zeros((md.mesh.numberofvertices,)) -md.basalforcings.groundedice_melting_rate = np.zeros((md.mesh.numberofvertices,)) +md.basalforcings.floatingice_melting_rate = np.zeros((md.mesh.numberofvertices, )) +md.basalforcings.groundedice_melting_rate = np.zeros((md.mesh.numberofvertices, )) md.basalforcings.plumex = 500000 md.basalforcings.plumey = 500000 Index: /issm/trunk-jpl/test/NightlyRun/test343.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test343.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test343.py (revision 24214) @@ -15,9 +15,9 @@ md = setflowequation(md, 'SSA', 'all') md.smb = SMBgradientsela() -md.smb.ela = 1500. * np.ones((md.mesh.numberofvertices + 1,)) -md.smb.b_pos = 0.002 * np.ones((md.mesh.numberofvertices + 1,)) -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.ela = 1500. * np.ones((md.mesh.numberofvertices + 1, )) +md.smb.b_pos = 0.002 * np.ones((md.mesh.numberofvertices + 1, )) +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, )) #Change geometry Index: /issm/trunk-jpl/test/NightlyRun/test344.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test344.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test344.py (revision 24214) @@ -21,9 +21,9 @@ md = setflowequation(md, 'HO', 'all') md.smb = SMBgradientsela() -md.smb.ela = 1500. * np.ones((md.mesh.numberofvertices + 1,)) -md.smb.b_pos = 0.002 * np.ones((md.mesh.numberofvertices + 1,)) -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.ela = 1500. * np.ones((md.mesh.numberofvertices + 1, )) +md.smb.b_pos = 0.002 * np.ones((md.mesh.numberofvertices + 1, )) +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, )) Index: /issm/trunk-jpl/test/NightlyRun/test346.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test346.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test346.py (revision 24214) @@ -1,4 +1,3 @@ -#Test Name: SquareSheetConstrainedTherTranNyeCO2 -import numpy as np +#Test Name: SquareSheetConstrainedTherTranNyeCO2 from model import * from socket import gethostname @@ -18,15 +17,15 @@ #Transient options md.cluster = generic('name', gethostname(), 'np', 3) -md.materials.rheology_law='NyeCO2' -md.transient.isstressbalance=0 -md.transient.ismasstransport=0 -md.transient.issmb=1 -md.transient.isthermal=1 -md.transient.isgroundingline=0 +md.materials.rheology_law = 'NyeCO2' +md.transient.isstressbalance = 0 +md.transient.ismasstransport = 0 +md.transient.issmb = 1 +md.transient.isthermal = 1 +md.transient.isgroundingline = 0 md = solve(md, 'Transient') #Fields and tolerances to track changes -field_names = ['Temperature1','BasalforcingsGroundediceMeltingRate1', - 'Temperature3','BasalforcingsGroundediceMeltingRate3'] +field_names = ['Temperature1', 'BasalforcingsGroundediceMeltingRate1', + 'Temperature3', 'BasalforcingsGroundediceMeltingRate3'] field_tolerances = [1e-13, 1e-13, 1e-13, 1e-13] field_values = [md.results.TransientSolution[0].Temperature, Index: /issm/trunk-jpl/test/NightlyRun/test347.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test347.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test347.py (revision 24214) @@ -1,4 +1,3 @@ -#Test Name: SquareSheetConstrainedTherTranNyeH2O -import numpy as np +#Test Name: SquareSheetConstrainedTherTranNyeH2O from model import * from socket import gethostname @@ -19,17 +18,17 @@ #Transient options md.cluster = generic('name', gethostname(), 'np', 3) -md.materials.rheology_law='NyeH2O' -md.materials.rheology_B=nye(md.initialization.temperature,2) +md.materials.rheology_law = 'NyeH2O' +md.materials.rheology_B = nye(md.initialization.temperature, 2) -md.transient.isstressbalance=0 -md.transient.ismasstransport=0 -md.transient.issmb=1 -md.transient.isthermal=1 -md.transient.isgroundingline=0 +md.transient.isstressbalance = 0 +md.transient.ismasstransport = 0 +md.transient.issmb = 1 +md.transient.isthermal = 1 +md.transient.isgroundingline = 0 md = solve(md, 'Transient') #Fields and tolerances to track changes -field_names = ['Temperature1','BasalforcingsGroundediceMeltingRate1', - 'Temperature3','BasalforcingsGroundediceMeltingRate3'] +field_names = ['Temperature1', 'BasalforcingsGroundediceMeltingRate1', + 'Temperature3', 'BasalforcingsGroundediceMeltingRate3'] field_tolerances = [1e-13, 1e-13, 1e-13, 1e-13] field_values = [md.results.TransientSolution[0].Temperature, Index: /issm/trunk-jpl/test/NightlyRun/test350.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test350.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test350.py (revision 24214) @@ -30,6 +30,6 @@ #Change geometry -md.geometry.base = -.02 * md.mesh.x + 20. -md.geometry.thickness = 300. * np.ones((md.mesh.numberofvertices,)) +md.geometry.base = - .02 * md.mesh.x + 20. +md.geometry.thickness = 300. * np.ones((md.mesh.numberofvertices, )) md.geometry.bed = md.geometry.base md.geometry.surface = md.geometry.bed + md.geometry.thickness @@ -37,20 +37,20 @@ #define the initial water head as being such that the water pressure is 50% of the ice overburden pressure md.hydrology.head = 0.5 * md.materials.rho_ice / md.materials.rho_freshwater * md.geometry.thickness + md.geometry.base -md.hydrology.gap_height = 0.01 * np.ones((md.mesh.numberofelements,)) -md.hydrology.bump_spacing = 2 * np.ones((md.mesh.numberofelements,)) -md.hydrology.bump_height = 0.05 * np.ones((md.mesh.numberofelements,)) -md.hydrology.englacial_input = 0.5 * np.ones((md.mesh.numberofvertices,)) -md.hydrology.reynolds = 1000. * np.ones((md.mesh.numberofelements,)) -md.hydrology.spchead = float('NaN') * np.ones((md.mesh.numberofvertices,)) +md.hydrology.gap_height = 0.01 * np.ones((md.mesh.numberofelements, )) +md.hydrology.bump_spacing = 2 * np.ones((md.mesh.numberofelements, )) +md.hydrology.bump_height = 0.05 * np.ones((md.mesh.numberofelements, )) +md.hydrology.englacial_input = 0.5 * np.ones((md.mesh.numberofvertices, )) +md.hydrology.reynolds = 1000. * np.ones((md.mesh.numberofelements, )) +md.hydrology.spchead = float('NaN') * np.ones((md.mesh.numberofvertices, )) pos = np.intersect1d(np.array(np.where(md.mesh.vertexonboundary)), np.array(np.where(md.mesh.x == 1000))) md.hydrology.spchead[pos] = md.geometry.base[pos] #Define velocity -md.initialization.vx = 1e-6 * md.constants.yts * np.ones((md.mesh.numberofvertices,)) -md.initialization.vy = np.zeros((md.mesh.numberofvertices,)) +md.initialization.vx = 1e-6 * md.constants.yts * np.ones((md.mesh.numberofvertices, )) +md.initialization.vy = np.zeros((md.mesh.numberofvertices, )) md.timestepping.time_step = 3. * 3600. / md.constants.yts md.timestepping.final_time = .5 / 365. -md.materials.rheology_B = (5e-25)**(-1. / 3.) * np.ones((md.mesh.numberofvertices,)) +md.materials.rheology_B = (5e-25)**(- 1. / 3.) * np.ones((md.mesh.numberofvertices, )) #Add one moulin and Neumann BC, varying in time Index: /issm/trunk-jpl/test/NightlyRun/test352.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test352.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test352.py (revision 24214) @@ -22,5 +22,5 @@ #Set up transient smb = np.ones((md.mesh.numberofvertices)) * 3.6 -smb = np.vstack((smb, smb * -1.)).T +smb = np.vstack((smb, smb * - 1.)).T md.smb.mass_balance = np.vstack((smb, [1.5, 3.])) md.transient.isthermal = False Index: /issm/trunk-jpl/test/NightlyRun/test353.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test353.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test353.py (revision 24214) @@ -22,5 +22,5 @@ #Set up transient smb = np.ones((md.mesh.numberofvertices)) * 3.6 -smb = np.vstack((smb, smb * -1.)).T +smb = np.vstack((smb, smb * - 1.)).T md.smb = SMBcomponents() Index: /issm/trunk-jpl/test/NightlyRun/test354.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test354.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test354.py (revision 24214) @@ -22,5 +22,5 @@ #Set up transient smb = np.ones((md.mesh.numberofvertices)) * 3.6 -smb = np.vstack((smb, smb * -1.)).T +smb = np.vstack((smb, smb * - 1.)).T md.smb = SMBmeltcomponents() Index: /issm/trunk-jpl/test/NightlyRun/test404.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test404.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test404.py (revision 24214) @@ -19,5 +19,5 @@ #Fields and tolerances to track changes field_names = ['Vx', 'Vy', 'Vz', 'Vel', 'Pressure'] -field_tolerances = [2e-06,4e-06,2e-06,1e-06,8e-07] +field_tolerances = [2e-06, 4e-06, 2e-06, 1e-06, 8e-07] field_values = [md.results.StressbalanceSolution.Vx, md.results.StressbalanceSolution.Vy, Index: /issm/trunk-jpl/test/NightlyRun/test412.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test412.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test412.py (revision 24214) @@ -53,8 +53,8 @@ #imperative! -md.stressbalance.reltol = 10**-5 #tighten for qmu analyses +md.stressbalance.reltol = 10**- 5 #tighten for qmu analyses #solve -md.verbose = verbose('000000000') # this line is recommended +md.verbose = verbose('000000000') # this line is recommended md = solve(md, 'Stressbalance', 'overwrite', 'y') Index: /issm/trunk-jpl/test/NightlyRun/test413.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test413.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test413.py (revision 24214) @@ -51,9 +51,9 @@ #imperative! -md.stressbalance.reltol = 10**-5 #tighten for qmu analyses +md.stressbalance.reltol = 10**- 5 #tighten for qmu analyses md.qmu.isdakota = 1 #solve -md.verbose = verbose('000000000') # this line is recommended +md.verbose = verbose('000000000') # this line is recommended md = solve(md, 'Stressbalance', 'overwrite', 'y') Index: /issm/trunk-jpl/test/NightlyRun/test414.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test414.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test414.py (revision 24214) @@ -20,8 +20,8 @@ md.geometry.surface = md.geometry.base + md.geometry.thickness -#constrain all velocities to 1 m/yr, in the y-direction -md.stressbalance.spcvx = np.zeros((md.mesh.numberofvertices,)) -md.stressbalance.spcvy = np.ones((md.mesh.numberofvertices,)) -md.stressbalance.spcvz = np.zeros((md.mesh.numberofvertices,)) +#constrain all velocities to 1 m / yr, in the y - direction +md.stressbalance.spcvx = np.zeros((md.mesh.numberofvertices, )) +md.stressbalance.spcvy = np.ones((md.mesh.numberofvertices, )) +md.stressbalance.spcvz = np.zeros((md.mesh.numberofvertices, )) #Dakota options @@ -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: @@ -71,12 +71,12 @@ #solve -md.verbose = verbose('000000000') # this line is recommended +md.verbose = verbose('000000000') # this line is recommended md = solve(md, 'Stressbalance', 'overwrite', 'y') md.qmu.results = md.results.dakota #Fields and tolerances to track changes -#ok, mass flux of 3 profiles should be -3 Gt/yr -3 Gt/yr and the sum, which is -6 Gt/yr +#ok, mass flux of 3 profiles should be-3 Gt / yr - 3 Gt / yr and the sum, which is - 6 Gt / yr #we recover those mass fluxes through the mean of the response. -#also, we recover the max velo, which should be 1m/yr. +#also, we recover the max velo, which should be 1m / yr. #we put all that data in the moments, which we will use to test for success. #also, check that the stddev are 0. Index: /issm/trunk-jpl/test/NightlyRun/test415.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test415.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test415.py (revision 24214) @@ -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 24213) +++ /issm/trunk-jpl/test/NightlyRun/test416.py (revision 24214) @@ -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 24213) +++ /issm/trunk-jpl/test/NightlyRun/test417.py (revision 24214) @@ -20,5 +20,5 @@ md.geometry.surface = md.geometry.base + md.geometry.thickness -#constrain all velocities to 1 m/yr, in the y-direction +#constrain all velocities to 1 m / yr, in the y - direction md.stressbalance.spcvx[:] = 0 md.stressbalance.spcvy[:] = 1 @@ -76,12 +76,12 @@ md.qmu.isdakota = 1 -md.stressbalance.reltol = 10**-5 #tighten for qmu analyses +md.stressbalance.reltol = 10**- 5 #tighten for qmu analyses #solve -md.verbose = verbose('000000000') # this line is recommended +md.verbose = verbose('000000000') # this line is recommended # There may be a pair of numpy warnings in the function true_divide, # this is normal and will not affect the results -# See src/m/qmu/dakota_out_parse.py, function "dak_tab_out" for details +# See src / m / qmu / dakota_out_parse.py, function "dak_tab_out" for details md = solve(md, 'Stressbalance', 'overwrite', 'y') @@ -89,7 +89,7 @@ md.qmu.results = md.results.dakota -#ok, mass flux of 3 profiles should be -3 Gt/yr -3 Gt/yr and the sum, which is -6 Gt/yr +#ok, mass flux of 3 profiles should be-3 Gt / yr - 3 Gt / yr and the sum, which is - 6 Gt / yr #we recover those mass fluxes through the mean of the response. -#also, we recover the max velo, which should be 1m/yr. +#also, we recover the max velo, which should be 1m / yr. #we put all that data in the montecarlo field, which we will use to test for success. #also, check that the stddev are 0. Index: /issm/trunk-jpl/test/NightlyRun/test418.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test418.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test418.py (revision 24214) @@ -1,6 +1,4 @@ #Test Name: SquareSheetShelfDiadSSA3dDakotaAreaAverage - # this test may crash - import numpy as np from model import * @@ -25,14 +23,12 @@ #partitioning md.qmu.numberofpartitions = 100 - +#partitioner seamd to generate the following message: #corrupted size vs. prev_size #Aborted (core dumped) md = partitioner(md, 'package', 'chaco', 'npart', md.qmu.numberofpartitions) - md.qmu.vpartition = md.qmu.vpartition - 1 -vector = np.arange(1, 1 + md.mesh.numberofvertices, 1).reshape(-1, 1) +vector = np.arange(1, 1 + md.mesh.numberofvertices, 1).reshape(- 1, 1) # double check this before committing: -#print 'before AreaAverageOntoPartition' vector_on_partition = AreaAverageOntoPartition(md, vector) vector_on_nodes = vector_on_partition[md.qmu.vpartition] Index: /issm/trunk-jpl/test/NightlyRun/test420.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test420.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test420.py (revision 24214) @@ -50,13 +50,13 @@ #imperative! -md.stressbalance.reltol = 10**-5 #tighten for qmu analysese +md.stressbalance.reltol = 10**- 5 #tighten for qmu analysese #solve -md.verbose = verbose('000000000') # this line is recommended +md.verbose = verbose('000000000') # this line is recommended md = solve(md, 'Stressbalance', 'overwrite', 'y') md.qmu.results = md.results.dakota #test on thickness -h = np.zeros((md.qmu.numberofpartitions,)) +h = np.zeros((md.qmu.numberofpartitions, )) for i in range(md.qmu.numberofpartitions): h[i] = md.qmu.results.dresp_out[i].mean Index: /issm/trunk-jpl/test/NightlyRun/test423.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test423.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test423.py (revision 24214) @@ -18,5 +18,5 @@ pos = np.argmin(rad) md.mesh.x[pos] = 0. -md.mesh.y[pos] = 0. #the closest node to the center is changed to be exactly at the center +md.mesh.y[pos] = 0. #the closest node to the center is changed to be exactly at the center xelem = np.mean(md.mesh.x[md.mesh.elements.astype(int) - 1], axis=1) yelem = np.mean(md.mesh.y[md.mesh.elements.astype(int) - 1], axis=1) Index: /issm/trunk-jpl/test/NightlyRun/test424.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test424.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test424.py (revision 24214) @@ -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 24213) +++ /issm/trunk-jpl/test/NightlyRun/test425.py (revision 24214) @@ -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 24213) +++ /issm/trunk-jpl/test/NightlyRun/test426.py (revision 24214) @@ -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 24213) +++ /issm/trunk-jpl/test/NightlyRun/test427.py (revision 24214) @@ -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 24213) +++ /issm/trunk-jpl/test/NightlyRun/test430.py (revision 24214) @@ -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') @@ -30,15 +30,15 @@ md.stressbalance.spcvz[:] = float('NaN') posA = np.intersect1d(np.array(np.where(md.mesh.y < 1000000.1)), np.array(np.where(md.mesh.y > 999999.9))) -posB = np.intersect1d(np.array(np.where(md.mesh.y < 0.1)), np.array(np.where(md.mesh.y > -0.1))) +posB = np.intersect1d(np.array(np.where(md.mesh.y < 0.1)), np.array(np.where(md.mesh.y > - 0.1))) pos = np.unique(np.concatenate((posA, posB))) md.stressbalance.spcvy[pos] = 0. -pos2 = np.intersect1d(np.array(np.where(md.mesh.x < 0.1)), np.array(np.where(md.mesh.x > -0.1))) +pos2 = np.intersect1d(np.array(np.where(md.mesh.x < 0.1)), np.array(np.where(md.mesh.x > - 0.1))) md.stressbalance.spcvx[pos2] = 0. 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,)) -md.friction.p = 3. * np.ones((md.mesh.numberofelements,)) +md.friction.coefficient[:] = np.sqrt(10**7) * np.ones((md.mesh.numberofvertices, )) +md.friction.p = 3. * np.ones((md.mesh.numberofelements, )) md.smb.mass_balance[:] = 1. md.basalforcings.groundedice_melting_rate[:] = 0. Index: /issm/trunk-jpl/test/NightlyRun/test433.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test433.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test433.py (revision 24214) @@ -18,5 +18,5 @@ pos = np.argmin(rad) md.mesh.x[pos] = 0. -md.mesh.y[pos] = 0. #the closest node to the center is changed to be exactly at the center +md.mesh.y[pos] = 0. #the closest node to the center is changed to be exactly at the center xelem = np.mean(md.mesh.x[md.mesh.elements.astype(int) - 1], axis=1) yelem = np.mean(md.mesh.y[md.mesh.elements.astype(int) - 1], axis=1) Index: /issm/trunk-jpl/test/NightlyRun/test435.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test435.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test435.py (revision 24214) @@ -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') @@ -31,15 +31,15 @@ md.stressbalance.spcvz[:] = float('Nan') posA = np.intersect1d(np.array(np.where(md.mesh.y < 1000000.1)), np.array(np.where(md.mesh.y > 999999.9))) -posB = np.intersect1d(np.array(np.where(md.mesh.y < 0.1)), np.array(np.where(md.mesh.y > -0.1))) +posB = np.intersect1d(np.array(np.where(md.mesh.y < 0.1)), np.array(np.where(md.mesh.y > - 0.1))) pos = np.unique(np.concatenate((posA, posB))) md.stressbalance.spcvy[pos] = 0. -pos2 = np.intersect1d(np.array(np.where(md.mesh.x < 0.1)), np.array(np.where(md.mesh.x > -0.1))) +pos2 = np.intersect1d(np.array(np.where(md.mesh.x < 0.1)), np.array(np.where(md.mesh.x > - 0.1))) md.stressbalance.spcvx[pos2] = 0. 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,)) -md.friction.p = 3. * np.ones((md.mesh.numberofelements,)) +md.friction.coefficient[:] = np.sqrt(1e7) * np.ones((md.mesh.numberofvertices, )) +md.friction.p = 3. * np.ones((md.mesh.numberofelements, )) md.smb.mass_balance[:] = 1. md.basalforcings.groundedice_melting_rate[:] = 0. Index: /issm/trunk-jpl/test/NightlyRun/test436.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test436.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test436.py (revision 24214) @@ -17,6 +17,6 @@ md.timestepping.time_step = 0. md.thermal.isenthalpy = 1 -md.initialization.waterfraction = np.zeros((md.mesh.numberofvertices,)) -md.initialization.watercolumn = np.zeros((md.mesh.numberofvertices,)) +md.initialization.waterfraction = np.zeros((md.mesh.numberofvertices, )) +md.initialization.watercolumn = np.zeros((md.mesh.numberofvertices, )) #Go solve @@ -26,5 +26,5 @@ for i in ['LliboutryDuval', 'CuffeyTemperate']: print(' ') - print('====== Testing rheology law: ' + i + ' =') + print(' == == == Testing rheology law: ' + i + ' = ') md.materials.rheology_law = i Index: /issm/trunk-jpl/test/NightlyRun/test437.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test437.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test437.py (revision 24214) @@ -14,6 +14,6 @@ h = 100. -md.geometry.thickness = h * np.ones((md.mesh.numberofvertices,)) -md.geometry.base = -h * np.ones((md.mesh.numberofvertices,)) +md.geometry.thickness = h * np.ones((md.mesh.numberofvertices, )) +md.geometry.base = - h * np.ones((md.mesh.numberofvertices, )) md.geometry.surface = md.geometry.base + md.geometry.thickness @@ -27,5 +27,5 @@ Tb = 273.15 - 1. Tsw = Tb -qgeo = md.materials.thermalconductivity / max(md.geometry.thickness) * (Tb - Ts) #qgeo = kappa*(Tb-Ts)/H +qgeo = md.materials.thermalconductivity / max(md.geometry.thickness) * (Tb - Ts) #qgeo = kappa * (Tb - Ts) / H md.basalforcings.geothermalflux[np.where(md.mesh.vertexonbase)] = qgeo md.initialization.temperature = qgeo / md.materials.thermalconductivity * (md.geometry.surface - md.mesh.z) + Ts @@ -33,6 +33,6 @@ #Surface forcing pos = np.where(md.mesh.vertexonsurface) -SPC_cold = float('NaN') * np.ones((md.mesh.numberofvertices,)) -SPC_warm = float('NaN') * np.ones((md.mesh.numberofvertices,)) +SPC_cold = float('NaN') * np.ones((md.mesh.numberofvertices, )) +SPC_warm = float('NaN') * np.ones((md.mesh.numberofvertices, )) SPC_cold[pos] = Ts SPC_warm[pos] = Tsw Index: /issm/trunk-jpl/test/NightlyRun/test440.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test440.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test440.py (revision 24214) @@ -51,8 +51,8 @@ #imperative! -md.stressbalance.reltol = 10**-5 #tighten for qmu analysese +md.stressbalance.reltol = 10**- 5 #tighten for qmu analysese #solve -md.verbose = verbose('000000000') # this line is recommended +md.verbose = verbose('000000000') # this line is recommended md = solve(md, 'Stressbalance', 'overwrite', 'y') md.qmu.results = md.results.dakota Index: /issm/trunk-jpl/test/NightlyRun/test441.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test441.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test441.py (revision 24214) @@ -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') @@ -30,15 +30,15 @@ md.stressbalance.spcvz[:] = float('Nan') posA = np.intersect1d(np.array(np.where(md.mesh.y < 1000000.1)), np.array(np.where(md.mesh.y > 999999.9))) -posB = np.intersect1d(np.array(np.where(md.mesh.y < 0.1)), np.array(np.where(md.mesh.y > -0.1))) +posB = np.intersect1d(np.array(np.where(md.mesh.y < 0.1)), np.array(np.where(md.mesh.y > - 0.1))) pos = np.unique(np.concatenate((posA, posB))) md.stressbalance.spcvy[pos] = 0. -pos2 = np.intersect1d(np.array(np.where(md.mesh.x < 0.1)), np.array(np.where(md.mesh.x > -0.1))) +pos2 = np.intersect1d(np.array(np.where(md.mesh.x < 0.1)), np.array(np.where(md.mesh.x > - 0.1))) md.stressbalance.spcvx[pos2] = 0. 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,)) -md.friction.p = 3. * np.ones((md.mesh.numberofelements,)) +md.friction.coefficient[:] = np.sqrt(1e7) * np.ones((md.mesh.numberofvertices, )) +md.friction.p = 3. * np.ones((md.mesh.numberofelements, )) md.smb.mass_balance[:] = 1. md.basalforcings.groundedice_melting_rate[:] = 0. Index: /issm/trunk-jpl/test/NightlyRun/test442.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test442.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test442.py (revision 24214) @@ -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') @@ -31,15 +31,15 @@ md.stressbalance.spcvz[:] = float('Nan') posA = np.intersect1d(np.array(np.where(md.mesh.y < 1000000.1)), np.array(np.where(md.mesh.y > 999999.9))) -posB = np.intersect1d(np.array(np.where(md.mesh.y < 0.1)), np.array(np.where(md.mesh.y > -0.1))) +posB = np.intersect1d(np.array(np.where(md.mesh.y < 0.1)), np.array(np.where(md.mesh.y > - 0.1))) pos = np.unique(np.concatenate((posA, posB))) md.stressbalance.spcvy[pos] = 0. -pos2 = np.intersect1d(np.array(np.where(md.mesh.x < 0.1)), np.array(np.where(md.mesh.x > -0.1))) +pos2 = np.intersect1d(np.array(np.where(md.mesh.x < 0.1)), np.array(np.where(md.mesh.x > - 0.1))) md.stressbalance.spcvx[pos2] = 0. 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,)) -md.friction.p = 3. * np.ones((md.mesh.numberofelements,)) +md.friction.coefficient[:] = np.sqrt(1e7) * np.ones((md.mesh.numberofvertices, )) +md.friction.p = 3. * np.ones((md.mesh.numberofelements, )) md.smb.mass_balance[:] = 1. md.basalforcings.groundedice_melting_rate[:] = 0. Index: /issm/trunk-jpl/test/NightlyRun/test444.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test444.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test444.py (revision 24214) @@ -21,7 +21,7 @@ pos = np.where(md.mask.groundedice_levelset < 0) md.geometry.bed[pos] = md.geometry.base[pos] - 10 -md.friction.coefficient = 20. * np.ones((md.mesh.numberofvertices,)) -md.friction.p = np.ones((md.mesh.numberofelements,)) -md.friction.q = np.ones((md.mesh.numberofelements,)) +md.friction.coefficient = 20. * np.ones((md.mesh.numberofvertices, )) +md.friction.p = np.ones((md.mesh.numberofelements, )) +md.friction.q = np.ones((md.mesh.numberofelements, )) md.transient.isthermal = 0 md.transient.isgroundingline = 1 @@ -32,5 +32,5 @@ md.cluster = generic('name', oshostname(), 'np', 3) -regionalmask = np.zeros((md.mesh.numberofvertices,)) +regionalmask = np.zeros((md.mesh.numberofvertices, )) c_in = ContourToMesh(md.mesh.elements, md.mesh.x, md.mesh.y, '../Exp/SquareHalfRight.exp', 'node', 1) regionalmask[np.where(c_in)] = 1 @@ -104,8 +104,8 @@ md.qmu.isdakota = 1 -md.stressbalance.reltol = 10**-5 #tighten for qmu analyses +md.stressbalance.reltol = 10**- 5 #tighten for qmu analyses #solve -md.verbose = verbose('000000000') # this line is recommended +md.verbose = verbose('000000000') # this line is recommended md = solve(md, 'Transient', 'overwrite', 'y') Index: /issm/trunk-jpl/test/NightlyRun/test445.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test445.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test445.py (revision 24214) @@ -75,9 +75,9 @@ md.qmu.isdakota = 1 -md.stressbalance.reltol = 10**-5 #tighten for qmu analyses +md.stressbalance.reltol = 10**- 5 #tighten for qmu analyses #solve -md.verbose = verbose('000000000') # this line is recommended +md.verbose = verbose('000000000') # this line is recommended md = solve(md, 'Steadystate', 'overwrite', 'y') Index: /issm/trunk-jpl/test/NightlyRun/test460.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test460.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test460.py (revision 24214) @@ -15,7 +15,7 @@ md = md.extrude(3, 1.) md.materials = matestar() -md.materials.rheology_B = 3.15e8 * np.ones((md.mesh.numberofvertices,)) -md.materials.rheology_Ec = np.ones((md.mesh.numberofvertices,)) -md.materials.rheology_Es = 3 * np.ones((md.mesh.numberofvertices,)) +md.materials.rheology_B = 3.15e8 * np.ones((md.mesh.numberofvertices, )) +md.materials.rheology_Ec = np.ones((md.mesh.numberofvertices, )) +md.materials.rheology_Es = 3 * np.ones((md.mesh.numberofvertices, )) md.cluster = generic('name', gethostname(), 'np', 3) @@ -24,10 +24,10 @@ field_tolerances = [] field_values = [] -#md.initialization.pressure = md.constants.g*md.materials.rho_ice*(md.geometry.surface-md.mesh.y); +#md.initialization.pressure = md.constants.g * md.materials.rho_ice * (md.geometry.surface - md.mesh.y) for i in ['SSA', 'HO', 'FS']: md = setflowequation(md, i, 'all') md = solve(md, 'Stressbalance') field_names = field_names + ['Vx' + i, 'Vy' + i, 'Vz' + i, 'Vel' + i, 'Pressure' + i] - field_tolerances = field_tolerances + [7e-06,2e-05,2e-06,5e-06,8e-07] + field_tolerances = field_tolerances + [7e-06, 2e-05, 2e-06, 5e-06, 8e-07] field_values = field_values + [md.results.StressbalanceSolution.Vx, md.results.StressbalanceSolution.Vy, Index: /issm/trunk-jpl/test/NightlyRun/test461.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test461.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test461.py (revision 24214) @@ -15,11 +15,11 @@ md = md.extrude(3, 1.) md.materials = matestar() -md.materials.rheology_B = 3.15e8 * np.ones((md.mesh.numberofvertices,)) -md.materials.rheology_Ec = np.ones((md.mesh.numberofvertices,)) -md.materials.rheology_Es = 3. * np.ones((md.mesh.numberofvertices,)) +md.materials.rheology_B = 3.15e8 * np.ones((md.mesh.numberofvertices, )) +md.materials.rheology_Ec = np.ones((md.mesh.numberofvertices, )) +md.materials.rheology_Es = 3. * np.ones((md.mesh.numberofvertices, )) md = setflowequation(md, 'FS', 'all') -md.initialization.waterfraction = np.zeros((md.mesh.numberofvertices,)) -md.initialization.watercolumn = np.zeros((md.mesh.numberofvertices,)) +md.initialization.waterfraction = np.zeros((md.mesh.numberofvertices, )) +md.initialization.watercolumn = np.zeros((md.mesh.numberofvertices, )) md.transient.isstressbalance = 0 md.transient.ismasstransport = 0 Index: /issm/trunk-jpl/test/NightlyRun/test507.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test507.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test507.py (revision 24214) @@ -21,5 +21,5 @@ field_names = ['Vx1', 'Vy1', 'Vz1', 'Vel1', 'Pressure1', 'Bed1', 'Surface1', 'Thickness1', 'Temperature1', 'BasalforcingsGroundediceMeltingRate1', 'Vx2', 'Vy2', 'Vz2', 'Vel2', 'Pressure2', 'Bed2', 'Surface2', 'Thickness2', 'Temperature2', 'BasalforcingsGroundediceMeltingRate2'] -field_tolerances = [1e-08,1e-08,1e-08,1e-08,1e-08,7e-08,4e-07,2e-07,1e-08,1e-08,4e-06,4e-06,5e-06,5e-06,1e-06,1e-06,2e-06,1e-06,3e-06,1e-06] +field_tolerances = [1e-08, 1e-08, 1e-08, 1e-08, 1e-08, 7e-08, 4e-07, 2e-07, 1e-08, 1e-08, 4e-06, 4e-06, 5e-06, 5e-06, 1e-06, 1e-06, 2e-06, 1e-06, 3e-06, 1e-06] field_values = [md.results.TransientSolution[0].Vx, md.results.TransientSolution[0].Vy, Index: /issm/trunk-jpl/test/NightlyRun/test511.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test511.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test511.py (revision 24214) @@ -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 24213) +++ /issm/trunk-jpl/test/NightlyRun/test512.py (revision 24214) @@ -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 24213) +++ /issm/trunk-jpl/test/NightlyRun/test513.py (revision 24214) @@ -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/test540.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test540.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test540.py (revision 24214) @@ -19,8 +19,8 @@ md.mask.ice_levelset = 1e4 * (md.mask.ice_levelset + 0.5) md.calving = calvingvonmises() -md.frontalforcings.meltingrate = np.zeros((md.mesh.numberofvertices,)) +md.frontalforcings.meltingrate = np.zeros((md.mesh.numberofvertices, )) md.transient.ismovingfront = 1 md.transient.isgroundingline = 1 -md.levelset.spclevelset = float('NaN') * np.ones((md.mesh.numberofvertices,)) +md.levelset.spclevelset = float('NaN') * np.ones((md.mesh.numberofvertices, )) pos = np.where(md.mesh.vertexonboundary) md.levelset.spclevelset[pos] = md.mask.ice_levelset[pos] Index: /issm/trunk-jpl/test/NightlyRun/test541.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test541.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test541.py (revision 24214) @@ -20,7 +20,7 @@ md.mask.ice_levelset = 1e4 * (md.mask.ice_levelset + 0.5) md.calving = calvingvonmises() -md.frontalforcings.meltingrate = np.zeros((md.mesh.numberofvertices,)) +md.frontalforcings.meltingrate = np.zeros((md.mesh.numberofvertices, )) md.transient.ismovingfront = 1 -md.levelset.spclevelset = float('NaN') * np.ones((md.mesh.numberofvertices,)) +md.levelset.spclevelset = float('NaN') * np.ones((md.mesh.numberofvertices, )) pos = np.where(md.mesh.vertexonboundary) md.levelset.spclevelset[pos] = md.mask.ice_levelset[pos] Index: /issm/trunk-jpl/test/NightlyRun/test611.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test611.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test611.py (revision 24214) @@ -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/test613.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test613.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test613.py (revision 24214) @@ -30,6 +30,6 @@ md.balancethickness.stabilization = 1 md.inversion.gradient_scaling = np.vstack((10. / md.constants.yts * np.ones((md.inversion.nsteps)), 10. / md.constants.yts * np.ones((md.inversion.nsteps)))).T -md.inversion.min_parameters = np.vstack((-2000. * np.ones((md.mesh.numberofvertices)), - 2000. * np.ones((md.mesh.numberofvertices)))).T -md.inversion.max_parameters = np.vstack((+2000. * np.ones((md.mesh.numberofvertices)), + 2000. * np.ones((md.mesh.numberofvertices)))).T +md.inversion.min_parameters = np.vstack((- 2000. * np.ones((md.mesh.numberofvertices)), - 2000. * np.ones((md.mesh.numberofvertices)))).T +md.inversion.max_parameters = np.vstack((+ 2000. * np.ones((md.mesh.numberofvertices)), + 2000. * np.ones((md.mesh.numberofvertices)))).T md.inversion.cost_functions = [201] md.inversion.cost_functions_coefficients = np.ones((md.mesh.numberofvertices, len(md.inversion.cost_functions))) Index: /issm/trunk-jpl/test/NightlyRun/test701.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test701.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test701.py (revision 24214) @@ -9,9 +9,11 @@ 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.) -#Geometry #interp1d returns a function to be called on md.mesh.x +print(isinstance(md, model)) + +#Geometry #interp1d returns a function to be called on md.mesh.x md.geometry.surface = np.interp(md.mesh.x, x, b + h) md.geometry.base = np.interp(md.mesh.x, x, b) @@ -19,33 +21,35 @@ #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 +md.mask.groundedice_levelset = np.zeros((md.mesh.numberofvertices, )) - 0.5 #materials -md.initialization.temperature = (273. - 20.) * np.ones((md.mesh.numberofvertices,)) +md.initialization.temperature = (273. - 20.) * np.ones((md.mesh.numberofvertices, )) md.materials.rheology_B = paterson(md.initialization.temperature) -md.materials.rheology_n = 3. * np.ones((md.mesh.numberofelements,)) +md.materials.rheology_n = 3. * np.ones((md.mesh.numberofelements, )) #friction -md.friction.coefficient = np.zeros((md.mesh.numberofvertices,)) +md.friction.coefficient = np.zeros((md.mesh.numberofvertices, )) md.friction.coefficient[np.where(md.mesh.vertexflags(1))] = 20. -md.friction.p = np.ones((md.mesh.numberofelements,)) -md.friction.q = np.ones((md.mesh.numberofelements,)) +md.friction.p = np.ones((md.mesh.numberofelements, )) +md.friction.q = np.ones((md.mesh.numberofelements, )) #Boundary conditions md.stressbalance.referential = np.nan * np.ones((md.mesh.numberofvertices, 6)) md.stressbalance.loadingforce = 0. * np.ones((md.mesh.numberofvertices, 3)) -md.stressbalance.spcvx = np.nan * np.ones((md.mesh.numberofvertices,)) -md.stressbalance.spcvy = np.nan * np.ones((md.mesh.numberofvertices,)) -md.stressbalance.spcvz = np.nan * np.ones((md.mesh.numberofvertices,)) +md.stressbalance.spcvx = np.nan * np.ones((md.mesh.numberofvertices, )) +md.stressbalance.spcvy = np.nan * np.ones((md.mesh.numberofvertices, )) +md.stressbalance.spcvz = np.nan * np.ones((md.mesh.numberofvertices, )) md.stressbalance.spcvx[np.where(md.mesh.vertexflags(4))] = 0. md.stressbalance.spcvy[np.where(md.mesh.vertexflags(4))] = 0. -md.basalforcings.floatingice_melting_rate = np.zeros((md.mesh.numberofvertices,)) +md.basalforcings.floatingice_melting_rate = np.zeros((md.mesh.numberofvertices, )) #Misc +print(isinstance(md, model)) +print(type(md)) 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 @@ -60,8 +64,8 @@ field_tolerances = [] field_values = [] -#md.initialization.pressure = md.constants.g*md.materials.rho_ice*(md.geometry.surface-md.mesh.y) +#md.initialization.pressure = md.constants.g * md.materials.rho_ice * (md.geometry.surface - md.mesh.y) for i in ['MINI', 'MINIcondensed', 'TaylorHood', 'LATaylorHood', 'CrouzeixRaviart', 'LACrouzeixRaviart']: print(' ') - print('======Testing ' + i + ' Full-Stokes Finite element=====') + print(' == == == Testing ' + i + ' Full - Stokes Finite element == == = ') md.flowequation.fe_FS = i md = solve(md, 'Stressbalance') Index: /issm/trunk-jpl/test/NightlyRun/test702.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test702.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test702.py (revision 24214) @@ -10,5 +10,5 @@ #mesh parameters -x = np.arange(-5, 5.5, .5).T +x = np.arange(- 5, 5.5, .5).T [b, h, sea] = NowickiProfile(x) x = x * 10**3 @@ -25,33 +25,33 @@ #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 #materials -md.initialization.temperature = (273. - 20.) * np.ones((md.mesh.numberofvertices,)) +md.initialization.temperature = (273. - 20.) * np.ones((md.mesh.numberofvertices, )) md.materials.rheology_B = paterson(md.initialization.temperature) -md.materials.rheology_n = 3 * np.ones((md.mesh.numberofelements,)) +md.materials.rheology_n = 3 * np.ones((md.mesh.numberofelements, )) #damage -md.damage.D = np.zeros((md.mesh.numberofvertices,)) -md.damage.spcdamage = float('NaN') * np.ones((md.mesh.numberofvertices,)) +md.damage.D = np.zeros((md.mesh.numberofvertices, )) +md.damage.spcdamage = float('NaN') * np.ones((md.mesh.numberofvertices, )) #friciton -md.friction.coefficient = np.zeros((md.mesh.numberofvertices,)) +md.friction.coefficient = np.zeros((md.mesh.numberofvertices, )) md.friction.coefficient[np.where(md.mesh.vertexflags(1))] = 20 -md.friction.p = np.ones((md.mesh.numberofelements,)) -md.friction.q = np.ones((md.mesh.numberofelements,)) +md.friction.p = np.ones((md.mesh.numberofelements, )) +md.friction.q = np.ones((md.mesh.numberofelements, )) #boundary conditions -md.stressbalance.spcvx = float('NaN') * np.ones((md.mesh.numberofvertices,)) -md.stressbalance.spcvy = float('NaN') * np.ones((md.mesh.numberofvertices,)) -md.stressbalance.spcvz = float('NaN') * np.ones((md.mesh.numberofvertices,)) +md.stressbalance.spcvx = float('NaN') * np.ones((md.mesh.numberofvertices, )) +md.stressbalance.spcvy = float('NaN') * np.ones((md.mesh.numberofvertices, )) +md.stressbalance.spcvz = float('NaN') * np.ones((md.mesh.numberofvertices, )) md.stressbalance.referential = float('NaN') * np.ones((md.mesh.numberofvertices, 6)) md.stressbalance.loadingforce = np.zeros((md.mesh.numberofvertices, 3)) md.stressbalance.spcvx[np.where(md.mesh.vertexflags(4))] = 800. md.stressbalance.spcvy[np.where(md.mesh.vertexflags(4))] = 0. -md.basalforcings.floatingice_melting_rate = np.zeros((md.mesh.numberofvertices,)) +md.basalforcings.floatingice_melting_rate = np.zeros((md.mesh.numberofvertices, )) #misc @@ -73,5 +73,5 @@ for i in ['MINI', 'MINIcondensed', 'TaylorHood', 'XTaylorHood', 'LATaylorHood']: print(' ') - print('======Testing ' + i + ' Full-Stokes Finite element=====') + print(' == == == Testing ' + i + ' Full - Stokes Finite element == == = ') md.flowequation.fe_FS = i md = solve(md, 'Stressbalance') Index: /issm/trunk-jpl/test/NightlyRun/test703.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test703.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test703.py (revision 24214) @@ -9,5 +9,5 @@ #mesh parameters -x = np.arange(-5, 5.5, .5).T +x = np.arange(- 5, 5.5, .5).T [b, h, sea] = NowickiProfile(x) x = x * 10**3 @@ -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/test806.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test806.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test806.py (revision 24214) @@ -24,5 +24,5 @@ #Do not kill ice bergs as all is floating -md.levelset.kill_icebergs=0 +md.levelset.kill_icebergs = 0 md.timestepping.time_step = 10 Index: /issm/trunk-jpl/test/NightlyRun/test807.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test807.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test807.py (revision 24214) @@ -24,5 +24,5 @@ #Do not kill ice bergs as all is floating -md.levelset.kill_icebergs=0 +md.levelset.kill_icebergs = 0 md.timestepping.time_step = 10 Index: /issm/trunk-jpl/test/NightlyRun/test808.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test808.py (revision 24213) +++ /issm/trunk-jpl/test/NightlyRun/test808.py (revision 24214) @@ -17,5 +17,5 @@ #Do not kill ice bergs as all is floating -md.levelset.kill_icebergs=0 +md.levelset.kill_icebergs = 0 x = md.mesh.x @@ -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 @@ -40,6 +40,6 @@ md.calving = calvingminthickness() md.calving.min_thickness = 400 -md.frontalforcings.meltingrate = np.zeros((md.mesh.numberofvertices,)) -md.levelset.spclevelset = float('NaN') * np.ones((md.mesh.numberofvertices,)) +md.frontalforcings.meltingrate = np.zeros((md.mesh.numberofvertices, )) +md.levelset.spclevelset = float('NaN') * np.ones((md.mesh.numberofvertices, )) md.levelset.reinit_frequency = 1 Index: /issm/trunk-jpl/test/Par/79North.py =================================================================== --- /issm/trunk-jpl/test/Par/79North.py (revision 24213) +++ /issm/trunk-jpl/test/Par/79North.py (revision 24214) @@ -11,56 +11,56 @@ #Geometry and observation -x = numpy.array(archread('../Data/79North.arch','x')) -y = numpy.array(archread('../Data/79North.arch','y')) -vx = numpy.array(archread('../Data/79North.arch','vx')); -vy = numpy.array(archread('../Data/79North.arch','vy')); -index = numpy.array(archread('../Data/79North.arch','index')).astype(int); -surface = numpy.array(archread('../Data/79North.arch','surface')); -thickness = numpy.array(archread('../Data/79North.arch','thickness')); +x = numpy.array(archread('../Data/79North.arch', 'x')) +y = numpy.array(archread('../Data/79North.arch', 'y')) +vx = numpy.array(archread('../Data/79North.arch', 'vx')) +vy = numpy.array(archread('../Data/79North.arch', 'vy')) +index = numpy.array(archread('../Data/79North.arch', 'index')).astype(int) +surface = numpy.array(archread('../Data/79North.arch', 'surface')) +thickness = numpy.array(archread('../Data/79North.arch', 'thickness')) -md.initialization.vx = InterpFromMeshToMesh2d(index,x,y,vx,md.mesh.x,md.mesh.y)[0][:,0] -md.initialization.vy = InterpFromMeshToMesh2d(index,x,y,vy,md.mesh.x,md.mesh.y)[0][:,0] -md.geometry.surface = InterpFromMeshToMesh2d(index,x,y,surface,md.mesh.x,md.mesh.y)[0][:,0] -md.geometry.thickness = InterpFromMeshToMesh2d(index,x,y,thickness,md.mesh.x,md.mesh.y)[0][:,0] -md.geometry.base = md.geometry.surface-md.geometry.thickness +md.initialization.vx = InterpFromMeshToMesh2d(index, x, y, vx, md.mesh.x, md.mesh.y)[0][:, 0] +md.initialization.vy = InterpFromMeshToMesh2d(index, x, y, vy, md.mesh.x, md.mesh.y)[0][:, 0] +md.geometry.surface = InterpFromMeshToMesh2d(index, x, y, surface, md.mesh.x, md.mesh.y)[0][:, 0] +md.geometry.thickness = InterpFromMeshToMesh2d(index, x, y, thickness, md.mesh.x, md.mesh.y)[0][:, 0] +md.geometry.base = md.geometry.surface - md.geometry.thickness #Materials -md.initialization.temperature=(273.-20.)*numpy.ones((md.mesh.numberofvertices)) -md.materials.rheology_B=paterson(md.initialization.temperature) -md.materials.rheology_n=3.*numpy.ones((md.mesh.numberofelements)) -md.initialization.temperature=md.initialization.temperature +md.initialization.temperature = (273. - 20.) * numpy.ones((md.mesh.numberofvertices)) +md.materials.rheology_B = paterson(md.initialization.temperature) +md.materials.rheology_n = 3. * numpy.ones((md.mesh.numberofelements)) +md.initialization.temperature = md.initialization.temperature #Friction -md.friction.coefficient=50.*numpy.ones((md.mesh.numberofvertices)) -md.friction.coefficient[numpy.nonzero(md.mask.groundedice_levelset<0.)[0]]=0. -md.friction.p=numpy.ones((md.mesh.numberofelements)) -md.friction.q=numpy.ones((md.mesh.numberofelements)) +md.friction.coefficient = 50. * numpy.ones((md.mesh.numberofvertices)) +md.friction.coefficient[numpy.nonzero(md.mask.groundedice_levelset < 0.)[0]] = 0. +md.friction.p = numpy.ones((md.mesh.numberofelements)) +md.friction.q = numpy.ones((md.mesh.numberofelements)) #Ice shelf melting and surface mass balance -md.basalforcings.floatingice_melting_rate=numpy.zeros((md.mesh.numberofvertices)) -md.basalforcings.floatingice_melting_rate[numpy.nonzero(md.mask.groundedice_levelset<0.)[0]]=0. -md.basalforcings.groundedice_melting_rate=numpy.zeros((md.mesh.numberofvertices)) -md.smb.mass_balance=15*numpy.ones((md.mesh.numberofvertices)) +md.basalforcings.floatingice_melting_rate = numpy.zeros((md.mesh.numberofvertices)) +md.basalforcings.floatingice_melting_rate[numpy.nonzero(md.mask.groundedice_levelset < 0.)[0]] = 0. +md.basalforcings.groundedice_melting_rate = numpy.zeros((md.mesh.numberofvertices)) +md.smb.mass_balance = 15 * numpy.ones((md.mesh.numberofvertices)) #Numerical parameters -md.masstransport.stabilization=1 -md.thermal.stabilization=1 -md.verbose=verbose(0) -md.settings.waitonlock=30 -md.timestepping.time_step=1. -md.timestepping.final_time=3. -md.stressbalance.restol=0.05 -md.stressbalance.reltol=0.005 -md.steadystate.reltol=0.005 -md.stressbalance.abstol=float('NaN') -md.groundingline.migration='None' +md.masstransport.stabilization = 1 +md.thermal.stabilization = 1 +md.verbose = verbose(0) +md.settings.waitonlock = 30 +md.timestepping.time_step = 1. +md.timestepping.final_time = 3. +md.stressbalance.restol = 0.05 +md.stressbalance.reltol = 0.005 +md.steadystate.reltol = 0.005 +md.stressbalance.abstol = float('NaN') +md.groundingline.migration = 'None' #Boundary conditions: -md=SetMarineIceSheetBC(md) -pos=numpy.nonzero(md.mesh.vertexonboundary) -md.balancethickness.spcthickness[pos]=md.geometry.thickness[pos] -md.masstransport.spcthickness[pos]=md.geometry.thickness[pos] +md = SetMarineIceSheetBC(md) +pos = numpy.nonzero(md.mesh.vertexonboundary) +md.balancethickness.spcthickness[pos] = md.geometry.thickness[pos] +md.masstransport.spcthickness[pos] = md.geometry.thickness[pos] #Change name so that no test have the same name if len(inspect.stack()) > 2: - md.miscellaneous.name = os.path.basename(inspect.stack()[2][1]).split('.')[0] + md.miscellaneous.name = os.path.basename(inspect.stack()[2][1]).split('.')[0] Index: /issm/trunk-jpl/test/Par/GiaIvinsBenchmarksAB.py =================================================================== --- /issm/trunk-jpl/test/Par/GiaIvinsBenchmarksAB.py (revision 24213) +++ /issm/trunk-jpl/test/Par/GiaIvinsBenchmarksAB.py (revision 24214) @@ -13,57 +13,57 @@ nv = md.mesh.numberofvertices if (np.isnan(md.geometry.thickness)): - md.geometry.thickness = np.zeros((md.mesh.numberofvertices,)) + md.geometry.thickness = np.zeros((md.mesh.numberofvertices, )) for i in range(nv): - dist = np.sqrt(md.mesh.x[i]**2 + md.mesh.y[i]**2) - if (dist <= rad): - md.geometry.thickness[i] = 2000.0 - else: - md.geometry.thickness[i] = 1.0 # non-zero thickness + dist = np.sqrt(md.mesh.x[i]**2 + md.mesh.y[i]**2) + if (dist <= rad): + md.geometry.thickness[i] = 2000.0 + else: + md.geometry.thickness[i] = 1.0 # non - zero thickness -md.geometry.thickness = md.geometry.thickness.reshape(-1,1) -md.geometry.base = np.zeros((md.mesh.numberofvertices,)) -md.geometry.surface = md.geometry.thickness + md.geometry.base.reshape(-1,1) #would otherwise create a 91x91 matrix +md.geometry.thickness = md.geometry.thickness.reshape(- 1, 1) +md.geometry.base = np.zeros((md.mesh.numberofvertices, )) +md.geometry.surface = md.geometry.thickness + md.geometry.base.reshape(- 1, 1) #would otherwise create a 91x91 matrix -#Ice density used for benchmarking, not 917 kg/m^3 -md.materials.rho_ice = 1000 #kg m^3 +#Ice density used for benchmarking, not 917 kg / m^3 +md.materials.rho_ice = 1000 #kg m^3 #GIA parameters specific to Experiments A and B -md.gia.mantle_viscosity = 1e21 * np.ones((md.mesh.numberofvertices,)) #in Pa.s -md.gia.lithosphere_thickness = 100 * np.ones((md.mesh.numberofvertices,)) #in km -md.materials.lithosphere_shear_modulus = 6.7*1e10 #in Pa -md.materials.lithosphere_density = 3.36 #in g/cm^3 -md.materials.mantle_shear_modulus = 1.45*1e11 #in Pa -md.materials.mantle_density = 3.38 #in g/cm^3 +md.gia.mantle_viscosity = 1e21 * np.ones((md.mesh.numberofvertices, )) #in Pa.s +md.gia.lithosphere_thickness = 100 * np.ones((md.mesh.numberofvertices, )) #in km +md.materials.lithosphere_shear_modulus = 6.7 * 1e10 #in Pa +md.materials.lithosphere_density = 3.36 #in g / cm^3 +md.materials.mantle_shear_modulus = 1.45 * 1e11 #in Pa +md.materials.mantle_density = 3.38 #in g / cm^3 -#Initial velocity -x = archread('../Data/SquareSheetConstrained.arch','x') -y = archread('../Data/SquareSheetConstrained.arch','y') -vx = archread('../Data/SquareSheetConstrained.arch','vx') -vy = archread('../Data/SquareSheetConstrained.arch','vy') -index = archread('../Data/SquareSheetConstrained.arch','index').astype(int) +#Initial velocity +x = archread('../Data/SquareSheetConstrained.arch', 'x') +y = archread('../Data/SquareSheetConstrained.arch', 'y') +vx = archread('../Data/SquareSheetConstrained.arch', 'vx') +vy = archread('../Data/SquareSheetConstrained.arch', 'vy') +index = archread('../Data/SquareSheetConstrained.arch', 'index').astype(int) -md.initialization.vx = np.array(InterpFromMeshToMesh2d(index,x,y,vx,md.mesh.x,md.mesh.y)).reshape(-1,1) -md.initialization.vy = np.array(InterpFromMeshToMesh2d(index,x,y,vy,md.mesh.x,md.mesh.y)).reshape(-1,1) -vx = None -vy = None -x = None -y = None +md.initialization.vx = np.array(InterpFromMeshToMesh2d(index, x, y, vx, md.mesh.x, md.mesh.y)).reshape(- 1, 1) +md.initialization.vy = np.array(InterpFromMeshToMesh2d(index, x, y, vy, md.mesh.x, md.mesh.y)).reshape(- 1, 1) +vx = None +vy = None +x = None +y = None index = None -md.initialization.vz = np.zeros((md.mesh.numberofvertices,)) -md.initialization.pressure = np.zeros((md.mesh.numberofvertices,)) +md.initialization.vz = np.zeros((md.mesh.numberofvertices, )) +md.initialization.pressure = np.zeros((md.mesh.numberofvertices, )) #Materials -md.initialization.temperature = (273. - 20.) * np.ones((md.mesh.numberofvertices,)) +md.initialization.temperature = (273. - 20.) * np.ones((md.mesh.numberofvertices, )) md.materials.rheology_B = paterson(md.initialization.temperature) -md.materials.rheology_n = 3. * np.ones((md.mesh.numberofelements,)) +md.materials.rheology_n = 3. * np.ones((md.mesh.numberofelements, )) #Friction -md.friction.coefficient = 20. * np.ones((md.mesh.numberofvertices,)) +md.friction.coefficient = 20. * np.ones((md.mesh.numberofvertices, )) md.friction.coefficient[np.where(md.mask.groundedice_levelset < 0.)] = 0. -md.friction.p = np.ones((md.mesh.numberofelements,)) -md.friction.q = np.ones((md.mesh.numberofelements,)) +md.friction.p = np.ones((md.mesh.numberofelements, )) +md.friction.q = np.ones((md.mesh.numberofelements, )) #Numerical parameters -md.groundingline.migration='None' +md.groundingline.migration = 'None' md.masstransport.stabilization = 1 md.thermal.stabilization = 1. @@ -82,3 +82,3 @@ #Change name so that no test have the same name if len(inspect.stack()) > 2: - md.miscellaneous.name = os.path.basename(inspect.stack()[2][1]).split('.')[0] + md.miscellaneous.name = os.path.basename(inspect.stack()[2][1]).split('.')[0] Index: /issm/trunk-jpl/test/Par/GiaIvinsBenchmarksCD.py =================================================================== --- /issm/trunk-jpl/test/Par/GiaIvinsBenchmarksCD.py (revision 24213) +++ /issm/trunk-jpl/test/Par/GiaIvinsBenchmarksCD.py (revision 24214) @@ -13,57 +13,57 @@ nv = md.mesh.numberofvertices if (np.isnan(md.geometry.thickness)): - md.geometry.thickness = np.zeros((md.mesh.numberofvertices,)) + md.geometry.thickness = np.zeros((md.mesh.numberofvertices, )) for i in range(nv): - dist = np.sqrt(md.mesh.x[i]**2 + md.mesh.y[i]**2) - if (dist <= rad): - md.geometry.thickness[i] = 3000.0 - else: - md.geometry.thickness[i] = 1.0 # non-zero thickness + dist = np.sqrt(md.mesh.x[i]**2 + md.mesh.y[i]**2) + if (dist <= rad): + md.geometry.thickness[i] = 3000.0 + else: + md.geometry.thickness[i] = 1.0 # non - zero thickness -md.geometry.thickness = md.geometry.thickness.reshape(-1,1) -md.geometry.base = np.zeros((md.mesh.numberofvertices,)) -md.geometry.surface = md.geometry.thickness + md.geometry.base.reshape(-1,1) #would otherwise create a 91x91 matrix +md.geometry.thickness = md.geometry.thickness.reshape(- 1, 1) +md.geometry.base = np.zeros((md.mesh.numberofvertices, )) +md.geometry.surface = md.geometry.thickness + md.geometry.base.reshape(- 1, 1) #would otherwise create a 91x91 matrix -#Ice density used for benchmarking, not 917 kg/m^3 -md.materials.rho_ice = 1000 #kg m^3 +#Ice density used for benchmarking, not 917 kg / m^3 +md.materials.rho_ice = 1000 #kg m^3 #GIA parameters specific to Experiments A and B -md.gia.mantle_viscosity = 1e21 * np.ones((md.mesh.numberofvertices,)) #in Pa.s -md.gia.lithosphere_thickness = 100 * np.ones((md.mesh.numberofvertices,)) #in km -md.materials.lithosphere_shear_modulus = 6.7*1e10 #in Pa -md.materials.lithosphere_density = 3.32 #in g/cm^3 -md.materials.mantle_shear_modulus = 1.45*1e11 #in Pa -md.materials.mantle_density = 3.34 #in g/cm^3 +md.gia.mantle_viscosity = 1e21 * np.ones((md.mesh.numberofvertices, )) #in Pa.s +md.gia.lithosphere_thickness = 100 * np.ones((md.mesh.numberofvertices, )) #in km +md.materials.lithosphere_shear_modulus = 6.7 * 1e10 #in Pa +md.materials.lithosphere_density = 3.32 #in g / cm^3 +md.materials.mantle_shear_modulus = 1.45 * 1e11 #in Pa +md.materials.mantle_density = 3.34 #in g / cm^3 -#Initial velocity -x = archread('../Data/SquareSheetConstrained.arch','x') -y = archread('../Data/SquareSheetConstrained.arch','y') -vx = archread('../Data/SquareSheetConstrained.arch','vx') -vy = archread('../Data/SquareSheetConstrained.arch','vy') -index = archread('../Data/SquareSheetConstrained.arch','index').astype(int) +#Initial velocity +x = archread('../Data/SquareSheetConstrained.arch', 'x') +y = archread('../Data/SquareSheetConstrained.arch', 'y') +vx = archread('../Data/SquareSheetConstrained.arch', 'vx') +vy = archread('../Data/SquareSheetConstrained.arch', 'vy') +index = archread('../Data/SquareSheetConstrained.arch', 'index').astype(int) -md.initialization.vx = np.array(InterpFromMeshToMesh2d(index,x,y,vx,md.mesh.x,md.mesh.y)).reshape(-1,1) -md.initialization.vy = np.array(InterpFromMeshToMesh2d(index,x,y,vy,md.mesh.x,md.mesh.y)).reshape(-1,1) -vx = None -vy = None -x = None -y = None +md.initialization.vx = np.array(InterpFromMeshToMesh2d(index, x, y, vx, md.mesh.x, md.mesh.y)).reshape(- 1, 1) +md.initialization.vy = np.array(InterpFromMeshToMesh2d(index, x, y, vy, md.mesh.x, md.mesh.y)).reshape(- 1, 1) +vx = None +vy = None +x = None +y = None index = None -md.initialization.vz = np.zeros((md.mesh.numberofvertices,)) -md.initialization.pressure = np.zeros((md.mesh.numberofvertices,)) +md.initialization.vz = np.zeros((md.mesh.numberofvertices, )) +md.initialization.pressure = np.zeros((md.mesh.numberofvertices, )) #Materials -md.initialization.temperature = (273. - 20.) * np.ones((md.mesh.numberofvertices,)) +md.initialization.temperature = (273. - 20.) * np.ones((md.mesh.numberofvertices, )) md.materials.rheology_B = paterson(md.initialization.temperature) -md.materials.rheology_n = 3. * np.ones((md.mesh.numberofelements,)) +md.materials.rheology_n = 3. * np.ones((md.mesh.numberofelements, )) #Friction -md.friction.coefficient = 20. * np.ones((md.mesh.numberofvertices,)) +md.friction.coefficient = 20. * np.ones((md.mesh.numberofvertices, )) md.friction.coefficient[np.where(md.mask.groundedice_levelset < 0.)] = 0. -md.friction.p = np.ones((md.mesh.numberofelements,)) -md.friction.q = np.ones((md.mesh.numberofelements,)) +md.friction.p = np.ones((md.mesh.numberofelements, )) +md.friction.q = np.ones((md.mesh.numberofelements, )) #Numerical parameters -md.groundingline.migration='None' +md.groundingline.migration = 'None' md.masstransport.stabilization = 1. md.thermal.stabilization = 1. @@ -82,3 +82,3 @@ #Change name so that no test have the same name if len(inspect.stack()) > 2: - md.miscellaneous.name = os.path.basename(inspect.stack()[2][1]).split('.')[0] + md.miscellaneous.name = os.path.basename(inspect.stack()[2][1]).split('.')[0] Index: /issm/trunk-jpl/test/Par/ISMIPA.py =================================================================== --- /issm/trunk-jpl/test/Par/ISMIPA.py (revision 24213) +++ /issm/trunk-jpl/test/Par/ISMIPA.py (revision 24214) @@ -1,3 +1,3 @@ -import numpy +import numpy as np from SetIceSheetBC import SetIceSheetBC @@ -5,19 +5,19 @@ print(" creating thickness") -md.geometry.surface=-md.mesh.x*numpy.tan(0.5*numpy.pi/180.) -md.geometry.base=md.geometry.surface-1000.+500.*numpy.sin(md.mesh.x*2.*numpy.pi/numpy.max(md.mesh.x))*numpy.sin(md.mesh.y*2.*numpy.pi/numpy.max(md.mesh.x)) -md.geometry.thickness=md.geometry.surface-md.geometry.base +md.geometry.surface = -md.mesh.x * np.tan(0.5 * np.pi / 180.) +md.geometry.base = md.geometry.surface - 1000. + 500. * np.sin(md.mesh.x * 2. * np.pi / np.max(md.mesh.x)) * np.sin(md.mesh.y * 2. * np.pi / np.max(md.mesh.x)) +md.geometry.thickness = md.geometry.surface - md.geometry.base print(" creating drag") -md.friction.coefficient=200.*numpy.ones((md.mesh.numberofvertices)) -md.friction.coefficient[numpy.nonzero(md.mask.groundedice_levelset<0.)[0]]=0. -md.friction.p=numpy.ones((md.mesh.numberofelements)) -md.friction.q=numpy.ones((md.mesh.numberofelements)) +md.friction.coefficient = 200. * np.ones((md.mesh.numberofvertices)) +md.friction.coefficient[np.nonzero(md.mask.groundedice_levelset < 0.)[0]] = 0. +md.friction.p = np.ones((md.mesh.numberofelements)) +md.friction.q = np.ones((md.mesh.numberofelements)) print(" creating flow law parameter") -md.materials.rheology_B=6.8067*10**7*numpy.ones((md.mesh.numberofvertices)) -md.materials.rheology_n=3.*numpy.ones((md.mesh.numberofelements)) +md.materials.rheology_B = 6.8067 * 10**7 * np.ones((md.mesh.numberofvertices)) +md.materials.rheology_n = 3. * np.ones((md.mesh.numberofelements)) print(" boundary conditions for stressbalance model") #Create node on boundary first (because we cannot use mesh) -md=SetIceSheetBC(md) +md = SetIceSheetBC(md) Index: /issm/trunk-jpl/test/Par/ISMIPB.py =================================================================== --- /issm/trunk-jpl/test/Par/ISMIPB.py (revision 24213) +++ /issm/trunk-jpl/test/Par/ISMIPB.py (revision 24214) @@ -1,3 +1,3 @@ -import numpy +import numpy as np from SetIceSheetBC import SetIceSheetBC @@ -5,19 +5,19 @@ print(" creating thickness") -md.geometry.surface=-md.mesh.x*numpy.tan(0.5*numpy.pi/180.) -md.geometry.base=md.geometry.surface-1000.+500.*numpy.sin(md.mesh.x*2.*numpy.pi/numpy.max(md.mesh.x)) -md.geometry.thickness=md.geometry.surface-md.geometry.base +md.geometry.surface = -md.mesh.x * np.tan(0.5 * np.pi / 180.) +md.geometry.base = md.geometry.surface - 1000. + 500. * np.sin(md.mesh.x * 2. * np.pi / np.max(md.mesh.x)) +md.geometry.thickness = md.geometry.surface - md.geometry.base print(" creating drag") -md.friction.coefficient=200.*numpy.ones((md.mesh.numberofvertices)) -md.friction.coefficient[numpy.nonzero(md.mask.groundedice_levelset<0.)[0]]=0. -md.friction.p=numpy.ones((md.mesh.numberofelements)) -md.friction.q=numpy.ones((md.mesh.numberofelements)) +md.friction.coefficient = 200. * np.ones((md.mesh.numberofvertices)) +md.friction.coefficient[np.nonzero(md.mask.groundedice_levelset < 0.)[0]] = 0. +md.friction.p = np.ones((md.mesh.numberofelements)) +md.friction.q = np.ones((md.mesh.numberofelements)) print(" creating flow law parameter") -md.materials.rheology_B=6.8067*10**7*numpy.ones((md.mesh.numberofvertices)) -md.materials.rheology_n=3.*numpy.ones((md.mesh.numberofelements)) +md.materials.rheology_B = 6.8067 * 10**7 * np.ones((md.mesh.numberofvertices)) +md.materials.rheology_n = 3. * np.ones((md.mesh.numberofelements)) print(" boundary conditions for stressbalance model") #Create node on boundary first (because we cannot use mesh) -md=SetIceSheetBC(md) +md = SetIceSheetBC(md) Index: /issm/trunk-jpl/test/Par/ISMIPC.py =================================================================== --- /issm/trunk-jpl/test/Par/ISMIPC.py (revision 24213) +++ /issm/trunk-jpl/test/Par/ISMIPC.py (revision 24214) @@ -1,3 +1,3 @@ -import numpy +import numpy as np from SetIceSheetBC import SetIceSheetBC @@ -5,20 +5,20 @@ print(" creating thickness") -md.geometry.surface=2000.-md.mesh.x*numpy.tan(0.1*numpy.pi/180.) #to have z>0 -md.geometry.base=md.geometry.surface-1000. -md.geometry.thickness=md.geometry.surface-md.geometry.base +md.geometry.surface = 2000. - md.mesh.x * np.tan(0.1 * np.pi / 180.) #to have z > 0 +md.geometry.base = md.geometry.surface - 1000. +md.geometry.thickness = md.geometry.surface - md.geometry.base print(" creating drag") -#md.friction.coefficient=sqrt(md.constants.yts.*(1000.+1000.*sin(md.mesh.x*2.*pi/max(md.mesh.x/2.)).*sin(md.mesh.y*2.*pi/max(md.mesh.x/2.)))./(md.constants.g*(md.materials.rho_ice*md.geometry.thickness+md.materials.rho_water*md.geometry.base))); -md.friction.coefficient=numpy.sqrt(md.constants.yts*(1000.+1000.*numpy.sin(md.mesh.x*2.*numpy.pi/numpy.max(md.mesh.x))*numpy.sin(md.mesh.y*2.*numpy.pi/numpy.max(md.mesh.x)))) -md.friction.coefficient[numpy.nonzero(md.mask.groundedice_levelset<0.)[0]]=0. -md.friction.p=numpy.ones((md.mesh.numberofelements)) -md.friction.q=numpy.zeros((md.mesh.numberofelements)) +#md.friction.coefficient = sqrt(md.constants.yts. * (1000. + 1000. * sin(md.mesh.x * 2. * pi / max(md.mesh.x / 2.)). * sin(md.mesh.y * 2. * pi / max(md.mesh.x / 2.))). / (md.constants.g * (md.materials.rho_ice * md.geometry.thickness + md.materials.rho_water * md.geometry.base))) +md.friction.coefficient = np.sqrt(md.constants.yts * (1000. + 1000. * np.sin(md.mesh.x * 2. * np.pi / np.max(md.mesh.x)) * np.sin(md.mesh.y * 2. * np.pi / np.max(md.mesh.x)))) +md.friction.coefficient[np.nonzero(md.mask.groundedice_levelset < 0.)[0]] = 0. +md.friction.p = np.ones((md.mesh.numberofelements)) +md.friction.q = np.zeros((md.mesh.numberofelements)) print(" creating flow law parameter") -md.materials.rheology_B=6.8067*10**7*numpy.ones((md.mesh.numberofvertices)) -md.materials.rheology_n=3.*numpy.ones((md.mesh.numberofelements)) +md.materials.rheology_B = 6.8067 * 10**7 * np.ones((md.mesh.numberofvertices)) +md.materials.rheology_n = 3. * np.ones((md.mesh.numberofelements)) print(" boundary conditions for stressbalance model:") #Create node on boundary first (because we can not use mesh) -md=SetIceSheetBC(md) +md = SetIceSheetBC(md) Index: /issm/trunk-jpl/test/Par/ISMIPD.py =================================================================== --- /issm/trunk-jpl/test/Par/ISMIPD.py (revision 24213) +++ /issm/trunk-jpl/test/Par/ISMIPD.py (revision 24214) @@ -1,3 +1,3 @@ -import numpy +import numpy as np from SetIceSheetBC import SetIceSheetBC @@ -5,19 +5,19 @@ print(" creating thickness") -md.geometry.surface=2000.-md.mesh.x*numpy.tan(0.1*numpy.pi/180.) #to have z>0 -md.geometry.base=md.geometry.surface-1000. -md.geometry.thickness=md.geometry.surface-md.geometry.base +md.geometry.surface = 2000. - md.mesh.x * np.tan(0.1 * np.pi / 180.) #to have z > 0 +md.geometry.base = md.geometry.surface - 1000. +md.geometry.thickness = md.geometry.surface - md.geometry.base print(" creating drag") -md.friction.coefficient=numpy.sqrt(md.constants.yts*(1000.+1000.*numpy.sin(md.mesh.x*2.*numpy.pi/numpy.max(md.mesh.x)))) -md.friction.coefficient[numpy.nonzero(md.mask.groundedice_levelset<0.)[0]]=0. -md.friction.p=numpy.ones((md.mesh.numberofelements)) -md.friction.q=numpy.zeros((md.mesh.numberofelements)) +md.friction.coefficient = np.sqrt(md.constants.yts * (1000. + 1000. * np.sin(md.mesh.x * 2. * np.pi / np.max(md.mesh.x)))) +md.friction.coefficient[np.nonzero(md.mask.groundedice_levelset < 0.)[0]] = 0. +md.friction.p = np.ones((md.mesh.numberofelements)) +md.friction.q = np.zeros((md.mesh.numberofelements)) print(" creating flow law parameter") -md.materials.rheology_B=6.8067*10**7*numpy.ones((md.mesh.numberofvertices)) -md.materials.rheology_n=3.*numpy.ones((md.mesh.numberofelements)) +md.materials.rheology_B = 6.8067 * 10**7 * np.ones((md.mesh.numberofvertices)) +md.materials.rheology_n = 3. * np.ones((md.mesh.numberofelements)) print(" boundary conditions for stressbalance model:") #Create node on boundary first (because we can not use mesh) -md=SetIceSheetBC(md) +md = SetIceSheetBC(md) Index: /issm/trunk-jpl/test/Par/ISMIPE.py =================================================================== --- /issm/trunk-jpl/test/Par/ISMIPE.py (revision 24213) +++ /issm/trunk-jpl/test/Par/ISMIPE.py (revision 24214) @@ -1,3 +1,3 @@ -import numpy +import numpy as np from arch import * from SetIceSheetBC import SetIceSheetBC @@ -6,29 +6,29 @@ print(" creating thickness") -data = numpy.array(archread('../Data/ISMIPE.arch','data')); -md.geometry.surface=numpy.zeros((md.mesh.numberofvertices)) -md.geometry.base=numpy.zeros((md.mesh.numberofvertices)) -for i in range(0,md.mesh.numberofvertices): - y=md.mesh.y[i] - point1=numpy.floor(y/100.) - point2=numpy.minimum(point1+1,50) - coeff=(y-(point1)*100.)/100. - md.geometry.base[i]=(1.-coeff)*data[point1,1]+coeff*data[point2,1] - md.geometry.surface[i]=(1.-coeff)*data[point1,2]+coeff*data[point2,2] +data = np.array(archread('../Data/ISMIPE.arch', 'data')) +md.geometry.surface = np.zeros((md.mesh.numberofvertices)) +md.geometry.base = np.zeros((md.mesh.numberofvertices)) +for i in range(0, md.mesh.numberofvertices): + y = md.mesh.y[i] + point1 = int(np.floor(y / 100.)) + point2 = int(np.minimum(point1 + 1, 50)) + coeff = int((y - (point1) * 100.) / 100.) + md.geometry.base[i] = (1. - coeff) * data[point1, 1] + coeff * data[point2, 1] + md.geometry.surface[i] = (1. - coeff) * data[point1, 2] + coeff * data[point2, 2] -md.geometry.thickness=md.geometry.surface-md.geometry.base -md.geometry.thickness[numpy.nonzero(numpy.logical_not(md.geometry.thickness))]=0.01 -md.geometry.base=md.geometry.surface-md.geometry.thickness +md.geometry.thickness = md.geometry.surface - md.geometry.base +md.geometry.thickness[np.nonzero(np.logical_not(md.geometry.thickness))] = 0.01 +md.geometry.base = md.geometry.surface - md.geometry.thickness print(" creating drag") -md.friction.coefficient=numpy.zeros((md.mesh.numberofvertices)) -md.friction.p=numpy.ones((md.mesh.numberofelements)) -md.friction.q=numpy.ones((md.mesh.numberofelements)) +md.friction.coefficient = np.zeros((md.mesh.numberofvertices)) +md.friction.p = np.ones((md.mesh.numberofelements)) +md.friction.q = np.ones((md.mesh.numberofelements)) print(" creating flow law parameter") -md.materials.rheology_B=6.8067*10**7*numpy.ones((md.mesh.numberofvertices)) -md.materials.rheology_n=3.*numpy.ones((md.mesh.numberofelements)) +md.materials.rheology_B = 6.8067 * 10**7 * np.ones((md.mesh.numberofvertices)) +md.materials.rheology_n = 3. * np.ones((md.mesh.numberofelements)) print(" boundary conditions for stressbalance model:") #Create node on boundary first (because we can not use mesh) -md=SetIceSheetBC(md) +md = SetIceSheetBC(md) Index: /issm/trunk-jpl/test/Par/ISMIPF.py =================================================================== --- /issm/trunk-jpl/test/Par/ISMIPF.py (revision 24213) +++ /issm/trunk-jpl/test/Par/ISMIPF.py (revision 24214) @@ -1,50 +1,50 @@ -import numpy +import numpy as np from SetIceSheetBC import SetIceSheetBC #Ok, start defining model parameters here -md.verbose=2 +md.verbose = 2 print(" creating thickness") -md.geometry.surface=-md.mesh.x*numpy.tan(3.*numpy.pi/180.) -#md.geometry.base=md.geometry.surface-1000. -md.geometry.base=md.geometry.surface-1000.+100.*numpy.exp(-((md.mesh.x-numpy.max(md.mesh.x)/2.)**2+(md.mesh.y-numpy.max(md.mesh.y)/2.)**2)/(10000.**2)) -md.geometry.thickness=md.geometry.surface-md.geometry.base +md.geometry.surface = -md.mesh.x * np.tan(3. * np.pi / 180.) +#md.geometry.base = md.geometry.surface-1000. +md.geometry.base = md.geometry.surface - 1000. + 100. * np.exp(- ((md.mesh.x - np.max(md.mesh.x) / 2.)**2 + (md.mesh.y - np.max(md.mesh.y) / 2.)**2) / (10000.**2)) +md.geometry.thickness = md.geometry.surface - md.geometry.base print(" creating drag") -md.friction.coefficient=numpy.sqrt(md.constants.yts/(2.140373*10**-7*1000.))*numpy.ones((md.mesh.numberofvertices)) -md.friction.p=numpy.ones((md.mesh.numberofelements)) -md.friction.q=numpy.zeros((md.mesh.numberofelements)) +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)) print(" creating flow law parameter") -md.materials.rheology_B=1.4734*10**14*numpy.ones((md.mesh.numberofvertices)) -md.materials.rheology_n=1.*numpy.ones((md.mesh.numberofelements)) -md.materials.rheology_law='None' +md.materials.rheology_B = 1.4734 * 10**14 * np.ones((md.mesh.numberofvertices)) +md.materials.rheology_n = 1. * np.ones((md.mesh.numberofelements)) +md.materials.rheology_law = 'None' print(" boundary conditions for stressbalance model") #Create node on boundary first (because we cannot use mesh) -md=SetIceSheetBC(md) -md.stressbalance.spcvx=100.*numpy.ones((md.mesh.numberofvertices)) -md.initialization.vx=numpy.zeros((md.mesh.numberofvertices)) -md.initialization.vy=numpy.zeros((md.mesh.numberofvertices)) -md.initialization.vz=numpy.zeros((md.mesh.numberofvertices)) -md.initialization.vel=numpy.zeros((md.mesh.numberofvertices)) -md.initialization.pressure=numpy.zeros((md.mesh.numberofvertices)) -md.initialization.temperature=255.*numpy.ones((md.mesh.numberofvertices)) -pos=numpy.nonzero(numpy.logical_or(numpy.logical_or(md.mesh.x==numpy.min(md.mesh.x),md.mesh.x==numpy.max(md.mesh.x)),numpy.logical_or(md.mesh.y==numpy.min(md.mesh.y),md.mesh.y==numpy.max(md.mesh.y)))) -md.balancethickness.spcthickness=float('NaN')*numpy.ones((md.mesh.numberofvertices)) -md.balancethickness.spcthickness[pos]=md.geometry.thickness[pos] -md.masstransport.spcthickness=float('NaN')*numpy.ones((md.mesh.numberofvertices)) -md.masstransport.spcthickness[pos]=md.geometry.thickness[pos] -md.thermal.spctemperature=255.*numpy.ones((md.mesh.numberofvertices)) -md.basalforcings.geothermalflux=0.4*numpy.ones((md.mesh.numberofvertices)) +md = SetIceSheetBC(md) +md.stressbalance.spcvx = 100. * np.ones((md.mesh.numberofvertices)) +md.initialization.vx = np.zeros((md.mesh.numberofvertices)) +md.initialization.vy = np.zeros((md.mesh.numberofvertices)) +md.initialization.vz = np.zeros((md.mesh.numberofvertices)) +md.initialization.vel = np.zeros((md.mesh.numberofvertices)) +md.initialization.pressure = np.zeros((md.mesh.numberofvertices)) +md.initialization.temperature = 255. * np.ones((md.mesh.numberofvertices)) +pos = np.nonzero(np.logical_or(np.logical_or(md.mesh.x == np.min(md.mesh.x), md.mesh.x == np.max(md.mesh.x)), np.logical_or(md.mesh.y == np.min(md.mesh.y), md.mesh.y == np.max(md.mesh.y)))) +md.balancethickness.spcthickness = float('NaN') * np.ones((md.mesh.numberofvertices)) +md.balancethickness.spcthickness[pos] = md.geometry.thickness[pos] +md.masstransport.spcthickness = float('NaN') * np.ones((md.mesh.numberofvertices)) +md.masstransport.spcthickness[pos] = md.geometry.thickness[pos] +md.thermal.spctemperature = 255. * np.ones((md.mesh.numberofvertices)) +md.basalforcings.geothermalflux = 0.4 * np.ones((md.mesh.numberofvertices)) #Parallel options -md.mesh.average_vertex_connectivity=200 +md.mesh.average_vertex_connectivity = 200 #Transient options -md.timestepping.time_step=1. -md.timestepping.final_time=10. -md.masstransport.stabilization=1 -md.thermal.stabilization=1 -md.thermal.penalty_threshold=10**5 -md.transient.isthermal=0 +md.timestepping.time_step = 1. +md.timestepping.final_time = 10. +md.masstransport.stabilization = 1 +md.thermal.stabilization = 1 +md.thermal.penalty_threshold = 10**5 +md.transient.isthermal = 0 Index: /issm/trunk-jpl/test/Par/IceCube.py =================================================================== --- /issm/trunk-jpl/test/Par/IceCube.py (revision 24213) +++ /issm/trunk-jpl/test/Par/IceCube.py (revision 24214) @@ -3,5 +3,4 @@ import inspect from verbose import verbose -from InterpFromMeshToMesh2d import InterpFromMeshToMesh2d from paterson import paterson from SetIceSheetBC import SetIceSheetBC @@ -11,45 +10,45 @@ #Geometry -md.geometry.thickness=1000.0*np.ones((md.mesh.numberofvertices)) -md.geometry.base=np.zeros((md.mesh.numberofvertices)) -md.geometry.surface=md.geometry.base+md.geometry.thickness +md.geometry.thickness = 1000.0 * np.ones((md.mesh.numberofvertices)) +md.geometry.base = np.zeros((md.mesh.numberofvertices)) +md.geometry.surface = md.geometry.base + md.geometry.thickness -md.initialization.vx=np.zeros((md.mesh.numberofvertices)) -md.initialization.vy=np.zeros((md.mesh.numberofvertices)) -md.initialization.vz=np.zeros((md.mesh.numberofvertices)) -md.initialization.pressure=np.zeros((md.mesh.numberofvertices)) +md.initialization.vx = np.zeros((md.mesh.numberofvertices)) +md.initialization.vy = np.zeros((md.mesh.numberofvertices)) +md.initialization.vz = np.zeros((md.mesh.numberofvertices)) +md.initialization.pressure = np.zeros((md.mesh.numberofvertices)) #Materials -md.initialization.temperature=(273.-20.)*np.ones((md.mesh.numberofvertices)) -md.materials.rheology_B=paterson(md.initialization.temperature) -md.materials.rheology_n=3.*np.ones((md.mesh.numberofelements)) +md.initialization.temperature = (273. - 20.) * np.ones((md.mesh.numberofvertices)) +md.materials.rheology_B = paterson(md.initialization.temperature) +md.materials.rheology_n = 3. * np.ones((md.mesh.numberofelements)) #Calving -md.calving.calvingrate=np.zeros((md.mesh.numberofvertices)) -md.levelset.spclevelset=np.nan*np.ones((md.mesh.numberofvertices)) +md.calving.calvingrate = np.zeros((md.mesh.numberofvertices)) +md.levelset.spclevelset = np.nan * np.ones((md.mesh.numberofvertices)) #Friction -md.friction.coefficient=20.*np.ones((md.mesh.numberofvertices)) -md.friction.coefficient[np.where(md.mask.groundedice_levelset<0.)[0]]=0. -md.friction.p=np.ones((md.mesh.numberofelements)) -md.friction.q=np.ones((md.mesh.numberofelements)) +md.friction.coefficient = 20. * np.ones((md.mesh.numberofvertices)) +md.friction.coefficient[np.where(md.mask.groundedice_levelset < 0.)[0]] = 0. +md.friction.p = np.ones((md.mesh.numberofelements)) +md.friction.q = np.ones((md.mesh.numberofelements)) #Numerical parameters -md.masstransport.stabilization=1. -md.thermal.stabilization=1. -md.verbose=verbose(0) -md.settings.waitonlock=30 -md.stressbalance.restol=0.05 -md.steadystate.reltol=0.05 -md.stressbalance.reltol=0.05 -md.stressbalance.abstol=float('NaN') -md.timestepping.time_step=1. -md.timestepping.final_time=3. -md.groundingline.migration='None' +md.masstransport.stabilization = 1. +md.thermal.stabilization = 1. +md.verbose = verbose(0) +md.settings.waitonlock = 30 +md.stressbalance.restol = 0.05 +md.steadystate.reltol = 0.05 +md.stressbalance.reltol = 0.05 +md.stressbalance.abstol = float('NaN') +md.timestepping.time_step = 1. +md.timestepping.final_time = 3. +md.groundingline.migration = 'None' #Boundary conditions: -md=SetIceSheetBC(md) +md = SetIceSheetBC(md) #Change name so that no test have the same name if len(inspect.stack()) > 2: - md.miscellaneous.name = os.path.basename(inspect.stack()[2][1]).split('.')[0] + md.miscellaneous.name = os.path.basename(inspect.stack()[2][1]).split('.')[0] Index: /issm/trunk-jpl/test/Par/Pig.py =================================================================== --- /issm/trunk-jpl/test/Par/Pig.py (revision 24213) +++ /issm/trunk-jpl/test/Par/Pig.py (revision 24214) @@ -2,5 +2,5 @@ import inspect from arch import * -import numpy +import numpy as np from verbose import verbose from InterpFromMeshToMesh2d import InterpFromMeshToMesh2d @@ -11,54 +11,54 @@ #Geometry and observation -x = numpy.array(archread('../Data/Pig.arch','x')) -y = numpy.array(archread('../Data/Pig.arch','y')) -vx_obs = numpy.array(archread('../Data/Pig.arch','vx_obs')) -vy_obs = numpy.array(archread('../Data/Pig.arch','vy_obs')) -index = numpy.array(archread('../Data/Pig.arch','index')).astype(int) -surface = numpy.array(archread('../Data/Pig.arch','surface')) -thickness = numpy.array(archread('../Data/Pig.arch','thickness')) -bed = numpy.array(archread('../Data/Pig.arch','bed')) +x = np.array(archread('../Data/Pig.arch', 'x')) +y = np.array(archread('../Data/Pig.arch', 'y')) +vx_obs = np.array(archread('../Data/Pig.arch', 'vx_obs')) +vy_obs = np.array(archread('../Data/Pig.arch', 'vy_obs')) +index = np.array(archread('../Data/Pig.arch', 'index')).astype(int) +surface = np.array(archread('../Data/Pig.arch', 'surface')) +thickness = np.array(archread('../Data/Pig.arch', 'thickness')) +bed = np.array(archread('../Data/Pig.arch', 'bed')) -md.inversion.vx_obs =InterpFromMeshToMesh2d(index,x,y,vx_obs,md.mesh.x,md.mesh.y)[0][:,0] -md.inversion.vy_obs =InterpFromMeshToMesh2d(index,x,y,vy_obs,md.mesh.x,md.mesh.y)[0][:,0] -md.geometry.surface =InterpFromMeshToMesh2d(index,x,y,surface,md.mesh.x,md.mesh.y)[0][:,0] -md.geometry.thickness=InterpFromMeshToMesh2d(index,x,y,thickness,md.mesh.x,md.mesh.y)[0][:,0] -md.geometry.base=md.geometry.surface-md.geometry.thickness -md.geometry.bed =numpy.array(md.geometry.base) -pos = np.where(md.mask.groundedice_levelset<0.) -md.geometry.bed[pos] =InterpFromMeshToMesh2d(index,x,y,bed,md.mesh.x[pos],md.mesh.y[pos])[0][:,0] -md.initialization.vx=md.inversion.vx_obs -md.initialization.vy=md.inversion.vy_obs -md.initialization.vz=numpy.zeros((md.mesh.numberofvertices)) -md.initialization.pressure=numpy.zeros((md.mesh.numberofvertices)) +md.inversion.vx_obs = InterpFromMeshToMesh2d(index, x, y, vx_obs, md.mesh.x, md.mesh.y)[0][:, 0] +md.inversion.vy_obs = InterpFromMeshToMesh2d(index, x, y, vy_obs, md.mesh.x, md.mesh.y)[0][:, 0] +md.geometry.surface = InterpFromMeshToMesh2d(index, x, y, surface, md.mesh.x, md.mesh.y)[0][:, 0] +md.geometry.thickness = InterpFromMeshToMesh2d(index, x, y, thickness, md.mesh.x, md.mesh.y)[0][:, 0] +md.geometry.base = md.geometry.surface - md.geometry.thickness +md.geometry.bed = np.array(md.geometry.base) +pos = np.where(md.mask.groundedice_levelset < 0.) +md.geometry.bed[pos] = InterpFromMeshToMesh2d(index, x, y, bed, md.mesh.x[pos], md.mesh.y[pos])[0][:, 0] +md.initialization.vx = md.inversion.vx_obs +md.initialization.vy = md.inversion.vy_obs +md.initialization.vz = np.zeros((md.mesh.numberofvertices)) +md.initialization.pressure = np.zeros((md.mesh.numberofvertices)) #Materials -md.initialization.temperature=(273.-20.)*numpy.ones((md.mesh.numberofvertices)) -md.materials.rheology_B=paterson(md.initialization.temperature) -md.materials.rheology_n=3.*numpy.ones((md.mesh.numberofelements)) -md.initialization.temperature=md.initialization.temperature +md.initialization.temperature = (273. - 20.) * np.ones((md.mesh.numberofvertices)) +md.materials.rheology_B = paterson(md.initialization.temperature) +md.materials.rheology_n = 3. * np.ones((md.mesh.numberofelements)) +md.initialization.temperature = md.initialization.temperature #Friction -md.friction.coefficient=50.*numpy.ones((md.mesh.numberofvertices)) -md.friction.coefficient[numpy.nonzero(md.mask.groundedice_levelset<0.)[0]]=0. -md.friction.p=numpy.ones((md.mesh.numberofelements)) -md.friction.q=numpy.ones((md.mesh.numberofelements)) +md.friction.coefficient = 50. * np.ones((md.mesh.numberofvertices)) +md.friction.coefficient[np.nonzero(md.mask.groundedice_levelset < 0.)[0]] = 0. +md.friction.p = np.ones((md.mesh.numberofelements)) +md.friction.q = np.ones((md.mesh.numberofelements)) #Numerical parameters -md.masstransport.stabilization=1. -md.verbose=verbose(0) -md.settings.waitonlock=30 -md.timestepping.time_step=1. -md.timestepping.final_time=2. -md.stressbalance.restol=0.05 -md.stressbalance.reltol=1. -md.steadystate.reltol=1. -md.stressbalance.abstol=float('nan') -md.groundingline.migration='None' +md.masstransport.stabilization = 1. +md.verbose = verbose(0) +md.settings.waitonlock = 30 +md.timestepping.time_step = 1. +md.timestepping.final_time = 2. +md.stressbalance.restol = 0.05 +md.stressbalance.reltol = 1. +md.steadystate.reltol = 1. +md.stressbalance.abstol = float('nan') +md.groundingline.migration = 'None' #Boundary conditions: -md=SetMarineIceSheetBC(md) +md = SetMarineIceSheetBC(md) #Change name so that no test have the same name if len(inspect.stack()) > 2: - md.miscellaneous.name = os.path.basename(inspect.stack()[2][1]).split('.')[0] + md.miscellaneous.name = os.path.basename(inspect.stack()[2][1]).split('.')[0] Index: /issm/trunk-jpl/test/Par/RoundSheetEISMINT.py =================================================================== --- /issm/trunk-jpl/test/Par/RoundSheetEISMINT.py (revision 24213) +++ /issm/trunk-jpl/test/Par/RoundSheetEISMINT.py (revision 24214) @@ -4,60 +4,60 @@ #Ok, start defining model parameters here print(" creating thickness") -md.geometry.thickness=10.*numpy.ones((md.mesh.numberofvertices)) -md.geometry.base=numpy.zeros((md.mesh.numberofvertices)) -md.geometry.surface=md.geometry.base+md.geometry.thickness +md.geometry.thickness = 10. * numpy.ones((md.mesh.numberofvertices)) +md.geometry.base = numpy.zeros((md.mesh.numberofvertices)) +md.geometry.surface = md.geometry.base + md.geometry.thickness print(" creating drag") -md.friction.coefficient=20.*numpy.ones((md.mesh.numberofvertices)) -md.friction.p=numpy.ones((md.mesh.numberofelements)) -md.friction.q=numpy.ones((md.mesh.numberofelements)) +md.friction.coefficient = 20. * numpy.ones((md.mesh.numberofvertices)) +md.friction.p = numpy.ones((md.mesh.numberofelements)) +md.friction.q = numpy.ones((md.mesh.numberofelements)) print(" creating temperatures") -tmin=238.15 #K -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)) +tmin = 238.15 #K +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)) print(" creating flow law parameter") -md.materials.rheology_B=6.81*10**7*numpy.ones((md.mesh.numberofvertices)) #to have the same B as the analytical solution -md.materials.rheology_n=3.*numpy.ones((md.mesh.numberofelements)) +md.materials.rheology_B = 6.81 * 10**7 * numpy.ones((md.mesh.numberofvertices)) #to have the same B as the analytical solution +md.materials.rheology_n = 3. * numpy.ones((md.mesh.numberofelements)) print(" creating surface mass balance") -smb_max=0.5 #m/yr -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)) +smb_max = 0.5 #m / yr +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)) print(" creating velocities") -constant=0.3 -md.inversion.vx_obs=constant/2.*md.mesh.x*(md.geometry.thickness)**-1 -md.inversion.vy_obs=constant/2.*md.mesh.y*(md.geometry.thickness)**-1 -md.inversion.vel_obs=numpy.sqrt((md.inversion.vx_obs)**2+(md.inversion.vy_obs)**2) -md.initialization.vx=numpy.zeros((md.mesh.numberofvertices)) -md.initialization.vy=numpy.zeros((md.mesh.numberofvertices)) -md.initialization.vz=numpy.zeros((md.mesh.numberofvertices)) -md.initialization.pressure=numpy.zeros((md.mesh.numberofvertices)) +constant = 0.3 +md.inversion.vx_obs = constant / 2. * md.mesh.x * (md.geometry.thickness)**- 1 +md.inversion.vy_obs = constant / 2. * md.mesh.y * (md.geometry.thickness)**- 1 +md.inversion.vel_obs = numpy.sqrt((md.inversion.vx_obs)**2 + (md.inversion.vy_obs)**2) +md.initialization.vx = numpy.zeros((md.mesh.numberofvertices)) +md.initialization.vy = numpy.zeros((md.mesh.numberofvertices)) +md.initialization.vz = numpy.zeros((md.mesh.numberofvertices)) +md.initialization.pressure = numpy.zeros((md.mesh.numberofvertices)) #Deal with boundary conditions: print(" boundary conditions for stressbalance model:") -md=SetMarineIceSheetBC(md,'../Exp/RoundFrontEISMINT.exp') +md = SetMarineIceSheetBC(md, '../Exp/RoundFrontEISMINT.exp') -radius=numpy.sqrt((md.mesh.x)**2+(md.mesh.y)**2) -pos=numpy.nonzero(radius==numpy.min(radius))[0] -md.mesh.x[pos]=0. -md.mesh.y[pos]=0. #the closest node to the center is changed to be exactly at the center +radius = numpy.sqrt((md.mesh.x)**2 + (md.mesh.y)**2) +pos = numpy.nonzero(radius == numpy.min(radius))[0] +md.mesh.x[pos] = 0. +md.mesh.y[pos] = 0. #the closest node to the center is changed to be exactly at the center -md.stressbalance.spcvx[pos]=0. -md.stressbalance.spcvy[pos]=0. -md.stressbalance.spcvz[pos]=0. +md.stressbalance.spcvx[pos] = 0. +md.stressbalance.spcvy[pos] = 0. +md.stressbalance.spcvz[pos] = 0. #parallel options -md.timestepping.final_time=50000. +md.timestepping.final_time = 50000. #Constants -md.materials.rho_ice=910. -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.constants.yts=31556926. +md.materials.rho_ice = 910. +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.constants.yts = 31556926. Index: /issm/trunk-jpl/test/Par/RoundSheetShelf.py =================================================================== --- /issm/trunk-jpl/test/Par/RoundSheetShelf.py (revision 24213) +++ /issm/trunk-jpl/test/Par/RoundSheetShelf.py (revision 24214) @@ -1,4 +1,4 @@ import os.path -import numpy +import numpy as np import copy import inspect @@ -8,121 +8,121 @@ #Start defining model parameters here -di=md.materials.rho_ice/md.materials.rho_water -rad=1.e6 -shelfextent=2.e5 +di = md.materials.rho_ice / md.materials.rho_water +rad = 1.e6 +shelfextent = 2.e5 #Geometry -hmin=300. -hmax=1000. -radius=numpy.sqrt(md.mesh.x*md.mesh.x+md.mesh.y*md.mesh.y.reshape(-1)) -ymin=numpy.min(radius) -ymax=numpy.max(radius) -md.geometry.thickness=hmax+(hmin-hmax)*(radius-ymin)/(ymax-ymin) -md.geometry.base=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness +hmin = 300. +hmax = 1000. +radius = np.sqrt(md.mesh.x * md.mesh.x + md.mesh.y * md.mesh.y.reshape(- 1)) +ymin = np.min(radius) +ymax = np.max(radius) +md.geometry.thickness = hmax + (hmin - hmax) * (radius - ymin) / (ymax - ymin) +md.geometry.base = -md.materials.rho_ice / md.materials.rho_water * md.geometry.thickness -pos=numpy.nonzero(md.mask.groundedice_levelset>0.)[0] -md.geometry.base[pos]=md.geometry.base[pos]-300.*(radius[pos]-(rad-shelfextent))/(rad-shelfextent) -md.geometry.surface=md.geometry.base+md.geometry.thickness +pos = np.nonzero(md.mask.groundedice_levelset > 0.)[0] +md.geometry.base[pos] = md.geometry.base[pos] - 300. * (radius[pos] - (rad - shelfextent)) / (rad - shelfextent) +md.geometry.surface = md.geometry.base + md.geometry.thickness -pos=numpy.nonzero(radius<200000.) -md.geometry.thickness[pos]=100. -md.geometry.base[pos]=-di*md.geometry.thickness[pos]-20. -md.geometry.surface[pos]=md.geometry.base[pos]+md.geometry.thickness[pos] +pos = np.nonzero(radius < 200000.) +md.geometry.thickness[pos] = 100. +md.geometry.base[pos] = -di * md.geometry.thickness[pos] - 20. +md.geometry.surface[pos] = md.geometry.base[pos] + md.geometry.thickness[pos] -pos=numpy.nonzero(numpy.logical_and(numpy.logical_and(md.mesh.x<0.2*1.e6,md.mesh.x>-0.2*1.e6),md.mesh.y>0.)) -md.geometry.thickness[pos]=100. -md.geometry.base[pos]=-di*md.geometry.thickness[pos]-20. -md.geometry.surface[pos]=md.geometry.base[pos]+md.geometry.thickness[pos] +pos = np.nonzero(np.logical_and(np.logical_and(md.mesh.x < 0.2 * 1.e6, md.mesh.x > - 0.2 * 1.e6), md.mesh.y > 0.)) +md.geometry.thickness[pos] = 100. +md.geometry.base[pos] = -di * md.geometry.thickness[pos] - 20. +md.geometry.surface[pos] = md.geometry.base[pos] + md.geometry.thickness[pos] -pos=numpy.nonzero(numpy.logical_and(numpy.logical_and(md.mesh.x<0.1*1.e6,md.mesh.x>-0.1*1.e6),numpy.logical_and(md.mesh.y<-0.5*1.e6,md.mesh.y>-0.6*1.e6))) -md.geometry.thickness[pos]=100. -md.geometry.base[pos]=-di*md.geometry.thickness[pos]-20. -md.geometry.surface[pos]=md.geometry.base[pos]+md.geometry.thickness[pos] +pos = np.nonzero(np.logical_and(np.logical_and(md.mesh.x < 0.1 * 1.e6, md.mesh.x > - 0.1 * 1.e6), np.logical_and(md.mesh.y < - 0.5 * 1.e6, md.mesh.y > - 0.6 * 1.e6))) +md.geometry.thickness[pos] = 100. +md.geometry.base[pos] = -di * md.geometry.thickness[pos] - 20. +md.geometry.surface[pos] = md.geometry.base[pos] + md.geometry.thickness[pos] -#plug holes into the ice sheet, to test for grounding line migration. -di=md.materials.rho_ice/md.materials.rho_water -rad=numpy.sqrt(md.mesh.x**2+md.mesh.y**2) -pos=numpy.nonzero(rad<200000.) -md.geometry.thickness[pos]=100. -md.geometry.base[pos]=-di*md.geometry.thickness[pos]-20. -md.geometry.surface[pos]=md.geometry.base[pos]+md.geometry.thickness[pos] +#plug holes into the ice sheet, to test for grounding line migration. +di = md.materials.rho_ice / md.materials.rho_water +rad = np.sqrt(md.mesh.x**2 + md.mesh.y**2) +pos = np.nonzero(rad < 200000.) +md.geometry.thickness[pos] = 100. +md.geometry.base[pos] = -di * md.geometry.thickness[pos] - 20. +md.geometry.surface[pos] = md.geometry.base[pos] + md.geometry.thickness[pos] -pos=numpy.nonzero(numpy.logical_and(numpy.logical_and(md.mesh.x<0.2*1.e6,md.mesh.x>-0.2*1.e6),md.mesh.y>0.)) -md.geometry.thickness[pos]=100. -md.geometry.base[pos]=-di*md.geometry.thickness[pos]-20. -md.geometry.surface[pos]=md.geometry.base[pos]+md.geometry.thickness[pos] +pos = np.nonzero(np.logical_and(np.logical_and(md.mesh.x < 0.2 * 1.e6, md.mesh.x > - 0.2 * 1.e6), md.mesh.y > 0.)) +md.geometry.thickness[pos] = 100. +md.geometry.base[pos] = -di * md.geometry.thickness[pos] - 20. +md.geometry.surface[pos] = md.geometry.base[pos] + md.geometry.thickness[pos] -pos=numpy.nonzero(numpy.logical_and(numpy.logical_and(md.mesh.x<0.1*1.e6,md.mesh.x>-0.1*1.e6),numpy.logical_and(md.mesh.y<-0.5*1.e6,md.mesh.y>-0.6*1.e6))) -md.geometry.thickness[pos]=100. -md.geometry.base[pos]=-di*md.geometry.thickness[pos]-20. -md.geometry.surface[pos]=md.geometry.base[pos]+md.geometry.thickness[pos] +pos = np.nonzero(np.logical_and(np.logical_and(md.mesh.x < 0.1 * 1.e6, md.mesh.x > - 0.1 * 1.e6), np.logical_and(md.mesh.y < - 0.5 * 1.e6, md.mesh.y > - 0.6 * 1.e6))) +md.geometry.thickness[pos] = 100. +md.geometry.base[pos] = -di * md.geometry.thickness[pos] - 20. +md.geometry.surface[pos] = md.geometry.base[pos] + md.geometry.thickness[pos] -#Initial velocity -md.initialization.vx=numpy.zeros((md.mesh.numberofvertices)) -md.initialization.vy=numpy.zeros((md.mesh.numberofvertices)) -md.initialization.vz=numpy.zeros((md.mesh.numberofvertices)) -md.initialization.pressure=numpy.zeros((md.mesh.numberofvertices)) +#Initial velocity +md.initialization.vx = np.zeros((md.mesh.numberofvertices)) +md.initialization.vy = np.zeros((md.mesh.numberofvertices)) +md.initialization.vz = np.zeros((md.mesh.numberofvertices)) +md.initialization.pressure = np.zeros((md.mesh.numberofvertices)) #Materials -md.initialization.temperature=(273.-20.)*numpy.ones((md.mesh.numberofvertices)) -md.materials.rheology_B=paterson(md.initialization.temperature) -md.materials.rheology_n=3.*numpy.ones((md.mesh.numberofelements)) +md.initialization.temperature = (273. - 20.) * np.ones((md.mesh.numberofvertices)) +md.materials.rheology_B = paterson(md.initialization.temperature) +md.materials.rheology_n = 3. * np.ones((md.mesh.numberofelements)) #Surface mass balance and basal melting -md.smb.mass_balance=-10.*numpy.ones((md.mesh.numberofvertices)) -md.basalforcings.groundedice_melting_rate=numpy.zeros((md.mesh.numberofvertices)) -pos=numpy.nonzero(md.mask.groundedice_levelset>0.)[0] -md.basalforcings.groundedice_melting_rate[pos]=10. -md.basalforcings.floatingice_melting_rate=numpy.zeros((md.mesh.numberofvertices)) -md.basalforcings.geothermalflux=numpy.ones((md.mesh.numberofvertices)) +md.smb.mass_balance = -10. * np.ones((md.mesh.numberofvertices)) +md.basalforcings.groundedice_melting_rate = np.zeros((md.mesh.numberofvertices)) +pos = np.nonzero(md.mask.groundedice_levelset > 0.)[0] +md.basalforcings.groundedice_melting_rate[pos] = 10. +md.basalforcings.floatingice_melting_rate = np.zeros((md.mesh.numberofvertices)) +md.basalforcings.geothermalflux = np.ones((md.mesh.numberofvertices)) #Friction -radius=1.e6 -shelfextent=2.e5 -md.friction.coefficient=20.*numpy.ones((md.mesh.numberofvertices)) -xelem=numpy.mean(md.mesh.x[md.mesh.elements.astype(int)-1],axis=1) -yelem=numpy.mean(md.mesh.y[md.mesh.elements.astype(int)-1],axis=1) -rad=numpy.sqrt(xelem**2+yelem**2) -flags=numpy.zeros(md.mesh.numberofelements) -pos=numpy.nonzero(rad>=(radius-shelfextent)) -md.friction.coefficient[md.mesh.elements[pos,:]-1]=0. -md.friction.p=numpy.ones((md.mesh.numberofelements)) -md.friction.q=numpy.ones((md.mesh.numberofelements)) +radius = 1.e6 +shelfextent = 2.e5 +md.friction.coefficient = 20. * np.ones((md.mesh.numberofvertices)) +xelem = np.mean(md.mesh.x[md.mesh.elements.astype(int) - 1], axis=1) +yelem = np.mean(md.mesh.y[md.mesh.elements.astype(int) - 1], axis=1) +rad = np.sqrt(xelem**2 + yelem**2) +flags = np.zeros(md.mesh.numberofelements) +pos = np.nonzero(rad >= (radius - shelfextent)) +md.friction.coefficient[md.mesh.elements[pos, :] - 1] = 0. +md.friction.p = np.ones((md.mesh.numberofelements)) +md.friction.q = np.ones((md.mesh.numberofelements)) #Numerical parameters -md.masstransport.stabilization=1 -md.thermal.stabilization=1 -md.verbose=verbose(0) -md.settings.waitonlock=30 -md.stressbalance.restol=0.05 -md.stressbalance.reltol=0.05 -md.steadystate.reltol=0.05 -md.stressbalance.abstol=float('nan') -md.timestepping.time_step=5. -md.timestepping.final_time=5. +md.masstransport.stabilization = 1 +md.thermal.stabilization = 1 +md.verbose = verbose(0) +md.settings.waitonlock = 30 +md.stressbalance.restol = 0.05 +md.stressbalance.reltol = 0.05 +md.steadystate.reltol = 0.05 +md.stressbalance.abstol = float('nan') +md.timestepping.time_step = 5. +md.timestepping.final_time = 5. #bathymetry and grounding line migration: -md.groundingline.migration='AggressiveMigration' -md.geometry.bed=copy.deepcopy(md.geometry.base) -pos=numpy.nonzero(md.mask.groundedice_levelset<0.)[0] -md.geometry.bed[pos]=md.geometry.base[pos]-900. +md.groundingline.migration = 'AggressiveMigration' +md.geometry.bed = copy.deepcopy(md.geometry.base) +pos = np.nonzero(md.mask.groundedice_levelset < 0.)[0] +md.geometry.bed[pos] = md.geometry.base[pos] - 900. #Deal with boundary conditions: -md.stressbalance.spcvx=float('nan')*numpy.ones((md.mesh.numberofvertices)) -md.stressbalance.spcvy=float('nan')*numpy.ones((md.mesh.numberofvertices)) -md.stressbalance.spcvz=float('nan')*numpy.ones((md.mesh.numberofvertices)) +md.stressbalance.spcvx = float('nan') * np.ones((md.mesh.numberofvertices)) +md.stressbalance.spcvy = float('nan') * np.ones((md.mesh.numberofvertices)) +md.stressbalance.spcvz = float('nan') * np.ones((md.mesh.numberofvertices)) -pos=numpy.nonzero(numpy.logical_and(md.mesh.x==0,md.mesh.y==0)) -md.stressbalance.spcvx[pos]=0 -md.stressbalance.spcvy[pos]=0 +pos = np.nonzero(np.logical_and(md.mesh.x == 0, md.mesh.y == 0)) +md.stressbalance.spcvx[pos] = 0 +md.stressbalance.spcvy[pos] = 0 -pos=numpy.nonzero(md.mesh.vertexonboundary) -md.mask.ice_levelset[pos]=0 -md.balancethickness.spcthickness=float('nan')*numpy.ones((md.mesh.numberofvertices)) -md.masstransport.spcthickness=float('nan')*numpy.ones((md.mesh.numberofvertices)) -md.stressbalance.referential=float('nan')*numpy.ones((md.mesh.numberofvertices,6)) -md.stressbalance.loadingforce=0*numpy.ones((md.mesh.numberofvertices,3)) -md.thermal.spctemperature=737.*numpy.ones((md.mesh.numberofvertices)) +pos = np.nonzero(md.mesh.vertexonboundary) +md.mask.ice_levelset[pos] = 0 +md.balancethickness.spcthickness = float('nan') * np.ones((md.mesh.numberofvertices)) +md.masstransport.spcthickness = float('nan') * np.ones((md.mesh.numberofvertices)) +md.stressbalance.referential = float('nan') * np.ones((md.mesh.numberofvertices, 6)) +md.stressbalance.loadingforce = 0 * np.ones((md.mesh.numberofvertices, 3)) +md.thermal.spctemperature = 737. * np.ones((md.mesh.numberofvertices)) #Change name so that no test have the same name if len(inspect.stack()) > 2: - md.miscellaneous.name = os.path.basename(inspect.stack()[2][1]).split('.')[0] + md.miscellaneous.name = os.path.basename(inspect.stack()[2][1]).split('.')[0] Index: /issm/trunk-jpl/test/Par/RoundSheetStaticEISMINT.py =================================================================== --- /issm/trunk-jpl/test/Par/RoundSheetStaticEISMINT.py (revision 24213) +++ /issm/trunk-jpl/test/Par/RoundSheetStaticEISMINT.py (revision 24214) @@ -3,55 +3,55 @@ print(" creating thickness") -hmin=0.01 -hmax=2756.7 -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 -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 -md.geometry.surface=md.geometry.base+md.geometry.thickness +hmin = 0.01 +hmax = 2756.7 +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 +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 +md.geometry.surface = md.geometry.base + md.geometry.thickness print(" creating drag") -md.friction.coefficient=20.*numpy.ones((md.mesh.numberofvertices)) -md.friction.coefficient[numpy.nonzero(md.mask.groundedice_levelset<0.)[0]]=0. -md.friction.p=numpy.ones((md.mesh.numberofelements)) -md.friction.q=numpy.ones((md.mesh.numberofelements)) +md.friction.coefficient = 20. * numpy.ones((md.mesh.numberofvertices)) +md.friction.coefficient[numpy.nonzero(md.mask.groundedice_levelset < 0.)[0]] = 0. +md.friction.p = numpy.ones((md.mesh.numberofelements)) +md.friction.q = numpy.ones((md.mesh.numberofelements)) print(" creating temperatures") -tmin=238.15 #K -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)) +tmin = 238.15 #K +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)) print(" creating flow law parameter") -md.materials.rheology_B=6.81*10**7*numpy.ones((md.mesh.numberofvertices)) #to have the same B as the analytical solution -md.materials.rheology_n=3.*numpy.ones((md.mesh.numberofelements)) +md.materials.rheology_B = 6.81 * 10**7 * numpy.ones((md.mesh.numberofvertices)) #to have the same B as the analytical solution +md.materials.rheology_n = 3. * numpy.ones((md.mesh.numberofelements)) print(" creating surface mass balance") -smb_max=0.5 #m/yr -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)) +smb_max = 0.5 #m / yr +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)) print(" creating velocities") -constant=0.3 -md.inversion.vx_obs=constant/2.*md.mesh.x*(md.geometry.thickness)**-1 -md.inversion.vy_obs=constant/2.*md.mesh.y*(md.geometry.thickness)**-1 -md.inversion.vel_obs=numpy.sqrt((md.inversion.vx_obs)**2+(md.inversion.vy_obs)**2) -md.initialization.vx=numpy.zeros((md.mesh.numberofvertices)) -md.initialization.vy=numpy.zeros((md.mesh.numberofvertices)) -md.initialization.vz=numpy.zeros((md.mesh.numberofvertices)) -md.initialization.pressure=numpy.zeros((md.mesh.numberofvertices)) +constant = 0.3 +md.inversion.vx_obs = constant / 2. * md.mesh.x * (md.geometry.thickness)**- 1 +md.inversion.vy_obs = constant / 2. * md.mesh.y * (md.geometry.thickness)**- 1 +md.inversion.vel_obs = numpy.sqrt((md.inversion.vx_obs)**2 + (md.inversion.vy_obs)**2) +md.initialization.vx = numpy.zeros((md.mesh.numberofvertices)) +md.initialization.vy = numpy.zeros((md.mesh.numberofvertices)) +md.initialization.vz = numpy.zeros((md.mesh.numberofvertices)) +md.initialization.pressure = numpy.zeros((md.mesh.numberofvertices)) #Deal with boundary conditions: print(" boundary conditions for stressbalance model:") -md=SetMarineIceSheetBC(md,'../Exp/RoundFrontEISMINT.exp') +md = SetMarineIceSheetBC(md, '../Exp/RoundFrontEISMINT.exp') -radius=numpy.sqrt((md.mesh.x)**2+(md.mesh.y)**2) -pos=numpy.nonzero(radius==numpy.min(radius))[0] -md.mesh.x[pos]=0. -md.mesh.y[pos]=0. #the closest node to the center is changed to be exactly at the center +radius = numpy.sqrt((md.mesh.x)**2 + (md.mesh.y)**2) +pos = numpy.nonzero(radius == numpy.min(radius))[0] +md.mesh.x[pos] = 0. +md.mesh.y[pos] = 0. #the closest node to the center is changed to be exactly at the center -md.stressbalance.spcvx[pos]=0. -md.stressbalance.spcvy[pos]=0. -md.stressbalance.spcvz[pos]=0. +md.stressbalance.spcvx[pos] = 0. +md.stressbalance.spcvy[pos] = 0. +md.stressbalance.spcvz[pos] = 0. Index: /issm/trunk-jpl/test/Par/SquareEISMINT.py =================================================================== --- /issm/trunk-jpl/test/Par/SquareEISMINT.py (revision 24213) +++ /issm/trunk-jpl/test/Par/SquareEISMINT.py (revision 24214) @@ -1,3 +1,3 @@ -import numpy +import numpy as np from SetMarineIceSheetBC import SetMarineIceSheetBC @@ -5,44 +5,44 @@ print(" creating thickness") -ymin=numpy.min(md.mesh.y) -ymax=numpy.max(md.mesh.y) -md.geometry.thickness=500.*numpy.ones((md.mesh.numberofvertices)) -md.geometry.base=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness -md.geometry.surface=md.geometry.base+md.geometry.thickness +ymin = np.min(md.mesh.y) +ymax = np.max(md.mesh.y) +md.geometry.thickness = 500. * np.ones((md.mesh.numberofvertices)) +md.geometry.base = -md.materials.rho_ice / md.materials.rho_water * md.geometry.thickness +md.geometry.surface = md.geometry.base + md.geometry.thickness print(" creating drag") -md.friction.coefficient=200.*numpy.ones((md.mesh.numberofvertices)) -md.friction.coefficient[numpy.nonzero(md.mask.groundedice_levelset<0.)[0]]=0. -md.friction.p=numpy.ones((md.mesh.numberofelements)) -md.friction.q=numpy.ones((md.mesh.numberofelements)) +md.friction.coefficient = 200. * np.ones((md.mesh.numberofvertices)) +md.friction.coefficient[np.nonzero(md.mask.groundedice_levelset < 0.)[0]] = 0. +md.friction.p = np.ones((md.mesh.numberofelements)) +md.friction.q = np.ones((md.mesh.numberofelements)) print(" creating initial values") -md.initialization.temperature=(273.-20.)*numpy.ones((md.mesh.numberofvertices)) -md.initialization.vx=numpy.zeros((md.mesh.numberofvertices)) -md.initialization.vy=numpy.zeros((md.mesh.numberofvertices)) -md.initialization.vz=numpy.zeros((md.mesh.numberofvertices)) -md.initialization.vel=numpy.zeros((md.mesh.numberofvertices)) -md.initialization.pressure=numpy.zeros((md.mesh.numberofvertices)) +md.initialization.temperature = (273. - 20.) * np.ones((md.mesh.numberofvertices)) +md.initialization.vx = np.zeros((md.mesh.numberofvertices)) +md.initialization.vy = np.zeros((md.mesh.numberofvertices)) +md.initialization.vz = np.zeros((md.mesh.numberofvertices)) +md.initialization.vel = np.zeros((md.mesh.numberofvertices)) +md.initialization.pressure = np.zeros((md.mesh.numberofvertices)) print(" creating flow law parameter") -md.materials.rheology_B=1.7687*10**8*numpy.ones((md.mesh.numberofvertices)) -md.materials.rheology_n=3.*numpy.ones((md.mesh.numberofelements)) +md.materials.rheology_B = 1.7687 * 10**8 * np.ones((md.mesh.numberofvertices)) +md.materials.rheology_n = 3. * np.ones((md.mesh.numberofelements)) print(" creating surface mass balance") -md.smb.mass_balance=0.2*numpy.ones((md.mesh.numberofvertices)) #0m/a -md.basalforcings.floatingice_melting_rate=0.*numpy.ones((md.mesh.numberofvertices)) #0m/a -md.basalforcings.groundedice_melting_rate=0.*numpy.ones((md.mesh.numberofvertices)) #0m/a +md.smb.mass_balance = 0.2 * np.ones((md.mesh.numberofvertices)) #0m / a +md.basalforcings.floatingice_melting_rate = 0. * np.ones((md.mesh.numberofvertices)) #0m / a +md.basalforcings.groundedice_melting_rate = 0. * np.ones((md.mesh.numberofvertices)) #0m / a print(" boundary conditions") -md=SetMarineIceSheetBC(md,'../Exp/SquareFrontEISMINT.exp') +md = SetMarineIceSheetBC(md, '../Exp/SquareFrontEISMINT.exp') #Evolution of the ice shelf -pos=numpy.nonzero(md.mesh.y==200000.) #nodes on the upper boundary condition -md.balancethickness.spcthickness=float('NaN')*numpy.ones((md.mesh.numberofvertices)) -md.balancethickness.spcthickness[pos]=500. -md.masstransport.spcthickness=float('NaN')*numpy.ones((md.mesh.numberofvertices)) -md.masstransport.spcthickness[pos]=500. -md.masstransport.stabilization=0 #Better result with no artificial diffusivity -md.thermal.stabilization=0 -md.timestepping.final_time=500. -md.timestepping.time_step=1 +pos = np.nonzero(md.mesh.y == 200000.) #nodes on the upper boundary condition +md.balancethickness.spcthickness = float('NaN') * np.ones((md.mesh.numberofvertices)) +md.balancethickness.spcthickness[pos] = 500. +md.masstransport.spcthickness = float('NaN') * np.ones((md.mesh.numberofvertices)) +md.masstransport.spcthickness[pos] = 500. +md.masstransport.stabilization = 0 #Better result with no artificial diffusivity +md.thermal.stabilization = 0 +md.timestepping.final_time = 500. +md.timestepping.time_step = 1 Index: /issm/trunk-jpl/test/Par/SquareSheetConstrained.py =================================================================== --- /issm/trunk-jpl/test/Par/SquareSheetConstrained.py (revision 24213) +++ /issm/trunk-jpl/test/Par/SquareSheetConstrained.py (revision 24214) @@ -11,66 +11,66 @@ #Geometry -hmin=300. -hmax=1000. -ymin=np.min(md.mesh.y) -ymax=np.max(md.mesh.y) -xmin=np.min(md.mesh.x) -xmax=np.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.surface=md.geometry.base+md.geometry.thickness +hmin = 300. +hmax = 1000. +ymin = np.min(md.mesh.y) +ymax = np.max(md.mesh.y) +xmin = np.min(md.mesh.x) +xmax = np.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.surface = md.geometry.base + md.geometry.thickness -#Initial velocity -x = np.array(archread('../Data/SquareSheetConstrained.arch','x')) -y = np.array(archread('../Data/SquareSheetConstrained.arch','y')) -vx = np.array(archread('../Data/SquareSheetConstrained.arch','vx')) -vy = np.array(archread('../Data/SquareSheetConstrained.arch','vy')) -index = archread('../Data/SquareSheetConstrained.arch','index').astype(int) +#Initial velocity +x = np.array(archread('../Data/SquareSheetConstrained.arch', 'x')) +y = np.array(archread('../Data/SquareSheetConstrained.arch', 'y')) +vx = np.array(archread('../Data/SquareSheetConstrained.arch', 'vx')) +vy = np.array(archread('../Data/SquareSheetConstrained.arch', 'vy')) +index = archread('../Data/SquareSheetConstrained.arch', 'index').astype(int) -md.initialization.vx=InterpFromMeshToMesh2d(index,x,y,vx,md.mesh.x,md.mesh.y)[0] -md.initialization.vy=InterpFromMeshToMesh2d(index,x,y,vy,md.mesh.x,md.mesh.y)[0] -md.initialization.vz=np.zeros((md.mesh.numberofvertices)) -md.initialization.pressure=np.zeros((md.mesh.numberofvertices)) +md.initialization.vx = InterpFromMeshToMesh2d(index, x, y, vx, md.mesh.x, md.mesh.y)[0] +md.initialization.vy = InterpFromMeshToMesh2d(index, x, y, vy, md.mesh.x, md.mesh.y)[0] +md.initialization.vz = np.zeros((md.mesh.numberofvertices)) +md.initialization.pressure = np.zeros((md.mesh.numberofvertices)) #Materials -md.initialization.temperature=(273.-20.)*np.ones((md.mesh.numberofvertices)) -md.materials.rheology_B=paterson(md.initialization.temperature) -md.materials.rheology_n=3.*np.ones((md.mesh.numberofelements)) +md.initialization.temperature = (273. - 20.) * np.ones((md.mesh.numberofvertices)) +md.materials.rheology_B = paterson(md.initialization.temperature) +md.materials.rheology_n = 3. * np.ones((md.mesh.numberofelements)) #Calving -md.calving.calvingrate=np.zeros((md.mesh.numberofvertices)) -md.levelset.spclevelset=np.nan*np.ones((md.mesh.numberofvertices)) +md.calving.calvingrate = np.zeros((md.mesh.numberofvertices)) +md.levelset.spclevelset = np.nan * np.ones((md.mesh.numberofvertices)) #Friction -md.friction.coefficient=20.*np.ones((md.mesh.numberofvertices)) -md.friction.coefficient[np.where(md.mask.groundedice_levelset<0.)[0]]=0. -md.friction.p=np.ones((md.mesh.numberofelements)) -md.friction.q=np.ones((md.mesh.numberofelements)) +md.friction.coefficient = 20. * np.ones((md.mesh.numberofvertices)) +md.friction.coefficient[np.where(md.mask.groundedice_levelset < 0.)[0]] = 0. +md.friction.p = np.ones((md.mesh.numberofelements)) +md.friction.q = np.ones((md.mesh.numberofelements)) #Numerical parameters -md.masstransport.stabilization=1. -md.thermal.stabilization=1. -md.verbose=verbose(0) -md.settings.waitonlock=30 -md.stressbalance.restol=0.05 -md.steadystate.reltol=0.05 -md.stressbalance.reltol=0.05 -md.stressbalance.abstol=np.nan -md.timestepping.time_step=1. -md.timestepping.final_time=3. -md.groundingline.migration='None' +md.masstransport.stabilization = 1. +md.thermal.stabilization = 1. +md.verbose = verbose(0) +md.settings.waitonlock = 30 +md.stressbalance.restol = 0.05 +md.steadystate.reltol = 0.05 +md.stressbalance.reltol = 0.05 +md.stressbalance.abstol = np.nan +md.timestepping.time_step = 1. +md.timestepping.final_time = 3. +md.groundingline.migration = 'None' #GIA: -md.gia.lithosphere_thickness=100.*np.ones((md.mesh.numberofvertices)); # in km -md.gia.mantle_viscosity=1.*10**21*np.ones((md.mesh.numberofvertices)); # in Pa.s -md.materials.lithosphere_shear_modulus=6.7*10**10; # in Pa -md.materials.lithosphere_density=3.32; # in g/cm^-3 -md.materials.mantle_shear_modulus=1.45*10**11; # in Pa -md.materials.mantle_density=3.34; # in g/cm^-3 +md.gia.lithosphere_thickness = 100. * np.ones((md.mesh.numberofvertices)) # in km +md.gia.mantle_viscosity = 1. * 10**21 * np.ones((md.mesh.numberofvertices)) # in Pa.s +md.materials.lithosphere_shear_modulus = 6.7 * 10**10 # in Pa +md.materials.lithosphere_density = 3.32 # in g / cm^ - 3 +md.materials.mantle_shear_modulus = 1.45 * 10**11 # in Pa +md.materials.mantle_density = 3.34 # in g / cm^ - 3 #Boundary conditions: -md=SetIceSheetBC(md) +md = SetIceSheetBC(md) #Change name so that no test have the same name if len(inspect.stack()) > 2: - md.miscellaneous.name = os.path.basename(inspect.stack()[2][1]).split('.')[0] + md.miscellaneous.name = os.path.basename(inspect.stack()[2][1]).split('.')[0] Index: /issm/trunk-jpl/test/Par/SquareSheetConstrainedCO2.py =================================================================== --- /issm/trunk-jpl/test/Par/SquareSheetConstrainedCO2.py (revision 24213) +++ /issm/trunk-jpl/test/Par/SquareSheetConstrainedCO2.py (revision 24214) @@ -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 @@ -27,54 +27,54 @@ #Geometry -hmin=300. -hmax=1000. -ymin=np.min(md.mesh.y) -ymax=np.max(md.mesh.y) -xmin=min(md.mesh.x) -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.surface=md.geometry.base+md.geometry.thickness +hmin = 300. +hmax = 1000. +ymin = np.min(md.mesh.y) +ymax = np.max(md.mesh.y) +xmin = min(md.mesh.x) +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.surface = md.geometry.base + md.geometry.thickness #Initial velocity -x = np.array(archread('../Data/SquareSheetConstrained.arch','x')) -y = np.array(archread('../Data/SquareSheetConstrained.arch','y')) -vx = np.array(archread('../Data/SquareSheetConstrained.arch','vx')) -vy = np.array(archread('../Data/SquareSheetConstrained.arch','vy')) -index = archread('../Data/SquareSheetConstrained.arch','index').astype(int) +x = np.array(archread('../Data/SquareSheetConstrained.arch', 'x')) +y = np.array(archread('../Data/SquareSheetConstrained.arch', 'y')) +vx = np.array(archread('../Data/SquareSheetConstrained.arch', 'vx')) +vy = np.array(archread('../Data/SquareSheetConstrained.arch', 'vy')) +index = archread('../Data/SquareSheetConstrained.arch', 'index').astype(int) -[md.initialization.vx]=InterpFromMeshToMesh2d(index,x,y,vx,md.mesh.x,md.mesh.y) -[md.initialization.vy]=InterpFromMeshToMesh2d(index,x,y,vy,md.mesh.x,md.mesh.y) -md.initialization.vz=np.zeros((md.mesh.numberofvertices)) -md.initialization.pressure=np.zeros((md.mesh.numberofvertices)) +[md.initialization.vx] = InterpFromMeshToMesh2d(index, x, y, vx, md.mesh.x, md.mesh.y) +[md.initialization.vy] = InterpFromMeshToMesh2d(index, x, y, vy, md.mesh.x, md.mesh.y) +md.initialization.vz = np.zeros((md.mesh.numberofvertices)) +md.initialization.pressure = np.zeros((md.mesh.numberofvertices)) #Materials -md.initialization.temperature=CO2_temp*np.ones((md.mesh.numberofvertices)) -md.materials.rheology_B=nye(md.initialization.temperature,1) -md.materials.rheology_n=CO2_n*np.ones((md.mesh.numberofelements)) +md.initialization.temperature = CO2_temp * np.ones((md.mesh.numberofvertices)) +md.materials.rheology_B = nye(md.initialization.temperature, 1) +md.materials.rheology_n = CO2_n * np.ones((md.mesh.numberofelements)) #Surface mass balance and basal melting -md.smb.mass_balance=10.*np.ones((md.mesh.numberofvertices)) -md.basalforcings.groundedice_melting_rate=5.*np.ones((md.mesh.numberofvertices)) -md.basalforcings.floatingice_melting_rate=5.*np.ones((md.mesh.numberofvertices)) +md.smb.mass_balance = 10. * np.ones((md.mesh.numberofvertices)) +md.basalforcings.groundedice_melting_rate = 5. * np.ones((md.mesh.numberofvertices)) +md.basalforcings.floatingice_melting_rate = 5. * np.ones((md.mesh.numberofvertices)) #Friction -md.friction.coefficient=20.*np.ones((md.mesh.numberofvertices)) -md.friction.coefficient[np.nonzero(md.mask.groundedice_levelset<0.)[0]]=0. -md.friction.p=np.ones((md.mesh.numberofelements)) -md.friction.q=np.ones((md.mesh.numberofelements)) +md.friction.coefficient = 20. * np.ones((md.mesh.numberofvertices)) +md.friction.coefficient[np.nonzero(md.mask.groundedice_levelset < 0.)[0]] = 0. +md.friction.p = np.ones((md.mesh.numberofelements)) +md.friction.q = np.ones((md.mesh.numberofelements)) #Numerical parameters -md.masstransport.stabilization=1 -md.thermal.stabilization=1 +md.masstransport.stabilization = 1 +md.thermal.stabilization = 1 md.verbose = verbose(0) -md.settings.waitonlock=30 -md.stressbalance.restol=0.05 -md.stressbalance.reltol=0.05 -md.steadystate.reltol=0.05 -md.stressbalance.abstol=float('nan') -md.timestepping.time_step=1. -md.timestepping.final_time=3. -md.groundingline.migration='None' +md.settings.waitonlock = 30 +md.stressbalance.restol = 0.05 +md.stressbalance.reltol = 0.05 +md.steadystate.reltol = 0.05 +md.stressbalance.abstol = float('nan') +md.timestepping.time_step = 1. +md.timestepping.final_time = 3. +md.groundingline.migration = 'None' #Deal with boundary conditions: @@ -83,3 +83,3 @@ #Change name so that no tests have the same name if len(inspect.stack()) > 2: - md.miscellaneous.name = os.path.basename(inspect.stack()[2][1]).split('.')[0] + md.miscellaneous.name = os.path.basename(inspect.stack()[2][1]).split('.')[0] Index: /issm/trunk-jpl/test/Par/SquareSheetShelf.py =================================================================== --- /issm/trunk-jpl/test/Par/SquareSheetShelf.py (revision 24213) +++ /issm/trunk-jpl/test/Par/SquareSheetShelf.py (revision 24214) @@ -2,8 +2,8 @@ import inspect from arch import * -import numpy +import numpy as np from verbose import verbose from InterpFromMeshToMesh2d import InterpFromMeshToMesh2d -from paterson import paterson +from paterson import paterson from SetMarineIceSheetBC import SetMarineIceSheetBC @@ -11,62 +11,62 @@ #Geometry -hmin=300. -hmax=1000. -ymin=min(md.mesh.y) -ymax=max(md.mesh.y) -xmin=min(md.mesh.x) -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)) -pos=numpy.nonzero(md.mesh.y<=ymax/2.) -md.geometry.base[pos]=bed_sheet -md.geometry.surface=md.geometry.base+md.geometry.thickness +hmin = 300. +hmax = 1000. +ymin = min(md.mesh.y) +ymax = max(md.mesh.y) +xmin = min(md.mesh.x) +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)) +pos = np.nonzero(md.mesh.y <= ymax / 2.) +md.geometry.base[pos] = bed_sheet +md.geometry.surface = md.geometry.base + md.geometry.thickness -#Initial velocity -x = numpy.array(archread('../Data/SquareSheetShelf.arch','x')) -y = numpy.array(archread('../Data/SquareSheetShelf.arch','y')) -vx = numpy.array(archread('../Data/SquareSheetShelf.arch','vx')); -vy = numpy.array(archread('../Data/SquareSheetShelf.arch','vy')); -index = numpy.array(archread('../Data/SquareSheetShelf.arch','index')).astype(int); +#Initial velocity +x = np.array(archread('../Data/SquareSheetShelf.arch', 'x')) +y = np.array(archread('../Data/SquareSheetShelf.arch', 'y')) +vx = np.array(archread('../Data/SquareSheetShelf.arch', 'vx')) +vy = np.array(archread('../Data/SquareSheetShelf.arch', 'vy')) +index = np.array(archread('../Data/SquareSheetShelf.arch', 'index')).astype(int) -[md.initialization.vx] = InterpFromMeshToMesh2d(index,x,y,vx,md.mesh.x,md.mesh.y) -[md.initialization.vy] = InterpFromMeshToMesh2d(index,x,y,vy,md.mesh.x,md.mesh.y) -md.initialization.vz=numpy.zeros((md.mesh.numberofvertices)) -md.initialization.pressure=numpy.zeros((md.mesh.numberofvertices)) +[md.initialization.vx] = InterpFromMeshToMesh2d(index, x, y, vx, md.mesh.x, md.mesh.y) +[md.initialization.vy] = InterpFromMeshToMesh2d(index, x, y, vy, md.mesh.x, md.mesh.y) +md.initialization.vz = np.zeros((md.mesh.numberofvertices)) +md.initialization.pressure = np.zeros((md.mesh.numberofvertices)) #Materials -md.initialization.temperature=(273.-20.)*numpy.ones((md.mesh.numberofvertices)) -md.materials.rheology_B=paterson(md.initialization.temperature) -md.materials.rheology_n=3.*numpy.ones((md.mesh.numberofelements)) +md.initialization.temperature = (273. - 20.) * np.ones((md.mesh.numberofvertices)) +md.materials.rheology_B = paterson(md.initialization.temperature) +md.materials.rheology_n = 3. * np.ones((md.mesh.numberofelements)) #Accumulation and melting -md.smb.mass_balance=10.*numpy.ones((md.mesh.numberofvertices)) -md.basalforcings.groundedice_melting_rate=5.*numpy.ones((md.mesh.numberofvertices)) -md.basalforcings.floatingice_melting_rate=5.*numpy.ones((md.mesh.numberofvertices)) +md.smb.mass_balance = 10. * np.ones((md.mesh.numberofvertices)) +md.basalforcings.groundedice_melting_rate = 5. * np.ones((md.mesh.numberofvertices)) +md.basalforcings.floatingice_melting_rate = 5. * np.ones((md.mesh.numberofvertices)) #Friction -md.friction.coefficient=20.*numpy.ones((md.mesh.numberofvertices)) -md.friction.coefficient[numpy.nonzero(md.mask.groundedice_levelset<0.)[0]]=0. -md.friction.p=numpy.ones((md.mesh.numberofelements)) -md.friction.q=numpy.ones((md.mesh.numberofelements)) +md.friction.coefficient = 20. * np.ones((md.mesh.numberofvertices)) +md.friction.coefficient[np.nonzero(md.mask.groundedice_levelset < 0.)[0]] = 0. +md.friction.p = np.ones((md.mesh.numberofelements)) +md.friction.q = np.ones((md.mesh.numberofelements)) #Numerical parameters -md.masstransport.stabilization=1 -md.thermal.stabilization=1 -md.verbose=verbose(0) -md.settings.waitonlock=30 -md.stressbalance.restol=0.05 -md.steadystate.reltol=0.05 -md.stressbalance.reltol=0.05 -md.stressbalance.abstol=float('NaN') -md.timestepping.time_step=1. -md.timestepping.final_time=3. -md.groundingline.migration='None' +md.masstransport.stabilization = 1 +md.thermal.stabilization = 1 +md.verbose = verbose(0) +md.settings.waitonlock = 30 +md.stressbalance.restol = 0.05 +md.steadystate.reltol = 0.05 +md.stressbalance.reltol = 0.05 +md.stressbalance.abstol = float('NaN') +md.timestepping.time_step = 1. +md.timestepping.final_time = 3. +md.groundingline.migration = 'None' #Deal with boundary conditions: -md=SetMarineIceSheetBC(md,'../Exp/SquareFront.exp') +md = SetMarineIceSheetBC(md, '../Exp/SquareFront.exp') #Change name so that no test have the same name if len(inspect.stack()) > 2: - md.miscellaneous.name = os.path.basename(inspect.stack()[2][1]).split('.')[0] + md.miscellaneous.name = os.path.basename(inspect.stack()[2][1]).split('.')[0] Index: /issm/trunk-jpl/test/Par/SquareShelf.py =================================================================== --- /issm/trunk-jpl/test/Par/SquareShelf.py (revision 24213) +++ /issm/trunk-jpl/test/Par/SquareShelf.py (revision 24214) @@ -2,5 +2,5 @@ import inspect from arch import * -import numpy +import numpy as np from verbose import verbose from InterpFromMeshToMesh2d import InterpFromMeshToMesh2d @@ -10,32 +10,32 @@ #Start defining model parameters here #Geometry -hmin=300. -hmax=1000. -ymin=min(md.mesh.y) -ymax=max(md.mesh.y) -xmin=min(md.mesh.x) -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.surface=md.geometry.base+md.geometry.thickness -md.geometry.bed = md.geometry.base-500.; +hmin = 300. +hmax = 1000. +ymin = min(md.mesh.y) +ymax = max(md.mesh.y) +xmin = min(md.mesh.x) +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.surface = md.geometry.base + md.geometry.thickness +md.geometry.bed = md.geometry.base - 500. #Initial velocity and pressure -x = numpy.array(archread('../Data/SquareShelf.arch','x')) -y = numpy.array(archread('../Data/SquareShelf.arch','y')) -vx = numpy.array(archread('../Data/SquareShelf.arch','vx')); -vy = numpy.array(archread('../Data/SquareShelf.arch','vy')); -index = archread('../Data/SquareShelf.arch','index').astype(int); +x = np.array(archread('../Data/SquareShelf.arch', 'x')) +y = np.array(archread('../Data/SquareShelf.arch', 'y')) +vx = np.array(archread('../Data/SquareShelf.arch', 'vx')) +vy = np.array(archread('../Data/SquareShelf.arch', 'vy')) +index = archread('../Data/SquareShelf.arch', 'index').astype(int) #dbg - begin -# #print 'vars in SquareShelf.nc:' -# #for v in iVelF.variables: -# # print v -#dbg - end +# #print 'vars in SquareShelf.nc:' +# #for v in iVelF.variables: +# # print v +#dbg - end -[md.initialization.vx]=InterpFromMeshToMesh2d(index,x,y,vx,md.mesh.x,md.mesh.y) -[md.initialization.vy]=InterpFromMeshToMesh2d(index,x,y,vy,md.mesh.x,md.mesh.y) -md.initialization.vz=numpy.zeros((md.mesh.numberofvertices)) -md.initialization.pressure=numpy.zeros((md.mesh.numberofvertices)) +[md.initialization.vx] = InterpFromMeshToMesh2d(index, x, y, vx, md.mesh.x, md.mesh.y) +[md.initialization.vy] = InterpFromMeshToMesh2d(index, x, y, vy, md.mesh.x, md.mesh.y) +md.initialization.vz = np.zeros((md.mesh.numberofvertices)) +md.initialization.pressure = np.zeros((md.mesh.numberofvertices)) #dbg - begin @@ -44,21 +44,21 @@ #print '...vy:' #print md.initialization.vy -##print '...vz:' -##print md.initialization.vz -##print '...pressure:' -##print md.initialization.pressure -#dbg - end +# #print '...vz:' +# #print md.initialization.vz +# #print '...pressure:' +# #print md.initialization.pressure +#dbg - end #Materials -md.initialization.temperature = (273.-20.)*numpy.ones((md.mesh.numberofvertices)) +md.initialization.temperature = (273. - 20.) * np.ones((md.mesh.numberofvertices)) md.materials.rheology_B = paterson(md.initialization.temperature) -md.materials.rheology_n = 3.*numpy.ones((md.mesh.numberofelements)) +md.materials.rheology_n = 3. * np.ones((md.mesh.numberofelements)) #Friction -md.friction.coefficient = 20.*numpy.ones((md.mesh.numberofvertices)) -md.friction.coefficient[numpy.nonzero(md.mask.groundedice_levelset<0.)[0]]=0. -md.friction.p = numpy.ones((md.mesh.numberofelements)) -md.friction.q = numpy.ones((md.mesh.numberofelements)) +md.friction.coefficient = 20. * np.ones((md.mesh.numberofvertices)) +md.friction.coefficient[np.nonzero(md.mask.groundedice_levelset < 0.)[0]] = 0. +md.friction.p = np.ones((md.mesh.numberofelements)) +md.friction.q = np.ones((md.mesh.numberofelements)) #Numerical parameters @@ -66,5 +66,5 @@ md.thermal.stabilization = 1. md.settings.waitonlock = 30 -md.verbose=verbose() +md.verbose = verbose() md.stressbalance.restol = 0.10 md.steadystate.reltol = 0.02 @@ -76,8 +76,8 @@ #Boundary conditions: -# #md=SetIceShelfBC(md) -md=SetIceShelfBC(md,'../Exp/SquareFront.exp') +# #md = SetIceShelfBC(md) +md = SetIceShelfBC(md, '../Exp/SquareFront.exp') #Change name so that no test have the same name if len(inspect.stack()) > 2: - md.miscellaneous.name=os.path.basename(inspect.stack()[2][1]).split('.')[0] + md.miscellaneous.name = os.path.basename(inspect.stack()[2][1]).split('.')[0] Index: /issm/trunk-jpl/test/Par/SquareShelf2.py =================================================================== --- /issm/trunk-jpl/test/Par/SquareShelf2.py (revision 24213) +++ /issm/trunk-jpl/test/Par/SquareShelf2.py (revision 24214) @@ -2,5 +2,5 @@ import inspect from arch import * -import numpy +import numpy as np from verbose import verbose from InterpFromMeshToMesh2d import InterpFromMeshToMesh2d @@ -10,30 +10,30 @@ #Start defining model parameters here #Geometry -hmin=300. -hmax=1000. -ymin=min(md.mesh.y) -ymax=max(md.mesh.y) -xmin=min(md.mesh.x) -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.surface=md.geometry.base+md.geometry.thickness +hmin = 300. +hmax = 1000. +ymin = min(md.mesh.y) +ymax = max(md.mesh.y) +xmin = min(md.mesh.x) +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.surface = md.geometry.base + md.geometry.thickness #Initial velocity and pressure -x = numpy.array(archread('../Data/SquareShelf.arch','x')) -y = numpy.array(archread('../Data/SquareShelf.arch','y')) -vx = numpy.array(archread('../Data/SquareShelf.arch','vx')); -vy = numpy.array(archread('../Data/SquareShelf.arch','vy')); -index = archread('../Data/SquareShelf.arch','index').astype(int); +x = np.array(archread('../Data/SquareShelf.arch', 'x')) +y = np.array(archread('../Data/SquareShelf.arch', 'y')) +vx = np.array(archread('../Data/SquareShelf.arch', 'vx')) +vy = np.array(archread('../Data/SquareShelf.arch', 'vy')) +index = archread('../Data/SquareShelf.arch', 'index').astype(int) #dbg - begin -# #print 'vars in SquareShelf.nc:' -# #for v in iVelF.variables: -# # print v -#dbg - end +# #print 'vars in SquareShelf.nc:' +# #for v in iVelF.variables: +# # print v +#dbg - end -[md.initialization.vx]=InterpFromMeshToMesh2d(index,x,y,vx,md.mesh.x,md.mesh.y) -[md.initialization.vy]=InterpFromMeshToMesh2d(index,x,y,vy,md.mesh.x,md.mesh.y) -md.initialization.vz=numpy.zeros((md.mesh.numberofvertices)) -md.initialization.pressure=numpy.zeros((md.mesh.numberofvertices)) +[md.initialization.vx] = InterpFromMeshToMesh2d(index, x, y, vx, md.mesh.x, md.mesh.y) +[md.initialization.vy] = InterpFromMeshToMesh2d(index, x, y, vy, md.mesh.x, md.mesh.y) +md.initialization.vz = np.zeros((md.mesh.numberofvertices)) +md.initialization.pressure = np.zeros((md.mesh.numberofvertices)) #dbg - begin @@ -42,21 +42,21 @@ #print '...vy:' #print md.initialization.vy -##print '...vz:' -##print md.initialization.vz -##print '...pressure:' -##print md.initialization.pressure -#dbg - end +# #print '...vz:' +# #print md.initialization.vz +# #print '...pressure:' +# #print md.initialization.pressure +#dbg - end #Materials -md.initialization.temperature = (273.-20.)*numpy.ones((md.mesh.numberofvertices)) +md.initialization.temperature = (273. - 20.) * np.ones((md.mesh.numberofvertices)) md.materials.rheology_B = paterson(md.initialization.temperature) -md.materials.rheology_n = 3.*numpy.ones((md.mesh.numberofelements)) +md.materials.rheology_n = 3. * np.ones((md.mesh.numberofelements)) #Friction -md.friction.coefficient = 20.*numpy.ones((md.mesh.numberofvertices)) -md.friction.coefficient[numpy.nonzero(md.mask.groundedice_levelset<0.)[0]]=0. -md.friction.p = numpy.ones((md.mesh.numberofelements)) -md.friction.q = numpy.ones((md.mesh.numberofelements)) +md.friction.coefficient = 20. * np.ones((md.mesh.numberofvertices)) +md.friction.coefficient[np.nonzero(md.mask.groundedice_levelset < 0.)[0]] = 0. +md.friction.p = np.ones((md.mesh.numberofelements)) +md.friction.q = np.ones((md.mesh.numberofelements)) #Numerical parameters @@ -64,5 +64,5 @@ md.thermal.stabilization = 1. md.settings.waitonlock = 30 -md.verbose=verbose() +md.verbose = verbose() md.stressbalance.restol = 0.10 md.steadystate.reltol = 0.02 @@ -71,11 +71,11 @@ md.timestepping.time_step = 1. md.timestepping.final_time = 3. -md.groundingline.migration= 'None' +md.groundingline.migration = 'None' #Boundary conditions: -# #md=SetIceShelfBC(md) -md=SetIceShelfBC(md,'../Exp/SquareFront2.exp') +# #md = SetIceShelfBC(md) +md = SetIceShelfBC(md, '../Exp/SquareFront2.exp') #Change name so that no test have the same name if len(inspect.stack()) > 2: - md.miscellaneous.name=os.path.basename(inspect.stack()[2][1]).split('.')[0] + md.miscellaneous.name = os.path.basename(inspect.stack()[2][1]).split('.')[0] Index: /issm/trunk-jpl/test/Par/SquareShelfConstrained.py =================================================================== --- /issm/trunk-jpl/test/Par/SquareShelfConstrained.py (revision 24213) +++ /issm/trunk-jpl/test/Par/SquareShelfConstrained.py (revision 24214) @@ -10,54 +10,54 @@ #Start defining model parameters here #Geometry -hmin=300. -hmax=1000. -ymin=np.min(md.mesh.y) -ymax=np.max(md.mesh.y) -xmin=min(md.mesh.x) -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.surface=md.geometry.base+md.geometry.thickness -md.geometry.bed=md.geometry.base-10; +hmin = 300. +hmax = 1000. +ymin = np.min(md.mesh.y) +ymax = np.max(md.mesh.y) +xmin = min(md.mesh.x) +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.surface = md.geometry.base + md.geometry.thickness +md.geometry.bed = md.geometry.base - 10 #Initial velocity -x = np.array(archread('../Data/SquareShelfConstrained.arch','x')) -y = np.array(archread('../Data/SquareShelfConstrained.arch','y')) -vx = np.array(archread('../Data/SquareShelfConstrained.arch','vx')) -vy = np.array(archread('../Data/SquareShelfConstrained.arch','vy')) -index = np.array(archread('../Data/SquareShelfConstrained.arch','index').astype(int)) +x = np.array(archread('../Data/SquareShelfConstrained.arch', 'x')) +y = np.array(archread('../Data/SquareShelfConstrained.arch', 'y')) +vx = np.array(archread('../Data/SquareShelfConstrained.arch', 'vx')) +vy = np.array(archread('../Data/SquareShelfConstrained.arch', 'vy')) +index = np.array(archread('../Data/SquareShelfConstrained.arch', 'index').astype(int)) -[md.initialization.vx]=InterpFromMeshToMesh2d(index,x,y,vx,md.mesh.x,md.mesh.y) -[md.initialization.vy]=InterpFromMeshToMesh2d(index,x,y,vy,md.mesh.x,md.mesh.y) -md.initialization.vz=np.zeros((md.mesh.numberofvertices)) -md.initialization.pressure=np.zeros((md.mesh.numberofvertices)) +[md.initialization.vx] = InterpFromMeshToMesh2d(index, x, y, vx, md.mesh.x, md.mesh.y) +[md.initialization.vy] = InterpFromMeshToMesh2d(index, x, y, vy, md.mesh.x, md.mesh.y) +md.initialization.vz = np.zeros((md.mesh.numberofvertices)) +md.initialization.pressure = np.zeros((md.mesh.numberofvertices)) #Materials -md.initialization.temperature=(273.-20.)*np.ones((md.mesh.numberofvertices)) -md.materials.rheology_B=paterson(md.initialization.temperature) -md.materials.rheology_n=3.*np.ones((md.mesh.numberofelements)) +md.initialization.temperature = (273. - 20.) * np.ones((md.mesh.numberofvertices)) +md.materials.rheology_B = paterson(md.initialization.temperature) +md.materials.rheology_n = 3. * np.ones((md.mesh.numberofelements)) #Surface mass balance and basal melting -md.smb.mass_balance=10.*np.ones((md.mesh.numberofvertices)) -md.basalforcings.groundedice_melting_rate=5.*np.ones((md.mesh.numberofvertices)) -md.basalforcings.floatingice_melting_rate=5.*np.ones((md.mesh.numberofvertices)) +md.smb.mass_balance = 10. * np.ones((md.mesh.numberofvertices)) +md.basalforcings.groundedice_melting_rate = 5. * np.ones((md.mesh.numberofvertices)) +md.basalforcings.floatingice_melting_rate = 5. * np.ones((md.mesh.numberofvertices)) #Friction -md.friction.coefficient=20.*np.ones((md.mesh.numberofvertices)) -md.friction.coefficient[np.nonzero(md.mask.groundedice_levelset<0.)[0]]=0. -md.friction.p=np.ones((md.mesh.numberofelements)) -md.friction.q=np.ones((md.mesh.numberofelements)) +md.friction.coefficient = 20. * np.ones((md.mesh.numberofvertices)) +md.friction.coefficient[np.nonzero(md.mask.groundedice_levelset < 0.)[0]] = 0. +md.friction.p = np.ones((md.mesh.numberofelements)) +md.friction.q = np.ones((md.mesh.numberofelements)) #Numerical parameters -md.masstransport.stabilization=1 -md.thermal.stabilization=1 +md.masstransport.stabilization = 1 +md.thermal.stabilization = 1 md.verbose = verbose(0) -md.settings.waitonlock=30 -md.stressbalance.restol=0.05 -md.stressbalance.reltol=0.05 -md.steadystate.reltol=0.05 -md.stressbalance.abstol=float('nan') -md.timestepping.time_step=1. -md.timestepping.final_time=3. +md.settings.waitonlock = 30 +md.stressbalance.restol = 0.05 +md.stressbalance.reltol = 0.05 +md.steadystate.reltol = 0.05 +md.stressbalance.abstol = float('nan') +md.timestepping.time_step = 1. +md.timestepping.final_time = 3. #Deal with boundary conditions: @@ -66,3 +66,3 @@ #Change name so that no tests have the same name if len(inspect.stack()) > 2: - md.miscellaneous.name = os.path.basename(inspect.stack()[2][1]).split('.')[0] + md.miscellaneous.name = os.path.basename(inspect.stack()[2][1]).split('.')[0] Index: /issm/trunk-jpl/test/Par/SquareThermal.py =================================================================== --- /issm/trunk-jpl/test/Par/SquareThermal.py (revision 24213) +++ /issm/trunk-jpl/test/Par/SquareThermal.py (revision 24214) @@ -1,3 +1,3 @@ -import numpy +import numpy as np from paterson import paterson from SetMarineIceSheetBC import SetMarineIceSheetBC @@ -5,47 +5,47 @@ #Ok, start defining model parameters here -md.timestepping.time_step=0 -md.groundingline.migration='None' +md.timestepping.time_step = 0 +md.groundingline.migration = 'None' print(" creating thickness") -h=1000. -md.geometry.thickness=h*numpy.ones((md.mesh.numberofvertices)) -md.geometry.base=-1000.*numpy.ones((md.mesh.numberofvertices)) -md.geometry.surface=md.geometry.base+md.geometry.thickness; +h = 1000. +md.geometry.thickness = h * np.ones((md.mesh.numberofvertices)) +md.geometry.base = - 1000. * np.ones((md.mesh.numberofvertices)) +md.geometry.surface = md.geometry.base + md.geometry.thickness print(" creating velocities") -md.initialization.vx=numpy.zeros((md.mesh.numberofvertices)) -md.initialization.vy=numpy.zeros((md.mesh.numberofvertices)) -md.initialization.vz=numpy.zeros((md.mesh.numberofvertices)) +md.initialization.vx = np.zeros((md.mesh.numberofvertices)) +md.initialization.vy = np.zeros((md.mesh.numberofvertices)) +md.initialization.vz = np.zeros((md.mesh.numberofvertices)) print(" creating drag") -md.friction.coefficient=200.*numpy.ones((md.mesh.numberofvertices)) -md.friction.coefficient[numpy.nonzero(md.mask.groundedice_levelset<0.)[0]]=0. -md.friction.p=numpy.ones((md.mesh.numberofelements)) -md.friction.q=numpy.ones((md.mesh.numberofelements)) +md.friction.coefficient = 200. * np.ones((md.mesh.numberofvertices)) +md.friction.coefficient[np.nonzero(md.mask.groundedice_levelset < 0.)[0]] = 0. +md.friction.p = np.ones((md.mesh.numberofelements)) +md.friction.q = np.ones((md.mesh.numberofelements)) print(" creating temperatures") -md.initialization.temperature=(273.-20.)*numpy.ones((md.mesh.numberofvertices)) -md.initialization.pressure=numpy.zeros((md.mesh.numberofvertices,)) -md.initialization.waterfraction=numpy.zeros((md.mesh.numberofvertices,)) -md.initialization.watercolumn=numpy.zeros((md.mesh.numberofvertices,)) +md.initialization.temperature = (273. - 20.) * np.ones((md.mesh.numberofvertices)) +md.initialization.pressure = np.zeros((md.mesh.numberofvertices, )) +md.initialization.waterfraction = np.zeros((md.mesh.numberofvertices, )) +md.initialization.watercolumn = np.zeros((md.mesh.numberofvertices, )) print(" creating flow law parameter") -md.materials.rheology_B=paterson(md.initialization.temperature) -md.materials.rheology_n=3.*numpy.ones((md.mesh.numberofelements)) +md.materials.rheology_B = paterson(md.initialization.temperature) +md.materials.rheology_n = 3. * np.ones((md.mesh.numberofelements)) print(" creating surface mass balance") -md.smb.mass_balance=numpy.ones((md.mesh.numberofvertices))/md.constants.yts #1m/a -#md.basalforcings.melting_rate=0.*numpy.ones((md.mesh.numberofvertices))/md.constants.yts #1m/a -md.basalforcings.groundedice_melting_rate=0.*numpy.ones((md.mesh.numberofvertices))/md.constants.yts #1m/a -md.basalforcings.floatingice_melting_rate=0.*numpy.ones((md.mesh.numberofvertices))/md.constants.yts #1m/a +md.smb.mass_balance = np.ones((md.mesh.numberofvertices)) / md.constants.yts #1m / a +#md.basalforcings.melting_rate = 0. * np.ones((md.mesh.numberofvertices)) / md.constants.yts #1m / a +md.basalforcings.groundedice_melting_rate = 0. * np.ones((md.mesh.numberofvertices)) / md.constants.yts #1m / a +md.basalforcings.floatingice_melting_rate = 0. * np.ones((md.mesh.numberofvertices)) / md.constants.yts #1m / a #Deal with boundary conditions: print(" boundary conditions for stressbalance model") -md=SetMarineIceSheetBC(md,'../Exp/SquareFront.exp') +md = SetMarineIceSheetBC(md, '../Exp/SquareFront.exp') print(" boundary conditions for thermal model") -md.thermal.spctemperature[:]=md.initialization.temperature -md.basalforcings.geothermalflux=numpy.zeros((md.mesh.numberofvertices)) -md.basalforcings.geothermalflux[numpy.nonzero(md.mask.groundedice_levelset>0.)[0]]=1.*10**-3 #1 mW/m^2 +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 Index: /issm/trunk-jpl/test/Par/ValleyGlacierShelf.py =================================================================== --- /issm/trunk-jpl/test/Par/ValleyGlacierShelf.py (revision 24213) +++ /issm/trunk-jpl/test/Par/ValleyGlacierShelf.py (revision 24214) @@ -1,95 +1,93 @@ import os.path from arch import * -import numpy +import numpy as np import inspect -import math from verbose import verbose -from InterpFromMeshToMesh2d import InterpFromMeshToMesh2d from paterson import paterson from SetIceShelfBC import SetIceShelfBC #Start defining model parameters here -x=md.mesh.x -y=md.mesh.y +x = md.mesh.x +y = md.mesh.y xmin, xmax = min(x), max(x) ymin, ymax = min(y), max(y) -Lx=(xmax-xmin) -Ly=(ymax-ymin) -xm,ym = (xmin+xmax)/2., (ymin+ymax)/2. +Lx = (xmax - xmin) +Ly = (ymax - ymin) +xm, ym = (xmin + xmax) / 2., (ymin + ymax) / 2. -#Geometry: U-shaped valley in y direction +#Geometry: U - shaped valley in y direction thk_center = 1000. -thk_margin = 0.5*thk_center -bmax=0. -bmin=-thk_center*md.materials.rho_ice/md.materials.rho_water +thk_margin = 0.5 * thk_center +bmax = 0. +bmin = -thk_center * md.materials.rho_ice / md.materials.rho_water -alpha=2./3. -slope = 0.9*(bmin-bmax)*(x-xmin)/(Lx*alpha) + 0.1*(bmin-bmax)*(y-ymin)/(Ly) + bmax -md.geometry.surface= (thk_center+bmax) + slope -md.geometry.base=bmax + slope + 4./Ly**2*(thk_center-thk_margin)*(numpy.power(y-ym,2)) -md.geometry.thickness=md.geometry.surface - md.geometry.base +alpha = 2. / 3. +slope = 0.9 * (bmin - bmax) * (x - xmin) / (Lx * alpha) + 0.1 * (bmin - bmax) * (y - ymin) / (Ly) + bmax +md.geometry.surface = (thk_center + bmax) + slope +md.geometry.base = bmax + slope + 4. / Ly**2 * (thk_center - thk_margin) * (np.power(y - ym, 2)) +md.geometry.thickness = md.geometry.surface - md.geometry.base md.geometry.bed = md.geometry.base #Mask -md.mask.ice_levelset=x - alpha*Lx -md.mask.groundedice_levelset= numpy.ones((md.mesh.numberofvertices)) +md.mask.ice_levelset = x - alpha * Lx +md.mask.groundedice_levelset = np.ones((md.mesh.numberofvertices)) -#Initial velocity -md.initialization.vx=numpy.zeros((md.mesh.numberofvertices)) -md.initialization.vy=numpy.zeros((md.mesh.numberofvertices)) -md.initialization.vz=numpy.zeros((md.mesh.numberofvertices)) -md.initialization.pressure=numpy.zeros((md.mesh.numberofvertices)) +#Initial velocity +md.initialization.vx = np.zeros((md.mesh.numberofvertices)) +md.initialization.vy = np.zeros((md.mesh.numberofvertices)) +md.initialization.vz = np.zeros((md.mesh.numberofvertices)) +md.initialization.pressure = np.zeros((md.mesh.numberofvertices)) #Materials -md.initialization.temperature=(273.15-5.)*numpy.ones((md.mesh.numberofvertices)) -md.initialization.waterfraction=numpy.zeros((md.mesh.numberofvertices)) -md.initialization.watercolumn=numpy.zeros((md.mesh.numberofvertices)) -md.materials.rheology_B=paterson(md.initialization.temperature) -md.materials.rheology_n=3.*numpy.ones((md.mesh.numberofelements)) +md.initialization.temperature = (273.15 - 5.) * np.ones((md.mesh.numberofvertices)) +md.initialization.waterfraction = np.zeros((md.mesh.numberofvertices)) +md.initialization.watercolumn = np.zeros((md.mesh.numberofvertices)) +md.materials.rheology_B = paterson(md.initialization.temperature) +md.materials.rheology_n = 3. * np.ones((md.mesh.numberofelements)) #Thermal -md.thermal.isenthalpy=False -md.thermal.spctemperature=float('nan')*numpy.ones((md.mesh.numberofvertices)) +md.thermal.isenthalpy = False +md.thermal.spctemperature = float('nan') * np.ones((md.mesh.numberofvertices)) #Groundingline -md.groundingline.migration='SubelementMigration' +md.groundingline.migration = 'SubelementMigration' #Surface mass balance and basal melting -md.smb.mass_balance=0.3*numpy.ones((md.mesh.numberofvertices)) -md.basalforcings.groundedice_melting_rate=md.smb.mass_balance -md.basalforcings.floatingice_melting_rate=md.smb.mass_balance +md.smb.mass_balance = 0.3 * np.ones((md.mesh.numberofvertices)) +md.basalforcings.groundedice_melting_rate = md.smb.mass_balance +md.basalforcings.floatingice_melting_rate = md.smb.mass_balance #Friction -md.friction.coefficient=20.*numpy.ones((md.mesh.numberofvertices)) -md.friction.coefficient[numpy.nonzero(md.mask.groundedice_levelset<0.)[0]]=0. -md.friction.p=numpy.ones((md.mesh.numberofelements)) -md.friction.q=numpy.ones((md.mesh.numberofelements)) +md.friction.coefficient = 20. * np.ones((md.mesh.numberofvertices)) +md.friction.coefficient[np.nonzero(md.mask.groundedice_levelset < 0.)[0]] = 0. +md.friction.p = np.ones((md.mesh.numberofelements)) +md.friction.q = np.ones((md.mesh.numberofelements)) #Transient -md.transient.isstressbalance=True -md.transient.ismovingfront=True -md.transient.ismasstransport=False -md.transient.isthermal=False -md.transient.isgroundingline=True -md.transient.isgia=False +md.transient.isstressbalance = True +md.transient.ismovingfront = True +md.transient.ismasstransport = False +md.transient.isthermal = False +md.transient.isgroundingline = True +md.transient.isgia = False #Stressbalance -md.stressbalance.maxiter=100 -md.stressbalance.restol=0.05 -md.stressbalance.reltol=0.05 -md.stressbalance.abstol=float('nan') +md.stressbalance.maxiter = 100 +md.stressbalance.restol = 0.05 +md.stressbalance.reltol = 0.05 +md.stressbalance.abstol = float('nan') #Masstransport -md.calving.calvingrate=0.*numpy.ones((md.mesh.numberofvertices)) -md.frontalforcings.meltingrate = 0.*numpy.ones((md.mesh.numberofvertices)) -md.levelset.spclevelset=float('NaN')*numpy.ones((md.mesh.numberofvertices)) -md.masstransport.stabilization=1. +md.calving.calvingrate = 0. * np.ones((md.mesh.numberofvertices)) +md.frontalforcings.meltingrate = 0. * np.ones((md.mesh.numberofvertices)) +md.levelset.spclevelset = float('NaN') * np.ones((md.mesh.numberofvertices)) +md.masstransport.stabilization = 1. #Numerical parameters -md.thermal.stabilization=1. -md.settings.waitonlock=30 -md.steadystate.reltol=0.05 -md.timestepping.time_step=1. -md.timestepping.final_time=3. +md.thermal.stabilization = 1. +md.settings.waitonlock = 30 +md.steadystate.reltol = 0.05 +md.timestepping.time_step = 1. +md.timestepping.final_time = 3. #Verbose @@ -101,3 +99,3 @@ #Change name so that no tests have the same name if len(inspect.stack()) > 2: - md.miscellaneous.name = os.path.basename(inspect.stack()[2][1]).split('.')[0] + md.miscellaneous.name = os.path.basename(inspect.stack()[2][1]).split('.')[0]