Index: /issm/trunk-jpl/test/NightlyRun/GetIds.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/GetIds.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/GetIds.py (revision 23793) @@ -4,63 +4,63 @@ import numpy as np + def GetIds(ids_names): - """ - GetIds - output ids from a given array of IDs and test names + """ + GetIds - output ids from a given array of IDs and test names - the test names can be any string or sub-string present - in the test's name (first line of corresponding file) + the test names can be any string or sub-string present + in the test's name (first line of corresponding file) - test names are case sensitive - - Usage: - ids=GetIds(101) - ids=GetIds('Dakota') - ids=GetIds([101,102...]) - ids=GetIds([\'Dakota\',\'Slr\'...]) - ids=GetIds([[101,102...],[\'Dakota\',\'Slr\'...]]) - """ + test names are case sensitive - ids = [] + Usage: + ids = GetIds(101) + ids = GetIds('Dakota') + ids = GetIds([101, 102...]) + ids = GetIds([\'Dakota\',\'Slr\'...]) + ids = GetIds([[101, 102...],[\'Dakota\',\'Slr\'...]]) + """ - # 1 input, either an id or a test name - if type(ids_names) == str: - ids = IdFromString(ids_names) - if len(ids) == 0: - # 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"') + ids = [] - if type(ids_names) == int: - ids = [ids_names] - if len(ids) == 0: - # 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"') + # 1 input, either an id or a test name + if type(ids_names) == str: + ids = IdFromString(ids_names) + if len(ids) == 0: + # 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"') - # many inputs of either ids or test names - if type(ids_names) == list and len(ids_names) > 0: - # is everything a string or int? - if np.array([type(i) == int for i in ids_names]).all(): - ids = ids_names - elif np.array([type(i) == str for i in ids_names]).all(): - ids = np.concatenate([IdFromString(i) for i in ids_names]) - if len(ids) == 0: - raise RuntimeError('runme.py: GetIds.py: No tests with names matching "'+ids_names+'" were found. Note that name checking is case sensitive.') + if type(ids_names) == int: + ids = [ids_names] + if len(ids) == 0: + # 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"') - # 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: - ids = np.concatenate([ids,ids_names[0]]) - if type(ids_names[1]) == list and len(ids_names[1]) > 0 and type(ids_names[1][0]) == str: - ids = np.concatenate([ids,np.concatenate([IdFromString(i) for i in ids_names[1]])]) - if len(ids) == 0: - 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 either ids or test names + if type(ids_names) == list and len(ids_names) > 0: + # is everything a string or int? + if np.array([type(i) == int for i in ids_names]).all(): + ids = ids_names + elif np.array([type(i) == str for i in ids_names]).all(): + ids = np.concatenate([IdFromString(i) for i in ids_names]) + if len(ids) == 0: + 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 - 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__) + # 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: + ids = np.concatenate([ids, ids_names[0]]) + if type(ids_names[1]) == list and len(ids_names[1]) > 0 and type(ids_names[1][0]) == str: + ids = np.concatenate([ids, np.concatenate([IdFromString(i) for i in ids_names[1]])]) + if len(ids) == 0: + raise RuntimeError('runme.py: GetIds.py: No tests with names matching "' + ids_names + '" were found. Note that name checking is case sensitive.') - return np.array(ids).astype(int) + # 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__) + return np.array(ids).astype(int) Index: /issm/trunk-jpl/test/NightlyRun/IdFromString.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/IdFromString.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/IdFromString.py (revision 23793) @@ -3,55 +3,51 @@ import os -# use verbose=False to print output when this is called by command line -def IdFromString(string,verbose=False): - """ - IDFROMSTRING - output ids from a given string - - Usage: - ids=IdFromString(string) - - Examples: - ids=IdFromString('Parallel') - ids=IdFromString('79North') - ids=IdFromString('*') - """ +# use verbose = False to print output when this is called by command line - #Check input - if not isinstance(string,str): - raise TypeError('IdFromString error message: input argument is not a string.') - string = string.replace("'",'') - string = string.replace('"','') - #Get the test ids and names and scan for matches +def IdFromString(string, verbose=False): + """ + IDFROMSTRING - output ids from a given string + Usage: + ids = IdFromString(string) + Examples: + ids = IdFromString('Parallel') + ids = IdFromString('79North') + ids = IdFromString('*') + """ - ids = [] - idnames = [] - for f in os.listdir('.'): - 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]) - name = IdToName(s) - if (string == '*') or (name != None and string in name): - ids.append(s) - idnames.append(name) + #Check input + if not isinstance(string, str): + raise TypeError('IdFromString error message: input argument is not a string.') + string = string.replace("'", '') + string = string.replace('"', '') - #Return if no test found - if not ids: - print("No test matches '%s'." % string) - return ids + #Get the test ids and names and scan for matches - #Display names - if verbose: - idnames = [i for _,i in sorted(zip(ids,idnames), key=lambda pair: pair[0])] + ids = [] + idnames = [] + for f in os.listdir('.'): + 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]) + name = IdToName(s) + if (string == '*') or (name is not None and string in name): + ids.append(s) + idnames.append(name) - ids.sort() + #Return if no test found + if not ids: + print("No test matches '%s'." % string) + return ids - if verbose: - print("%s tests match '%s':" % (len(ids),string)) - for i in range(len(ids)): - print(" %s : %s" % (ids[i],idnames[i])) - #else: - #print ids + #Display names + if verbose: + idnames = [i for _, i in sorted(zip(ids, idnames), key=lambda pair: pair[0])] - return ids + ids.sort() + if verbose: + print("{} tests match '{}':".format(len(ids), string)) + for i in range(len(ids)): + print(" {} : {}".format(ids[i], idnames[i])) + return ids Index: /issm/trunk-jpl/test/NightlyRun/IdToName.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/IdToName.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/IdToName.py (revision 23793) @@ -1,15 +1,16 @@ #! /usr/bin/env python + def IdToName(test_id): - """ - IDTONAME- return name of test - - Usage: - name=IdToName(test_id) - """ - infile = open('test' + str(test_id) + '.py','r') - file_text = infile.readline() + """ + IDTONAME- return name of test - string = '#Test Name:' - name = file_text[len(string)+1:-1] - return name + Usage: + name = IdToName(test_id) + """ + infile = open('test' + str(test_id) + '.py', 'r') + file_text = infile.readline() + + 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 23792) +++ /issm/trunk-jpl/test/NightlyRun/runme.py (revision 23793) @@ -1,264 +1,259 @@ #!/usr/bin/env python import os +import argparse import numpy as np from traceback import format_exc from sys import float_info from glob import glob -from socket import gethostname from GetIds import * try: - from parallelrange import parallelrange -except ImportError: #we don't have issm code in path, just get it - import devpath - from parallelrange import parallelrange + from parallelrange import parallelrange +except ModuleNotFoundError: #we don't have issm code in path, just get it + import devpath + from parallelrange import parallelrange from IdToName import IdToName from arch import archread from arch import archwrite -from arch import archdisp - -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) - The following command will launch all the existing tests: - >> runme() - To run the tests 101 and 102: - >> runme(id=[101,102]) - etc... - - Available options: - 'id' followed by the list of ids or (parts of) test names requested - Note: runs all tests by default - - 'exclude' ids or (parts of) test names to be excluded (same format as id) - Note: exclude does nothing if 'id' is specified with different values - - 'benchmark' 'all' (all of the tests) - 'nightly' (nightly run/ daily run) - 'ismip' : validation of ismip-hom tests - 'eismint': validation of eismint tests - 'thermal': validation of thermal tests - 'mesh' : validation of mesh tests - 'adolc' : validation of adolc tests - 'slr' : validation of slr tests - - 'procedure' 'check' : run the test (default) - 'update': update the archive - - Usage: - runme(varargin) - - Examples: - runme() - runme(101) - runme('SquareShelf') - runme(exclude=2001) - runme(exclude='Dakota',benchmark='all') - runme(id=[[101,102],['Dakota','Slr']]) - """ - - #Get ISSM_DIR variable - ISSM_DIR=os.environ['ISSM_DIR'] - - #Process options - #GET benchmark {{{ - if not benchmark in ['all','nightly','ismip','eismint','thermal','mesh','validation','tranforcing','adolc','slr','referential']: - print(("runme warning: benchmark '{}' not supported, defaulting to test 'nightly'.".format(benchmark))) - benchmark='nightly' - # }}} - #GET procedure {{{ - if not procedure in ['check','update']: - print(("runme warning: procedure '{}' not supported, defaulting to test 'check'.".format(procedure))) - procedure='check' - # }}} - #GET output {{{ - if not output in ['nightly','none']: - print(("runme warning: output '{}' not supported, defaulting to test 'none'.".format(output))) - output='none' - # }}} - #GET RANK and NUMPROCS for multithreaded runs {{{ - if (numprocs 0 and not id==None: - test_ids = set(GetIds(id)).intersection(set(list_ids)) - benchmark = None - else: - # if no tests are specifically provided, do them all - test_ids = set(list_ids) - - # }}} - #GET exclude {{{ - exclude_ids = GetIds(exclude) - - test_ids=test_ids.difference(exclude_ids) - # }}} - #Process Ids according to benchmarks {{{ - if benchmark=='nightly': - test_ids=test_ids.intersection(set(range(1,1000))) - elif benchmark=='validation': - test_ids=test_ids.intersection(set(range(1001,2000))) - elif benchmark=='ismip': - test_ids=test_ids.intersection(set(range(1101,1200))) - elif benchmark=='eismint': - test_ids=test_ids.intersection(set(range(1201,1300))) - elif benchmark=='thermal': - test_ids=test_ids.intersection(set(range(1301,1400))) - elif benchmark=='mesh': - test_ids=test_ids.intersection(set(range(1401,1500))) - elif benchmark=='tranforcing': - test_ids=test_ids.intersection(set(range(1501,1503))) - elif benchmark=='referential': - test_ids=test_ids.intersection(set(range(1601,1603))) - elif benchmark=='slr': - test_ids=test_ids.intersection(set(range(2001,2500))) - elif benchmark=='adolc': - test_ids=test_ids.intersection(set(range(3001,3200))) - test_ids=list(test_ids) - test_ids.sort() - # }}} - - #Loop over tests and launch sequence - root=os.getcwd() - for id in test_ids: - print(("----------------starting:{}-----------------------".format(id))) - try: - - #Execute test - os.chdir(root) - id_string=IdToName(id) - exec(compile(open('test'+str(id)+'.py').read(), 'test'+str(id)+'.py', 'exec'),globals()) - - #UPDATE ARCHIVE? - archive_name='Archive'+str(id) - if procedure=='update': - archive_file=os.path.join('..','Archives',archive_name+'.arch') - if os.path.isfile(archive_file): - os.remove(archive_file) - for k,fieldname in enumerate(field_names): - field=np.array(field_values[k],dtype=float) - if len(field.shape) == 1: - if np.size(field): - field=field.reshape(np.size(field),1) - else: - field=field.reshape(0,0) - elif len(field.shape) == 0: - field=field.reshape(1,1) - # 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: - - #load archive - if os.path.exists(os.path.join('..','Archives',archive_name+'.arch')): - archive_file=os.path.join('..','Archives',archive_name+'.arch') - else: - raise IOError("Archive file '"+os.path.join('..','Archives',archive_name+'.arch')+"' does not exist.") - - for k,fieldname in enumerate(field_names): - try: - #Get field and tolerance - field=np.array(field_values[k]) - if len(field.shape) == 1: - if np.size(field): - field=field.reshape(np.size(field),1) - else: - field=field.reshape(0,0) - tolerance=field_tolerances[k] - - #compare to archive - # Matlab uses base 1, so use base 1 in labels - archive=np.array(archread(archive_file,archive_name+'_field'+str(k+1))) - #Because np.array is weird (str(np.array(None)) becomes 'None' but np.array(None) is never equal to None, it basically becomes a type of string in an array): - if str(archive) == 'None': - raise NameError("Field name '"+archive_name+'_field'+str(k+1)+"' does not exist in archive file.") - if np.shape(field) != np.shape(archive) and not np.shape(field) in [(1,1),(0,0),(1,0),(0,1)]: - field = field.T - if np.shape(field) != np.shape(archive): - raise RuntimeError("Field '"+archive_name+"' from test is malformed; shape is "+str(np.shape(field.T))+", should be "+str(np.shape(archive))+" (or "+str(np.shape(archive.T))+").") - - error_diff=np.amax(np.abs(archive-field),axis=0)/(np.amax(np.abs(archive),axis=0)+float_info.epsilon) - if not np.isscalar(error_diff): - error_diff=error_diff[0] - - #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))) - else: - print(('SUCCESS difference: {} < {} test id: {} test name: {} field: {}'.format(error_diff,tolerance,id,id_string,fieldname))) - - except Exception as message: - - #something went wrong, print failure message: - print((format_exc())) - directory=os.getcwd().split('/') # not used? - if output=='nightly': - fid=open(os.path.join(ISSM_DIR,'nightlylog','pythonerror.log'), 'a') - fid.write('%s' % message) - fid.write('\n------------------------------------------------------------------\n') - fid.close() - 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))) - raise RuntimeError(message) - - - except Exception as message: - - #something went wrong, print failure message: - print((format_exc())) - directory=os.getcwd().split('/') # not used? - if output=='nightly': - fid=open(os.path.join(ISSM_DIR,'nightlylog','pythonerror.log'), 'a') - fid.write('%s' % message) - fid.write('\n------------------------------------------------------------------\n') - fid.close() - 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'))) - raise RuntimeError(message) - - print(("----------------finished:{}-----------------------".format(id))) - return - -import argparse + + +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) + The following command will launch all the existing tests: + >> runme() + To run the tests 101 and 102: + >> runme(id = [101, 102]) + etc... + + Available options: + 'id' followed by the list of ids or (parts of) test names requested + Note: runs all tests by default + + 'exclude' ids or (parts of) test names to be excluded (same format as id) + Note: exclude does nothing if 'id' is specified with different values + + 'benchmark' 'all' (all of the tests) + 'nightly' (nightly run/ daily run) + 'ismip' : validation of ismip-hom tests + 'eismint': validation of eismint tests + 'thermal': validation of thermal tests + 'mesh' : validation of mesh tests + 'adolc' : validation of adolc tests + 'slr' : validation of slr tests + + 'procedure' 'check' : run the test (default) + 'update': update the archive + + Usage: + runme(varargin) + + Examples: + runme() + runme(101) + runme('SquareShelf') + runme(exclude = 2001) + runme(exclude='Dakota', benchmark='all') + runme(id = [[101, 102],['Dakota', 'Slr']]) + """ + #Get ISSM_DIR variable + ISSM_DIR = os.environ['ISSM_DIR'] + + #Process options + #GET benchmark {{{ + if benchmark not in ['all', 'nightly', 'ismip', 'eismint', + 'thermal', 'mesh', 'validation', 'tranforcing', + 'adolc', 'slr', 'referential']: + print(("runme warning: benchmark '{}' not supported, defaulting to test 'nightly'.".format(benchmark))) + benchmark = 'nightly' + # }}} + #GET procedure {{{ + if procedure not in ['check', 'update']: + print(("runme warning: procedure '{}' not supported, defaulting to test 'check'.".format(procedure))) + procedure = 'check' + # }}} + #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 {{{ + 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 + 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)) + benchmark = None + else: + # if no tests are specifically provided, do them all + test_ids = set(list_ids) + + # }}} + #GET exclude {{{ + exclude_ids = GetIds(exclude) + + test_ids = test_ids.difference(exclude_ids) + # }}} + #Process Ids according to benchmarks {{{ + if benchmark == 'nightly': + test_ids = test_ids.intersection(set(range(1, 1000))) + elif benchmark == 'validation': + test_ids = test_ids.intersection(set(range(1001, 2000))) + elif benchmark == 'ismip': + test_ids = test_ids.intersection(set(range(1101, 1200))) + elif benchmark == 'eismint': + test_ids = test_ids.intersection(set(range(1201, 1300))) + elif benchmark == 'thermal': + test_ids = test_ids.intersection(set(range(1301, 1400))) + elif benchmark == 'mesh': + test_ids = test_ids.intersection(set(range(1401, 1500))) + elif benchmark == 'tranforcing': + test_ids = test_ids.intersection(set(range(1501, 1503))) + elif benchmark == 'referential': + test_ids = test_ids.intersection(set(range(1601, 1603))) + elif benchmark == 'slr': + test_ids = test_ids.intersection(set(range(2001, 2500))) + elif benchmark == 'adolc': + test_ids = test_ids.intersection(set(range(3001, 3200))) + test_ids = list(test_ids) + test_ids.sort() + # }}} + + #Loop over tests and launch sequence + root = os.getcwd() + for id in test_ids: + print(("----------------starting:{}-----------------------".format(id))) + try: + #Execute test + os.chdir(root) + id_string = IdToName(id) + exec(compile(open('test{}.py'.format(id)).read(), 'test{}.py'.format(id), 'exec'), globals()) + + #UPDATE ARCHIVE? + archive_name = 'Archive' + str(id) + if procedure == 'update': + archive_file = os.path.join('..', 'Archives', archive_name + '.arch') + if os.path.isfile(archive_file): + os.remove(archive_file) + for k, fieldname in enumerate(field_names): + field = np.array(field_values[k], dtype=float) + if len(field.shape) == 1: + if np.size(field): + field = field.reshape(np.size(field), 1) + else: + field = field.reshape(0, 0) + elif len(field.shape) == 0: + field = field.reshape(1, 1) + # 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: + #load archive + if os.path.exists(os.path.join('..', 'Archives', archive_name + '.arch')): + archive_file = os.path.join('..', 'Archives', archive_name + '.arch') + else: + raise IOError("Archive file '../Archives/{}.arch' does not exist.".format(archive_name)) + + for k, fieldname in enumerate(field_names): + try: + #Get field and tolerance + field = np.array(field_values[k]) + if len(field.shape) == 1: + if np.size(field): + field = field.reshape(np.size(field), 1) + else: + field = field.reshape(0, 0) + tolerance = field_tolerances[k] + + #compare to archive + # Matlab uses base 1, so use base 1 in labels + archive = np.array(archread(archive_file, archive_name + '_field' + str(k + 1))) + #Because np.array is weird (str(np.array(None)) becomes 'None' but np.array(None) is never equal to None, it basically becomes a type of string in an array): + if str(archive) == 'None': + raise NameError("Field name '" + archive_name + '_field' + str(k + 1) + "' does not exist in archive file.") + if np.shape(field) != np.shape(archive) and not np.shape(field) in [(1, 1), (0, 0), (1, 0), (0, 1)]: + field = field.T + if np.shape(field) != np.shape(archive): + raise RuntimeError("Field '{}'' from test is malformed; shape is {}, should be {} or {}".format(archive_name, np.shape(field.T), np.shape(archive), np.shape(archive.T))) + + error_diff = np.amax(np.abs(archive - field), axis=0) / (np.amax(np.abs(archive), axis=0) + float_info.epsilon) + if not np.isscalar(error_diff): + error_diff = error_diff[0] + + #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))) + else: + print(('SUCCESS difference: {} < {} test id: {} test name: {} field: {}'.format(error_diff, tolerance, id, id_string, fieldname))) + + except Exception as message: + #something went wrong, print failure message: + print((format_exc())) + if output == 'nightly': + fid = open(os.path.join(ISSM_DIR, 'nightlylog', 'pythonerror.log'), 'a') + fid.write('%s' % message) + fid.write('\n------------------------------------------------------------------\n') + fid.close() + 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))) + raise RuntimeError(message) + + except Exception as message: + #something went wrong, print failure message: + print((format_exc())) + if output == 'nightly': + fid = open(os.path.join(ISSM_DIR, 'nightlylog', 'pythonerror.log'), 'a') + fid.write('%s' % message) + fid.write('\n------------------------------------------------------------------\n') + fid.close() + 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'))) + raise RuntimeError(message) + + print(("----------------finished:{}-----------------------".format(id))) + return + + if __name__ == '__main__': - if 'PYTHONSTARTUP' in os.environ: - PYTHONSTARTUP=os.environ['PYTHONSTARTUP'] - #print 'PYTHONSTARTUP =',PYTHONSTARTUP - if os.path.exists(PYTHONSTARTUP): - try: - exec(compile(open(PYTHONSTARTUP).read(), PYTHONSTARTUP, 'exec')) - except Exception as e: - print(("PYTHONSTARTUP error: ",e)) - else: - print(("PYTHONSTARTUP file '{}' does not exist.".format(PYTHONSTARTUP))) - - 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) - args = parser.parse_args() - - md = runme([args.id,args.include_name], [args.exclude,args.exclude_name], args.benchmark, args.procedure, args.output, args.rank, args.numprocs) - - if args.output=='nightly': - print("PYTHONEXITEDCORRECTLY") - - exit(md) + if 'PYTHONSTARTUP' in os.environ: + PYTHONSTARTUP = os.environ['PYTHONSTARTUP'] + #print 'PYTHONSTARTUP =', PYTHONSTARTUP + if os.path.exists(PYTHONSTARTUP): + try: + exec(compile(open(PYTHONSTARTUP).read(), PYTHONSTARTUP, 'exec')) + except Exception as e: + print("PYTHONSTARTUP error: ", e) + else: + print(("PYTHONSTARTUP file '{}' does not exist.".format(PYTHONSTARTUP))) + + 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) + args = parser.parse_args() + + md = runme([args.id, args.include_name], [args.exclude, args.exclude_name], args.benchmark, args.procedure, args.output, args.rank, args.numprocs) + + if args.output == 'nightly': + print("PYTHONEXITEDCORRECTLY") + + exit(md) Index: /issm/trunk-jpl/test/NightlyRun/test101.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test101.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test101.py (revision 23793) @@ -10,39 +10,39 @@ from generic import generic -md=triangle(model(),'../Exp/Square.exp',50000) -md=setmask(md,'all','') -md=parameterize(md,'../Par/SquareShelfConstrained.py') -md=setflowequation(md,'SSA','all') -md.cluster=generic('name',gethostname(),'np',3) +md = triangle(model(), '../Exp/Square.exp', 50000) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelfConstrained.py') +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 2) #outputs -md.stressbalance.requested_outputs=['default','DeviatoricStressxx','DeviatoricStressyy','DeviatoricStressxy','MassFlux1','MassFlux2','MassFlux3','MassFlux4','MassFlux5','MassFlux6'] -md.outputdefinition.definitions=[massfluxatgate('name','MassFlux1','profilename','../Exp/MassFlux1.exp','definitionstring','Outputdefinition1'), - massfluxatgate('name','MassFlux2','profilename','../Exp/MassFlux2.exp','definitionstring','Outputdefinition2'), - massfluxatgate('name','MassFlux3','profilename','../Exp/MassFlux3.exp','definitionstring','Outputdefinition3'), - massfluxatgate('name','MassFlux4','profilename','../Exp/MassFlux4.exp','definitionstring','Outputdefinition4'), - massfluxatgate('name','MassFlux5','profilename','../Exp/MassFlux5.exp','definitionstring','Outputdefinition5'), - massfluxatgate('name','MassFlux6','profilename','../Exp/MassFlux6.exp','definitionstring','Outputdefinition6')] +md.stressbalance.requested_outputs = ['default', 'DeviatoricStressxx', 'DeviatoricStressyy', 'DeviatoricStressxy', 'MassFlux1', 'MassFlux2', 'MassFlux3', 'MassFlux4', 'MassFlux5', 'MassFlux6'] +md.outputdefinition.definitions = [massfluxatgate('name', 'MassFlux1', 'profilename', '../Exp/MassFlux1.exp', 'definitionstring', 'Outputdefinition1'), + massfluxatgate('name', 'MassFlux2', 'profilename', '../Exp/MassFlux2.exp', 'definitionstring', 'Outputdefinition2'), + massfluxatgate('name', 'MassFlux3', 'profilename', '../Exp/MassFlux3.exp', 'definitionstring', 'Outputdefinition3'), + massfluxatgate('name', 'MassFlux4', 'profilename', '../Exp/MassFlux4.exp', 'definitionstring', 'Outputdefinition4'), + massfluxatgate('name', 'MassFlux5', 'profilename', '../Exp/MassFlux5.exp', 'definitionstring', 'Outputdefinition5'), + massfluxatgate('name', 'MassFlux6', 'profilename', '../Exp/MassFlux6.exp', 'definitionstring', 'Outputdefinition6')] -md=solve(md,'Stressbalance') +md = solve(md, 'Stressbalance') #Fields and tolerances to track changes -field_names =['Vx','Vy','Vel','Pressure', - 'DeviatoricStressxx','DeviatoricStressyy','DeviatoricStressxy', - 'MassFlux1','MassFlux2','MassFlux3','MassFlux4','MassFlux5','MassFlux6'] -field_tolerances=[3e-13, 1e-13, 1e-13, 1e-13, - 2e-13, 1e-13, 2e-13, - 1e-13, 1e-13, 1e-13, - 1e-13, 1e-13, 1e-13 ] -field_values=[md.results.StressbalanceSolution.Vx, - md.results.StressbalanceSolution.Vy, - md.results.StressbalanceSolution.Vel, - md.results.StressbalanceSolution.Pressure, - md.results.StressbalanceSolution.DeviatoricStressxx, - md.results.StressbalanceSolution.DeviatoricStressyy, - md.results.StressbalanceSolution.DeviatoricStressxy, - md.results.StressbalanceSolution.MassFlux1, - md.results.StressbalanceSolution.MassFlux2, - md.results.StressbalanceSolution.MassFlux3, - md.results.StressbalanceSolution.MassFlux4, - md.results.StressbalanceSolution.MassFlux5, - md.results.StressbalanceSolution.MassFlux6 ] +field_names = ['Vx', 'Vy', 'Vel', 'Pressure', + 'DeviatoricStressxx', 'DeviatoricStressyy', 'DeviatoricStressxy', + 'MassFlux1', 'MassFlux2', 'MassFlux3', 'MassFlux4', 'MassFlux5', 'MassFlux6'] +field_tolerances = [3e-13, 1e-13, 1e-13, 1e-13, + 2e-13, 1e-13, 2e-13, + 1e-13, 1e-13, 1e-13, + 1e-13, 1e-13, 1e-13] +field_values = [md.results.StressbalanceSolution.Vx, + md.results.StressbalanceSolution.Vy, + md.results.StressbalanceSolution.Vel, + md.results.StressbalanceSolution.Pressure, + md.results.StressbalanceSolution.DeviatoricStressxx, + md.results.StressbalanceSolution.DeviatoricStressyy, + md.results.StressbalanceSolution.DeviatoricStressxy, + md.results.StressbalanceSolution.MassFlux1, + md.results.StressbalanceSolution.MassFlux2, + md.results.StressbalanceSolution.MassFlux3, + md.results.StressbalanceSolution.MassFlux4, + md.results.StressbalanceSolution.MassFlux5, + md.results.StressbalanceSolution.MassFlux6] Index: /issm/trunk-jpl/test/NightlyRun/test102.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test102.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test102.py (revision 23793) @@ -9,19 +9,18 @@ -md=triangle(model(),'../Exp/Square.exp',180000) -md=setmask(md,'all','') -md=parameterize(md,'../Par/SquareShelfConstrained.py') -md.extrude(3,2.) -md=setflowequation(md,'SSA','all') -md.cluster=generic('name',gethostname(),'np',3) -md=solve(md,'Stressbalance') +md = triangle(model(), '../Exp/Square.exp', 180000) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelfConstrained.py') +md.extrude(3, 2.) +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'Stressbalance') #Fields and tolerances to track changes -field_names =['Vx','Vy','Vz','Vel','Pressure'] -field_tolerances=[1e-13,1e-13,1e-13,1e-13,1e-13] -field_values=[md.results.StressbalanceSolution.Vx, - md.results.StressbalanceSolution.Vy, - md.results.StressbalanceSolution.Vz, - md.results.StressbalanceSolution.Vel, - md.results.StressbalanceSolution.Pressure] - +field_names = ['Vx', 'Vy', 'Vz', 'Vel', 'Pressure'] +field_tolerances = [1e-13, 1e-13, 1e-13, 1e-13, 1e-13] +field_values = [md.results.StressbalanceSolution.Vx, + md.results.StressbalanceSolution.Vy, + md.results.StressbalanceSolution.Vz, + md.results.StressbalanceSolution.Vel, + md.results.StressbalanceSolution.Pressure] Index: /issm/trunk-jpl/test/NightlyRun/test103.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test103.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test103.py (revision 23793) @@ -9,31 +9,31 @@ -md=triangle(model(),'../Exp/Square.exp',180000) -md=setmask(md,'all','') -md=parameterize(md,'../Par/SquareShelfConstrained.py') -md.extrude(3,2.) -md=setflowequation(md,'HO','all') -md.cluster=generic('name',gethostname(),'np',3) -md.stressbalance.requested_outputs=['default','StressTensorxx','StressTensoryy','StressTensorzz','StressTensorxy','StressTensorxz','StressTensoryz'] -md=solve(md,'Stressbalance') +md = triangle(model(), '../Exp/Square.exp', 180000) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelfConstrained.py') +md.extrude(3, 2.) +md = setflowequation(md, 'HO', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) +md.stressbalance.requested_outputs = ['default', 'StressTensorxx', 'StressTensoryy', 'StressTensorzz', 'StressTensorxy', 'StressTensorxz', 'StressTensoryz'] +md = solve(md, 'Stressbalance') #Fields and tolerances to track changes -field_names =['Vx','Vy','Vz', - 'Vel','Pressure', - 'StressTensorxx','StressTensoryy','StressTensorzz', - 'StressTensorxy','StressTensorxz','StressTensoryz'] -field_tolerances=[1e-09,1e-09,1e-09, - 1e-09,1e-09, - 1e-09,1e-09,1e-09, - 1e-09,1e-09,1e-08] -field_values=[md.results.StressbalanceSolution.Vx, - md.results.StressbalanceSolution.Vy, - md.results.StressbalanceSolution.Vz, - md.results.StressbalanceSolution.Vel, - md.results.StressbalanceSolution.Pressure, - md.results.StressbalanceSolution.StressTensorxx, - md.results.StressbalanceSolution.StressTensoryy, - md.results.StressbalanceSolution.StressTensorzz, - md.results.StressbalanceSolution.StressTensorxy, - md.results.StressbalanceSolution.StressTensorxz, - md.results.StressbalanceSolution.StressTensoryz,] +field_names = ['Vx', 'Vy', 'Vz', + 'Vel', 'Pressure', + 'StressTensorxx', 'StressTensoryy', 'StressTensorzz', + 'StressTensorxy', 'StressTensorxz', 'StressTensoryz'] +field_tolerances = [1e-09, 1e-09, 1e-09, + 1e-09, 1e-09, + 1e-09, 1e-09, 1e-09, + 1e-09, 1e-09, 1e-08] +field_values = [md.results.StressbalanceSolution.Vx, + md.results.StressbalanceSolution.Vy, + md.results.StressbalanceSolution.Vz, + md.results.StressbalanceSolution.Vel, + md.results.StressbalanceSolution.Pressure, + md.results.StressbalanceSolution.StressTensorxx, + md.results.StressbalanceSolution.StressTensoryy, + md.results.StressbalanceSolution.StressTensorzz, + md.results.StressbalanceSolution.StressTensorxy, + md.results.StressbalanceSolution.StressTensorxz, + md.results.StressbalanceSolution.StressTensoryz] Index: /issm/trunk-jpl/test/NightlyRun/test104.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test104.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test104.py (revision 23793) @@ -9,18 +9,18 @@ -md=triangle(model(),'../Exp/Square.exp',180000) -md=setmask(md,'all','') -md=parameterize(md,'../Par/SquareShelfConstrained.py') -md.extrude(3,2.) -md=setflowequation(md,'FS','all') -md.cluster=generic('name',gethostname(),'np',3) -md=solve(md,'Stressbalance') +md = triangle(model(), '../Exp/Square.exp', 180000) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelfConstrained.py') +md.extrude(3, 2.) +md = setflowequation(md, 'FS', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'Stressbalance') #Fields and tolerances to track changes -field_names =['Vx','Vy','Vz','Vel','Pressure'] -field_tolerances=[1e-08,1e-08,4e-06,1e-08,1e-08] -field_values=[md.results.StressbalanceSolution.Vx, - md.results.StressbalanceSolution.Vy, - md.results.StressbalanceSolution.Vz, - md.results.StressbalanceSolution.Vel, - md.results.StressbalanceSolution.Pressure] +field_names = ['Vx', 'Vy', 'Vz', 'Vel', 'Pressure'] +field_tolerances = [1e-08, 1e-08, 4e-06, 1e-08, 1e-08] +field_values = [md.results.StressbalanceSolution.Vx, + md.results.StressbalanceSolution.Vy, + md.results.StressbalanceSolution.Vz, + md.results.StressbalanceSolution.Vel, + md.results.StressbalanceSolution.Pressure] Index: /issm/trunk-jpl/test/NightlyRun/test105.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test105.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test105.py (revision 23793) @@ -9,15 +9,13 @@ -md=triangle(model(),'../Exp/Square.exp',150000) -md=setmask(md,'all','') -md=parameterize(md,'../Par/SquareShelfConstrained.py') -md=setflowequation(md,'SSA','all') -md.cluster=generic('name',gethostname(),'np',3) -md=solve(md,'Masstransport') +md = triangle(model(), '../Exp/Square.exp', 150000) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelfConstrained.py') +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'Masstransport') #Fields and tolerances to track changes -field_names =['Thickness'] -field_tolerances=[1e-13] -field_values=[\ - md.results.MasstransportSolution.Thickness,\ - ] +field_names = ['Thickness'] +field_tolerances = [1e-13] +field_values = [md.results.MasstransportSolution.Thickness] Index: /issm/trunk-jpl/test/NightlyRun/test106.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test106.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test106.py (revision 23793) @@ -10,18 +10,16 @@ -md=triangle(model(),'../Exp/Square.exp',150000) -md=meshconvert(md) -md=setmask(md,'all','') -md=parameterize(md,'../Par/SquareShelfConstrained.py') -md=setflowequation(md,'SSA','all') -md.cluster=generic('name',gethostname(),'np',3) -md.masstransport.stabilization=3 -md.masstransport.spcthickness=md.geometry.thickness -md=solve(md,'Masstransport') +md = triangle(model(), '../Exp/Square.exp', 150000) +md = meshconvert(md) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelfConstrained.py') +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) +md.masstransport.stabilization = 3 +md.masstransport.spcthickness = md.geometry.thickness +md = solve(md, 'Masstransport') #Fields and tolerances to track changes -field_names =['Thickness'] -field_tolerances=[1e-13] -field_values=[\ - md.results.MasstransportSolution.Thickness,\ - ] +field_names = ['Thickness'] +field_tolerances = [1e-13] +field_values = [md.results.MasstransportSolution.Thickness] Index: /issm/trunk-jpl/test/NightlyRun/test107.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test107.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test107.py (revision 23793) @@ -9,16 +9,14 @@ -md=triangle(model(),'../Exp/Square.exp',150000) -md=setmask(md,'all','') -md=parameterize(md,'../Par/SquareShelfConstrained.py') -md=setflowequation(md,'SSA','all') -md.extrude(5,3.) -md.cluster=generic('name',gethostname(),'np',3) -md=solve(md,'Masstransport') +md = triangle(model(), '../Exp/Square.exp', 150000) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelfConstrained.py') +md = setflowequation(md, 'SSA', 'all') +md.extrude(5, 3.) +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'Masstransport') #Fields and tolerances to track changes -field_names =['Thickness'] -field_tolerances=[1e-13] -field_values=[\ - md.results.MasstransportSolution.Thickness,\ - ] +field_names = ['Thickness'] +field_tolerances = [1e-13] +field_values = [md.results.MasstransportSolution.Thickness] Index: /issm/trunk-jpl/test/NightlyRun/test108.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test108.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test108.py (revision 23793) @@ -9,18 +9,16 @@ -md=triangle(model(),'../Exp/Square.exp',180000) -md=setmask(md,'all','') -md=parameterize(md,'../Par/SquareShelfConstrained.py') -md.extrude(3,1.) -md=setflowequation(md,'SSA','all') -md.timestepping.time_step=0 -md.cluster=generic('name',gethostname(),'np',3) -md=solve(md,'Thermal') +md = triangle(model(), '../Exp/Square.exp', 180000) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelfConstrained.py') +md.extrude(3, 1.) +md = setflowequation(md, 'SSA', 'all') +md.timestepping.time_step = 0 +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'Thermal') #Fields and tolerances to track changes -field_names =['Temperature','BasalforcingsGroundediceMeltingRate'] -field_tolerances=[1e-13,1e-5] -field_values=[\ - md.results.ThermalSolution.Temperature,\ - md.results.ThermalSolution.BasalforcingsGroundediceMeltingRate,\ - ] +field_names = ['Temperature', 'BasalforcingsGroundediceMeltingRate'] +field_tolerances = [1e-13, 1e-5] +field_values = [md.results.ThermalSolution.Temperature, + md.results.ThermalSolution.BasalforcingsGroundediceMeltingRate] Index: /issm/trunk-jpl/test/NightlyRun/test109.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test109.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test109.py (revision 23793) @@ -9,20 +9,20 @@ -md=triangle(model(),'../Exp/Square.exp',180000) -md=setmask(md,'all','') -md=parameterize(md,'../Par/SquareShelfConstrained.py') -md.extrude(3,1.) -md=setflowequation(md,'SSA','all') -md.cluster=generic('name',gethostname(),'np',3) -md.transient.isstressbalance=False -md.transient.ismasstransport=False -md.transient.issmb=True -md.transient.isthermal=True -md.transient.isgroundingline=False -md=solve(md,'Transient') +md = triangle(model(), '../Exp/Square.exp', 180000) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelfConstrained.py') +md.extrude(3, 1.) +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) +md.transient.isstressbalance = False +md.transient.ismasstransport = False +md.transient.issmb = True +md.transient.isthermal = True +md.transient.isgroundingline = False +md = solve(md, 'Transient') #Fields and tolerances to track changes -field_names =['Temperature','BasalforcingsGroundediceMeltingRate'] -field_tolerances=[1e-13,1e-13] -field_values=[md.results.TransientSolution[0].Temperature, - md.results.TransientSolution[0].BasalforcingsGroundediceMeltingRate] +field_names = ['Temperature', 'BasalforcingsGroundediceMeltingRate'] +field_tolerances = [1e-13, 1e-13] +field_values = [md.results.TransientSolution[0].Temperature, + md.results.TransientSolution[0].BasalforcingsGroundediceMeltingRate] Index: /issm/trunk-jpl/test/NightlyRun/test110.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test110.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test110.py (revision 23793) @@ -9,42 +9,40 @@ -md=triangle(model(),'../Exp/Square.exp',150000) -md=setmask(md,'all','') -md=parameterize(md,'../Par/SquareShelfConstrained.py') -md=setflowequation(md,'SSA','all') -md.cluster=generic('name',gethostname(),'np',3) -md.transient.requested_outputs=['IceVolume'] +md = triangle(model(), '../Exp/Square.exp', 150000) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelfConstrained.py') +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) +md.transient.requested_outputs = ['IceVolume'] -md=solve(md,'Transient') +md = solve(md, 'Transient') #Fields and tolerances to track changes -field_names =['Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Volume1','Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Volume2','Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Volume3'] -field_tolerances=[1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,\ - 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,\ - 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13] -field_values=[\ - md.results.TransientSolution[0].Vx,\ - md.results.TransientSolution[0].Vy,\ - md.results.TransientSolution[0].Vel,\ - md.results.TransientSolution[0].Pressure,\ - md.results.TransientSolution[0].Base,\ - md.results.TransientSolution[0].Surface,\ - md.results.TransientSolution[0].Thickness,\ - md.results.TransientSolution[0].IceVolume,\ - md.results.TransientSolution[1].Vx,\ - md.results.TransientSolution[1].Vy,\ - md.results.TransientSolution[1].Vel,\ - md.results.TransientSolution[1].Pressure,\ - md.results.TransientSolution[1].Base,\ - md.results.TransientSolution[1].Surface,\ - md.results.TransientSolution[1].Thickness,\ - md.results.TransientSolution[1].IceVolume,\ - md.results.TransientSolution[2].Vx,\ - md.results.TransientSolution[2].Vy,\ - md.results.TransientSolution[2].Vel,\ - md.results.TransientSolution[2].Pressure,\ - md.results.TransientSolution[2].Base,\ - md.results.TransientSolution[2].Surface,\ - md.results.TransientSolution[2].Thickness,\ - md.results.TransientSolution[2].IceVolume,\ - ] +field_names = ['Vx1', 'Vy1', 'Vel1', 'Pressure1', 'Bed1', 'Surface1', 'Thickness1', 'Volume1', 'Vx2', 'Vy2', 'Vel2', 'Pressure2', 'Bed2', 'Surface2', 'Thickness2', 'Volume2', 'Vx3', 'Vy3', 'Vel3', 'Pressure3', 'Bed3', 'Surface3', 'Thickness3', 'Volume3'] +field_tolerances = [1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, + 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, + 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13] +field_values = [md.results.TransientSolution[0].Vx, + md.results.TransientSolution[0].Vy, + md.results.TransientSolution[0].Vel, + md.results.TransientSolution[0].Pressure, + md.results.TransientSolution[0].Base, + md.results.TransientSolution[0].Surface, + md.results.TransientSolution[0].Thickness, + md.results.TransientSolution[0].IceVolume, + md.results.TransientSolution[1].Vx, + md.results.TransientSolution[1].Vy, + md.results.TransientSolution[1].Vel, + md.results.TransientSolution[1].Pressure, + md.results.TransientSolution[1].Base, + md.results.TransientSolution[1].Surface, + md.results.TransientSolution[1].Thickness, + md.results.TransientSolution[1].IceVolume, + md.results.TransientSolution[2].Vx, + md.results.TransientSolution[2].Vy, + md.results.TransientSolution[2].Vel, + md.results.TransientSolution[2].Pressure, + md.results.TransientSolution[2].Base, + md.results.TransientSolution[2].Surface, + md.results.TransientSolution[2].Thickness, + md.results.TransientSolution[2].IceVolume] Index: /issm/trunk-jpl/test/NightlyRun/test1101.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1101.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test1101.py (revision 23793) @@ -1,5 +1,4 @@ #Test Name: ISMIPAHO import numpy as np -import shutil from model import * from socket import gethostname @@ -15,121 +14,120 @@ """ -printingflag=False +printingflag = False -#L_list=[80000.] -L_list=[80000.] -results=[] -minvx=[] -maxvx=[] +L_list = [80000.] +results = [] +minvx = [] +maxvx = [] for L in L_list: - 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=parameterize(md,'../Par/ISMIPA.py') - md.extrude(9,1.) + 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 = parameterize(md, '../Par/ISMIPA.py') + md.extrude(9, 1.) - md=setflowequation(md,'HO','all') + md = setflowequation(md, 'HO', 'all') - #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)) - md.stressbalance.spcvz=np.nan*np.ones((md.mesh.numberofvertices)) + #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)) + md.stressbalance.spcvz = np.nan * np.ones((md.mesh.numberofvertices)) - pos=np.where(md.mesh.vertexonbase) - md.stressbalance.spcvx[pos]=0. - md.stressbalance.spcvy[pos]=0. + pos = np.where(md.mesh.vertexonbase) + md.stressbalance.spcvx[pos] = 0. + md.stressbalance.spcvy[pos] = 0. - #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] + #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 - 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] + 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)) + md.stressbalance.vertex_pairing = np.vstack((np.vstack((posx + 1, posx2 + 1)).T, np.vstack((posy + 1, posy2 + 1)).T)) - #Compute the stressbalance - md.cluster=generic('name',gethostname(),'np',8) - md=solve(md,'Stressbalance') + #Compute the stressbalance + md.cluster = generic('name', gethostname(), 'np', 8) + md = solve(md, 'Stressbalance') - #Plot the results and save them - vx=md.results.StressbalanceSolution.Vx - vy=md.results.StressbalanceSolution.Vy - vz=md.results.StressbalanceSolution.Vz - results.append(md.results.StressbalanceSolution) - minvx.append(np.min(vx[-md.mesh.numberofvertices2d:])) - maxvx.append(np.max(vx[-md.mesh.numberofvertices2d:])) + #Plot the results and save them + vx = md.results.StressbalanceSolution.Vx + vy = md.results.StressbalanceSolution.Vy + vz = md.results.StressbalanceSolution.Vz + results.append(md.results.StressbalanceSolution) + minvx.append(np.min(vx[-md.mesh.numberofvertices2d:])) + 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') - 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') - 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') - 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') + #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') + 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') + 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') - 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','') - 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','') - 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','') - 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','') - 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','') - 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','') - 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') + 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', '') + 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', '') + 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', '') + 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', '') + 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', '') + 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', '') + 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') #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])xlim([0 160]) +#plot([5 10 20 40 80 160], minvx)ylim([0 18])xlim([0 160]) if printingflag: - pass -# 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') -#plot([5 10 20 40 80 160],maxvx)ylim([0 120])xlim([0 160]) + pass +# 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') +#plot([5 10 20 40 80 160], maxvx)ylim([0 120])xlim([0 160]) if printingflag: - pass -# 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') + pass +# 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') #Fields and tolerances to track changes -field_names =['Vx80km','Vy80km','Vz80km'] -field_tolerances=[1e-08,1e-08,1e-08] -field_values=[] +field_names = ['Vx80km', 'Vy80km', 'Vz80km'] +field_tolerances = [1e-08, 1e-08, 1e-08] +field_values = [] for result in results: - field_values=field_values+[result.Vx,result.Vy,result.Vz] + field_values = field_values + [result.Vx, result.Vy, result.Vz] Index: /issm/trunk-jpl/test/NightlyRun/test1102.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1102.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test1102.py (revision 23793) @@ -1,5 +1,4 @@ #Test Name: ISMIPAFS import numpy as np -import shutil from model import * from socket import gethostname @@ -15,123 +14,119 @@ """ -printingflag=False +printingflag = False -L_list=[80000.] -results=[] -minvx=[] -maxvx=[] +L_list = [80000.] +results = [] +minvx = [] +maxvx = [] for L in L_list: - nx=20 #numberof nodes in x direction - ny=20 - md=model() - md=squaremesh(md,L,L,nx,ny) - md=setmask(md,'','') #ice sheet test + nx = 20 #numberof nodes in x direction + ny = 20 + md = model() + md = squaremesh(md, L, L, nx, ny) + 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') - md.extrude(10,1.) - md=setflowequation(md,'FS','all') + md = parameterize(md, '../Par/ISMIPA.py') + md.extrude(10, 1.) + md = setflowequation(md, 'FS', 'all') - #Create dirichlet on the bed only - pos=np.nonzero(md.mesh.vertexonbase) - md.stressbalance.spcvx[pos]=0. - md.stressbalance.spcvy[pos]=0. - md.stressbalance.spcvz[pos]=0. + #Create dirichlet on the bed only + pos = np.nonzero(md.mesh.vertexonbase) + md.stressbalance.spcvx[pos] = 0. + md.stressbalance.spcvy[pos] = 0. + md.stressbalance.spcvz[pos] = 0. - #Compute the stressbalance - md.stressbalance.abstol=np.nan - md.stressbalance.reltol=np.nan - md.stressbalance.restol=1. - md.cluster=generic('name',gethostname(),'np',8) - md=solve(md,'Stressbalance') + #Compute the stressbalance + md.stressbalance.abstol = np.nan + md.stressbalance.reltol = np.nan + md.stressbalance.restol = 1. + md.cluster = generic('name', gethostname(), 'np', 8) + md = solve(md, 'Stressbalance') - #Plot the results and save them - vx=md.results.StressbalanceSolution.Vx - vy=md.results.StressbalanceSolution.Vy - vz=md.results.StressbalanceSolution.Vz - pressure=md.results.StressbalanceSolution.Pressure - results.append(md.results.StressbalanceSolution) - minvx.append(np.min(vx[-md.mesh.numberofvertices2d:])) - maxvx.append(np.max(vx[-md.mesh.numberofvertices2d:])) + #Plot the results and save them + vx = md.results.StressbalanceSolution.Vx + vy = md.results.StressbalanceSolution.Vy + vz = md.results.StressbalanceSolution.Vz + pressure = md.results.StressbalanceSolution.Pressure + results.append(md.results.StressbalanceSolution) + minvx.append(np.min(vx[-md.mesh.numberofvertices2d:])) + 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) - 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) - 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) - 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') + #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(['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) + 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') - 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','') - 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','') - 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','') - 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','') - 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','') - 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','') - 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') + 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', '') + 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', '') + 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', '') + 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', '') + 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', '') + 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', '') + 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') #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]) +#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') -#plot([5 10 20 40 80 160],maxvx)ylim([0 120]) + 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') +#plot([5 10 20 40 80 160], maxvx)ylim([0 120]) if printingflag: - pass -# 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') + pass +# 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') #Fields and tolerances to track changes -field_names =['Vx80km','Vy80km','Vz80km'] -field_tolerances=[1e-12,1e-11,1e-12,] -field_values=[] +field_names = ['Vx80km', 'Vy80km', 'Vz80km'] +field_tolerances = [1e-12, 1e-11, 1e-12] +field_values = [] for result in results: - field_values=field_values+[\ - result.Vx,\ - result.Vy,\ - result.Vz,\ - ] + field_values = field_values + [result.Vx, result.Vy, result.Vz] Index: /issm/trunk-jpl/test/NightlyRun/test1103.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1103.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test1103.py (revision 23793) @@ -1,5 +1,4 @@ #Test Name: ISMIPBHO import numpy as np -import shutil from model import * from socket import gethostname @@ -15,113 +14,113 @@ """ -printingflag=False +printingflag = False -L_list=[80000.] -results=[] -minvx=[] -maxvx=[] +L_list = [80000.] +results = [] +minvx = [] +maxvx = [] for L in L_list: - 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=parameterize(md,'../Par/ISMIPB.py') - md.extrude(10,1.) + 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 = parameterize(md, '../Par/ISMIPB.py') + md.extrude(10, 1.) - md=setflowequation(md,'HO','all') + md = setflowequation(md, 'HO', 'all') - #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)) - md.stressbalance.spcvz=np.nan*np.ones((md.mesh.numberofvertices)) - pos=np.nonzero(md.mesh.vertexonbase) - md.stressbalance.spcvx[pos]=0. - md.stressbalance.spcvy[pos]=0. + #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)) + md.stressbalance.spcvz = np.nan * np.ones((md.mesh.numberofvertices)) + pos = np.nonzero(md.mesh.vertexonbase) + md.stressbalance.spcvx[pos] = 0. + md.stressbalance.spcvy[pos] = 0. - #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] + #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 - 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] + 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)) + md.stressbalance.vertex_pairing = np.vstack((np.vstack((posx + 1, posx2 + 1)).T, np.vstack((posy + 1, posy2 + 1)).T)) - #Compute the stressbalance - md.cluster=generic('name',gethostname(),'np',8) - md=solve(md,'Stressbalance') + #Compute the stressbalance + md.cluster = generic('name', gethostname(), 'np', 8) + md = solve(md, 'Stressbalance') - #Plot the results and save them - vx=md.results.StressbalanceSolution.Vx - vy=md.results.StressbalanceSolution.Vy - vz=md.results.StressbalanceSolution.Vz - results.append(md.results.StressbalanceSolution) - minvx.append(np.min(vx[md.mesh.numberofvertices2d:])) - maxvx.append(np.max(vx[md.mesh.numberofvertices2d:])) + #Plot the results and save them + vx = md.results.StressbalanceSolution.Vx + vy = md.results.StressbalanceSolution.Vy + vz = md.results.StressbalanceSolution.Vz + results.append(md.results.StressbalanceSolution) + minvx.append(np.min(vx[md.mesh.numberofvertices2d:])) + 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') - 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') - 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') + #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') + 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') - 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','') - 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','') - 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','') - 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','') - 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','') - 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','') - 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') + 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', '') + 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', '') + 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', '') + 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', '') + 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', '') + 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', '') + 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') #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 14])xlim([0 160]) +#plot([5 10 20 40 80 160], minvx)ylim([0 14])xlim([0 160]) if printingflag: - pass -# 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') -#plot([5 10 20 40 80 160],maxvx)ylim([0 120])xlim([0 160]) + pass +# 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') +#plot([5 10 20 40 80 160], maxvx)ylim([0 120])xlim([0 160]) if printingflag: - pass -# 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') + pass +# 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') #Fields and tolerances to track changes -field_names =['Vx80km','Vy80km','Vz80km'] -field_tolerances=[1e-08,1e-07,1e-07] -field_values=[] +field_names = ['Vx80km', 'Vy80km', 'Vz80km'] +field_tolerances = [1e-08, 1e-07, 1e-07] +field_values = [] for result in results: - field_values=field_values+[result.Vx,result.Vy,result.Vz] + field_values = field_values + [result.Vx, result.Vy, result.Vz] Index: /issm/trunk-jpl/test/NightlyRun/test1104.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1104.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test1104.py (revision 23793) @@ -14,58 +14,58 @@ """ -L_list=[80000.] -results=[] +L_list = [80000.] +results = [] for L in L_list: - 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=parameterize(md,'../Par/ISMIPB.py') - md.extrude(10,1.) - md=setflowequation(md,'HO','all') + 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 = parameterize(md, '../Par/ISMIPB.py') + md.extrude(10, 1.) + md = setflowequation(md, 'HO', 'all') - #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)) - md.stressbalance.spcvz=np.nan*np.ones((md.mesh.numberofvertices)) + #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)) + md.stressbalance.spcvz = np.nan * np.ones((md.mesh.numberofvertices)) - pos=np.where(md.mesh.vertexonbase) - md.stressbalance.spcvx[pos]=0. - md.stressbalance.spcvy[pos]=0. + pos = np.where(md.mesh.vertexonbase) + md.stressbalance.spcvx[pos] = 0. + md.stressbalance.spcvy[pos] = 0. - #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] + #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 - 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] + 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 - md.stressbalance.abstol=np.nan - md.cluster=generic('name',gethostname(),'np',8) - md=solve(md,'Stressbalance') - pos=np.where(np.logical_or.reduce((md.mesh.x==0.,md.mesh.y==0.,md.mesh.x==np.max(md.mesh.x),md.mesh.y==np.max(md.mesh.y)))) - md.stressbalance.spcvx[pos]=md.results.StressbalanceSolution.Vx[pos][:,0] - md.stressbalance.spcvy[pos]=md.results.StressbalanceSolution.Vy[pos][:,0] - md.stressbalance.vertex_pairing=np.empty((0,2),int) - md=setflowequation(md,'FS','all') - md=solve(md,'Stressbalance') + 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 + md.stressbalance.abstol = np.nan + md.cluster = generic('name', gethostname(), 'np', 8) + md = solve(md, 'Stressbalance') + pos = np.where(np.logical_or.reduce((md.mesh.x == 0., md.mesh.y == 0., md.mesh.x == np.max(md.mesh.x), md.mesh.y == np.max(md.mesh.y)))) + md.stressbalance.spcvx[pos] = md.results.StressbalanceSolution.Vx[pos][:, 0] + md.stressbalance.spcvy[pos] = md.results.StressbalanceSolution.Vy[pos][:, 0] + md.stressbalance.vertex_pairing = np.empty((0, 2), int) + md = setflowequation(md, 'FS', 'all') + md = solve(md, 'Stressbalance') - #Plot the results and save them - vx=md.results.StressbalanceSolution.Vx - vy=md.results.StressbalanceSolution.Vy - vz=md.results.StressbalanceSolution.Vz - results.append(md.results.StressbalanceSolution) + #Plot the results and save them + vx = md.results.StressbalanceSolution.Vx + vy = md.results.StressbalanceSolution.Vy + vz = md.results.StressbalanceSolution.Vz + 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 -field_names =['Vx80km','Vy80km','Vz80km'] -field_tolerances=[1e-08,1e-07,1e-08] -field_values=[] +field_names = ['Vx80km', 'Vy80km', 'Vz80km'] +field_tolerances = [1e-08, 1e-07, 1e-08] +field_values = [] for result in results: - field_values=field_values+[result.Vx,result.Vy,result.Vz] + field_values = field_values + [result.Vx, result.Vy, result.Vz] Index: /issm/trunk-jpl/test/NightlyRun/test1105.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1105.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test1105.py (revision 23793) @@ -1,5 +1,4 @@ #Test Name: ISMIPCHO import numpy as np -import shutil from model import * from socket import gethostname @@ -15,142 +14,142 @@ """ -printingflag=False +printingflag = False -L_list=[80000.] -results=[] -minvx=[] -maxvx=[] +L_list = [80000.] +results = [] +minvx = [] +maxvx = [] -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=parameterize(md,'../Par/ISMIPC.py') - md.extrude(10,1.) +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 = parameterize(md, '../Par/ISMIPC.py') + md.extrude(10, 1.) - md=setflowequation(md,'HO','all') + md = setflowequation(md, 'HO', 'all') - #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)) - md.stressbalance.spcvz=np.nan*np.ones((md.mesh.numberofvertices)) + #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)) + md.stressbalance.spcvz = np.nan * np.ones((md.mesh.numberofvertices)) - posx=np.where(np.logical_and.reduce((md.mesh.x==0.,md.mesh.y!=0.,md.mesh.y!=L)))[0] - posx2=np.where(np.logical_and.reduce((md.mesh.x==L,md.mesh.y!=0.,md.mesh.y!=L)))[0] + posx = np.where(np.logical_and.reduce((md.mesh.x == 0., md.mesh.y != 0., md.mesh.y != L)))[0] + 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 - posy2=np.where(np.logical_and.reduce((md.mesh.y==L,md.mesh.x!=0.,md.mesh.x!=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 + 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)) + 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 - 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. - md.stressbalance.spcvy[pos]=0. - if (L==5000.): - md.stressbalance.spcvx[pos]=15.66 - md.stressbalance.spcvy[pos]=-0.1967 - elif (L==10000.): - md.stressbalance.spcvx[pos]=16.04 - md.stressbalance.spcvy[pos]=-0.1977 - elif (L==20000.): - md.stressbalance.spcvx[pos]=16.53 - md.stressbalance.spcvy[pos]=-1.27 - elif (L==40000.): - md.stressbalance.spcvx[pos]=17.23 - md.stressbalance.spcvy[pos]=-3.17 - elif (L==80000.): - md.stressbalance.spcvx[pos]=16.68 - md.stressbalance.spcvy[pos]=-2.69 - elif (L==160000.): - md.stressbalance.spcvx[pos]=16.03 - md.stressbalance.spcvy[pos]=-1.27 - - #Spc the bed at zero for vz - pos=np.where(md.mesh.vertexonbase) - md.stressbalance.spcvz[pos]=0. + #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. + md.stressbalance.spcvy[pos] = 0. + if (L == 5000.): + md.stressbalance.spcvx[pos] = 15.66 + md.stressbalance.spcvy[pos] = -0.1967 + elif (L == 10000.): + md.stressbalance.spcvx[pos] = 16.04 + md.stressbalance.spcvy[pos] = -0.1977 + elif (L == 20000.): + md.stressbalance.spcvx[pos] = 16.53 + md.stressbalance.spcvy[pos] = -1.27 + elif (L == 40000.): + md.stressbalance.spcvx[pos] = 17.23 + md.stressbalance.spcvy[pos] = -3.17 + elif (L == 80000.): + md.stressbalance.spcvx[pos] = 16.68 + md.stressbalance.spcvy[pos] = -2.69 + elif (L == 160000.): + md.stressbalance.spcvx[pos] = 16.03 + md.stressbalance.spcvy[pos] = -1.27 - #Compute the stressbalance - md.cluster=generic('name',gethostname(),'np',8) - md=solve(md,'Stressbalance') + #Spc the bed at zero for vz + pos = np.where(md.mesh.vertexonbase) + md.stressbalance.spcvz[pos] = 0. - #Plot the results and save them - vx=md.results.StressbalanceSolution.Vx - vy=md.results.StressbalanceSolution.Vy - vz=md.results.StressbalanceSolution.Vz - results.append(md.results.StressbalanceSolution) - minvx.append(np.min(vx[-md.mesh.numberofvertices2d:])) - maxvx.append(np.max(vx[-md.mesh.numberofvertices2d:])) + #Compute the stressbalance + md.cluster = generic('name', gethostname(), 'np', 8) + md = solve(md, 'Stressbalance') - #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) - 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) - 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') + #Plot the results and save them + vx = md.results.StressbalanceSolution.Vx + vy = md.results.StressbalanceSolution.Vy + vz = md.results.StressbalanceSolution.Vz + results.append(md.results.StressbalanceSolution) + minvx.append(np.min(vx[-md.mesh.numberofvertices2d:])) + maxvx.append(np.max(vx[-md.mesh.numberofvertices2d:])) - 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) - 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','') - 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','') - 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','') - 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','') - 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','') - 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') + #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) + 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) + 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') + + 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) + 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', '') + 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', '') + 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', '') + 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', '') + 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', '') + 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') #Now plot the min and max values of vx for each size of the square -#plot([5 10 20 40 80 160],minvx)ylim([4 18])xlim([0 160]) +#plot([5 10 20 40 80 160], minvx)ylim([4 18])xlim([0 160]) if printingflag: - pass -# 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') -#plot([5 10 20 40 80 160],maxvx)ylim([0 200]) xlim([0 160]) + pass +# 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') +#plot([5 10 20 40 80 160], maxvx)ylim([0 200]) xlim([0 160]) if printingflag: - pass -# 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') + pass +# 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') #Fields and tolerances to track changes -field_names =['Vx80km','Vy80km','Vz80km'] -field_tolerances=[1e-09,1e-08,1e-08] -field_values=[] +field_names = ['Vx80km', 'Vy80km', 'Vz80km'] +field_tolerances = [1e-09, 1e-08, 1e-08] +field_values = [] for result in results: - field_values=field_values+[result.Vx,result.Vy,result.Vz] + field_values = field_values + [result.Vx, result.Vy, result.Vz] Index: /issm/trunk-jpl/test/NightlyRun/test1106.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1106.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test1106.py (revision 23793) @@ -14,55 +14,55 @@ """ -L_list=[80000.] -results=[] +L_list = [80000.] +results = [] for L in L_list: - md=triangle(model(),"../Exp/Square_%d.exp" % 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.) + 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 - 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. - md.stressbalance.spcvy[pos]=0. - if (L==5000.): - md.stressbalance.spcvx[pos]=15.66 - md.stressbalance.spcvy[pos]=-0.1967 - elif (L==10000.): - md.stressbalance.spcvx[pos]=16.04 - md.stressbalance.spcvy[pos]=-0.1977 - elif (L==20000.): - md.stressbalance.spcvx[pos]=16.53 - md.stressbalance.spcvy[pos]=-1.27 - elif (L==40000.): - md.stressbalance.spcvx[pos]=17.23 - md.stressbalance.spcvy[pos]=-3.17 - elif (L==80000.): - md.stressbalance.spcvx[pos]=16.68 - md.stressbalance.spcvy[pos]=-2.69 - elif (L==160000.): - md.stressbalance.spcvx[pos]=16.03 - md.stressbalance.spcvy[pos]=-1.27 + #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. + md.stressbalance.spcvy[pos] = 0. + if (L == 5000.): + md.stressbalance.spcvx[pos] = 15.66 + md.stressbalance.spcvy[pos] = -0.1967 + elif (L == 10000.): + md.stressbalance.spcvx[pos] = 16.04 + md.stressbalance.spcvy[pos] = -0.1977 + elif (L == 20000.): + md.stressbalance.spcvx[pos] = 16.53 + md.stressbalance.spcvy[pos] = -1.27 + elif (L == 40000.): + md.stressbalance.spcvx[pos] = 17.23 + md.stressbalance.spcvy[pos] = -3.17 + elif (L == 80000.): + md.stressbalance.spcvx[pos] = 16.68 + md.stressbalance.spcvy[pos] = -2.69 + elif (L == 160000.): + md.stressbalance.spcvx[pos] = 16.03 + md.stressbalance.spcvy[pos] = -1.27 - md=setflowequation(md,'FS','all') + md = setflowequation(md, 'FS', 'all') - #Compute the stressbalance - md.cluster=generic('name',gethostname(),'np',8) - md=solve(md,'Stressbalance') + #Compute the stressbalance + md.cluster = generic('name', gethostname(), 'np', 8) + md = solve(md, 'Stressbalance') - #Plot the results and save them - vx=md.results.StressbalanceSolution.Vx - vy=md.results.StressbalanceSolution.Vy - vz=md.results.StressbalanceSolution.Vz - results.append(md.results.StressbalanceSolution) + #Plot the results and save them + vx = md.results.StressbalanceSolution.Vx + vy = md.results.StressbalanceSolution.Vy + vz = md.results.StressbalanceSolution.Vz + 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 -field_names =['Vx80km','Vy80km','Vz80km'] -field_tolerances=[1e-12,1e-12,1e-12] -field_values=[] +field_names = ['Vx80km', 'Vy80km', 'Vz80km'] +field_tolerances = [1e-12, 1e-12, 1e-12] +field_values = [] for result in results: - field_values=field_values+[result.Vx,result.Vy,result.Vz] + field_values = field_values + [result.Vx, result.Vy, result.Vz] Index: /issm/trunk-jpl/test/NightlyRun/test1107.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1107.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test1107.py (revision 23793) @@ -1,5 +1,4 @@ #Test Name: ISMIPDHO import numpy as np -import shutil from model import * from socket import gethostname @@ -15,133 +14,133 @@ """ -printingflag=False +printingflag = False -L_list=[80000.] -results=[] -minvx=[] -maxvx=[] +L_list = [80000.] +results = [] +minvx = [] +maxvx = [] for L in L_list: - 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=parameterize(md,'../Par/ISMIPD.py') - md.extrude(10,1.) + 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 = parameterize(md, '../Par/ISMIPD.py') + md.extrude(10, 1.) - md=setflowequation(md,'HO','all') + md = setflowequation(md, 'HO', 'all') - #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)) + #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 -# 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] -# posx2=find(md.mesh.x==max(md.mesh.x) & ~(md.mesh.y==0. & md.mesh.vertexonbase) & ~(md.mesh.y==L & md.mesh.vertexonbase)) - 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] + #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] +# posx2 = find(md.mesh.x = max(md.mesh.x) & ~(md.mesh.y = 0. & md.mesh.vertexonbase) & ~(md.mesh.y = L & md.mesh.vertexonbase)) + 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 - 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] + 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)) + 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 - 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. - md.stressbalance.spcvx[pos]=0. - if (L==5000.): - md.stressbalance.spcvx[pos]=16.0912 - elif (L==10000.): - md.stressbalance.spcvx[pos]=16.52 - elif (L==20000.): - md.stressbalance.spcvx[pos]=17.77 - elif (L==40000.): - md.stressbalance.spcvx[pos]=19.88 - elif (L==80000.): - md.stressbalance.spcvx[pos]=18.65 - elif (L==160000.): - md.stressbalance.spcvx[pos]=16.91 - - #Spc the bed at zero for vz - pos=np.where(md.mesh.vertexonbase) - md.stressbalance.spcvz[pos]=0. + #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. + md.stressbalance.spcvx[pos] = 0. + if (L == 5000.): + md.stressbalance.spcvx[pos] = 16.0912 + elif (L == 10000.): + md.stressbalance.spcvx[pos] = 16.52 + elif (L == 20000.): + md.stressbalance.spcvx[pos] = 17.77 + elif (L == 40000.): + md.stressbalance.spcvx[pos] = 19.88 + elif (L == 80000.): + md.stressbalance.spcvx[pos] = 18.65 + elif (L == 160000.): + md.stressbalance.spcvx[pos] = 16.91 - #Compute the stressbalance - md.cluster=generic('name',gethostname(),'np',8) - md=solve(md,'Stressbalance') + #Spc the bed at zero for vz + pos = np.where(md.mesh.vertexonbase) + md.stressbalance.spcvz[pos] = 0. - #Plot the results and save them - vx=md.results.StressbalanceSolution.Vx - vy=md.results.StressbalanceSolution.Vy - vz=md.results.StressbalanceSolution.Vz - results.append(md.results.StressbalanceSolution) - minvx.append(np.min(vx[-md.mesh.numberofvertices2d:])) - maxvx.append(np.max(vx[-md.mesh.numberofvertices2d:])) + #Compute the stressbalance + md.cluster = generic('name', gethostname(), 'np', 8) + md = solve(md, 'Stressbalance') - #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) - 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') + #Plot the results and save them + vx = md.results.StressbalanceSolution.Vx + vy = md.results.StressbalanceSolution.Vy + vz = md.results.StressbalanceSolution.Vz + results.append(md.results.StressbalanceSolution) + minvx.append(np.min(vx[-md.mesh.numberofvertices2d:])) + maxvx.append(np.max(vx[-md.mesh.numberofvertices2d:])) - 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) - 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) - 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) - 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) - 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) - 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) - 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') + #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) + 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') + + 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) + 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) + 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) + 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) + 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) + 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) + 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') #Now plot the min and max values of vx for each size of the square -#plot([5 10 20 40 80 160],minvx)ylim([2 18])xlim([0 160]) +#plot([5 10 20 40 80 160], minvx)ylim([2 18])xlim([0 160]) if printingflag: - pass -# 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') -#plot([5 10 20 40 80 160],maxvx)ylim([0 300])xlim([0 160]) + pass +# 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') +#plot([5 10 20 40 80 160], maxvx)ylim([0 300])xlim([0 160]) if printingflag: - pass -# 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') + pass +# 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') #Fields and tolerances to track changes -field_names =['Vx80km','Vy80km','Vz80km'] -field_tolerances=[1e-08,1e-08,1e-07] -field_values=[] +field_names = ['Vx80km', 'Vy80km', 'Vz80km'] +field_tolerances = [1e-08, 1e-08, 1e-07] +field_values = [] for result in results: - field_values=field_values+[result.Vx,result.Vy,result.Vz] + field_values = field_values + [result.Vx, result.Vy, result.Vz] Index: /issm/trunk-jpl/test/NightlyRun/test1108.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1108.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test1108.py (revision 23793) @@ -17,77 +17,73 @@ """ -#L_list=[5000.,10000.,20000.,40000.,80000.,160000.] -L_list=[80000.] -results=[] +#L_list = [5000., 10000., 20000., 40000., 80000., 160000.] +L_list = [80000.] +results = [] for L in L_list: - 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=parameterize(md,'../Par/ISMIPD.py') - md.extrude(10,1.) + 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 = parameterize(md, '../Par/ISMIPD.py') + md.extrude(10, 1.) - md=setflowequation(md,'HO','all') + md = setflowequation(md, 'HO', 'all') - #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)) - - maxx = max(md.mesh.x) - maxy = max(md.mesh.y) - posA = np.where(md.mesh.vertexonbase) - posB = np.unique(np.concatenate((np.where(md.mesh.x==0.), np.where(md.mesh.x==maxx)))) - posC = np.unique(np.concatenate((np.where(md.mesh.y==0.), np.where(md.mesh.y==maxy)))) - pos = np.intersect1d(np.intersect1d(posA,posB),posC) + #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)) - md.stressbalance.spcvx[pos]=0. - md.stressbalance.spcvy[pos]=0. - md.stressbalance.spcvz[pos]=0. + maxx = max(md.mesh.x) + maxy = max(md.mesh.y) + posA = np.where(md.mesh.vertexonbase) + posB = np.unique(np.concatenate((np.where(md.mesh.x == 0.), np.where(md.mesh.x == maxx)))) + posC = np.unique(np.concatenate((np.where(md.mesh.y == 0.), np.where(md.mesh.y == maxy)))) + pos = np.intersect1d(np.intersect1d(posA, posB), posC) - #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] + md.stressbalance.spcvx[pos] = 0. + md.stressbalance.spcvy[pos] = 0. + md.stressbalance.spcvz[pos] = 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 - 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] + #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] - 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)))) + 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] - #Compute the stressbalance - md.cluster=generic('name',gethostname(),'np',8) - md.verbose=verbose('convergence',True) - md=solve(md,'Stressbalance') - md.stressbalance.reltol=np.nan - 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 - 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] - md=setflowequation(md,'FS','all') - md=solve(md,'Stressbalance') + 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)))) - #Plot the results and save them - vx=md.results.StressbalanceSolution.Vx - vy=md.results.StressbalanceSolution.Vy - vz=md.results.StressbalanceSolution.Vz - results.append(md.results.StressbalanceSolution) + #Compute the stressbalance + md.cluster = generic('name', gethostname(), 'np', 8) + md.verbose = verbose('convergence', True) + md = solve(md, 'Stressbalance') + md.stressbalance.reltol = np.nan + 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 + 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] + md = setflowequation(md, 'FS', 'all') + md = solve(md, 'Stressbalance') -# plotmodel(md,'data',vx,'data',vy,'data',vz,'layer#all',md.mesh.numberoflayers) + #Plot the results and save them + vx = md.results.StressbalanceSolution.Vx + vy = md.results.StressbalanceSolution.Vy + vz = md.results.StressbalanceSolution.Vz + results.append(md.results.StressbalanceSolution) + +# plotmodel(md, 'data', vx, 'data', vy, 'data', vz, 'layer#all', md.mesh.numberoflayers) #Fields and tolerances to track changes -field_names =['Vx80km','Vy80km','Vz80km'] -field_tolerances=[1e-08,1e-07,1e-07] -field_values=[] +field_names = ['Vx80km', 'Vy80km', 'Vz80km'] +field_tolerances = [1e-08, 1e-07, 1e-07] +field_values = [] for result in results: - field_values=field_values+[\ - result.Vx,\ - result.Vy,\ - result.Vz,\ - ] + field_values = field_values + [result.Vx, result.Vy, result.Vz] Index: /issm/trunk-jpl/test/NightlyRun/test1109.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1109.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test1109.py (revision 23793) @@ -1,5 +1,4 @@ #Test Name: ISMIPE import numpy as np -import sys from model import * from socket import gethostname @@ -12,5 +11,5 @@ #This test is a test from the ISMP-HOM Intercomparison project. -#TestE +#TestE #Four tests to run: - Pattyn frozen # - Stokes frozen @@ -21,66 +20,62 @@ for i in range(4): - Lx=10. #in m - Ly=5000. #in m - nx=3 #number of nodes in x direction - ny=51 - md = model() - md = squaremesh(md,Lx,Ly,nx,ny) - md = setmask(md,'','') #ice sheet test - md = parameterize(md,'../Par/ISMIPE.py') - md = md.extrude(10,1.) + Lx = 10. #in m + Ly = 5000. #in m + nx = 3 #number of nodes in x direction + ny = 51 + md = model() + md = squaremesh(md, Lx, Ly, nx, ny) + md = setmask(md, '', '') #ice sheet test + md = parameterize(md, '../Par/ISMIPE.py') + md = md.extrude(10, 1.) - if i==0 or i==2: - md = setflowequation(md,'HO','all') - elif i==1 or i==3: - md = setflowequation(md,'FS','all') + if i == 0 or i == 2: + md = setflowequation(md, 'HO', 'all') + elif i == 1 or i == 3: + md = setflowequation(md, 'FS', 'all') - #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 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 - 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[pos] = 0. - md.stressbalance.spcvy[pos] = 0. - md.stressbalance.spcvz[pos] = 0. + #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[pos] = 0. + md.stressbalance.spcvy[pos] = 0. + md.stressbalance.spcvz[pos] = 0. - #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] - md.stressbalance.spcvx[pos] = float('NaN') - md.stressbalance.spcvy[pos] = float('NaN') - md.stressbalance.spcvz[pos] = float('NaN') + #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] + md.stressbalance.spcvx[pos] = float('NaN') + md.stressbalance.spcvy[pos] = float('NaN') + md.stressbalance.spcvz[pos] = float('NaN') - #Compute the stressbalance - md.cluster = generic('name',gethostname(),'np',8) - md = solve(md,'Stressbalance') + #Compute the stressbalance + md.cluster = generic('name', gethostname(), 'np', 8) + md = solve(md, 'Stressbalance') - vx = md.results.StressbalanceSolution.Vx - vy = md.results.StressbalanceSolution.Vy - vz = md.results.StressbalanceSolution.Vz - results[i] = md.results.StressbalanceSolution + vx = md.results.StressbalanceSolution.Vx + vy = md.results.StressbalanceSolution.Vy + vz = md.results.StressbalanceSolution.Vz + results[i] = md.results.StressbalanceSolution #Fields and tolerances to track changes -field_names = [ - 'VyPattynSliding','VzPattynSliding', - 'VxStokesSliding','VyStokesSliding','VzStokesSliding', - 'VyPattynFrozen','VzPattynFrozen', - 'VxStokesFrozen','VyStokesFrozen','VzStokesFrozen' - ] -field_tolerances = [ - 1e-05,1e-05, - 1e-05,1e-06,1e-06, - 1e-05,1e-04, - 1e-05,1e-05,1e-06 - ] +field_names = ['VyPattynSliding', 'VzPattynSliding', + 'VxStokesSliding', 'VyStokesSliding', 'VzStokesSliding', + 'VyPattynFrozen', 'VzPattynFrozen', + 'VxStokesFrozen', 'VyStokesFrozen', 'VzStokesFrozen'] +field_tolerances = [1e-05, 1e-05, + 1e-05, 1e-06, 1e-06, + 1e-05, 1e-04, + 1e-05, 1e-05, 1e-06] field_values = [] for i in range(4): - result = results[i] - field_values += [result.Vx,result.Vy,result.Vz] + result = results[i] + field_values += [result.Vx, result.Vy, result.Vz] Index: /issm/trunk-jpl/test/NightlyRun/test111.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test111.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test111.py (revision 23793) @@ -9,55 +9,51 @@ -md=triangle(model(),'../Exp/Square.exp',200000) -md=setmask(md,'all','') -md=parameterize(md,'../Par/SquareShelfConstrained.py') -md.extrude(3,1.) -md=setflowequation(md,'HO','all') -md.cluster=generic('name',gethostname(),'np',3) -md.transient.requested_outputs=['IceVolume'] -md=solve(md,'Transient') +md = triangle(model(), '../Exp/Square.exp', 200000) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelfConstrained.py') +md.extrude(3, 1.) +md = setflowequation(md, 'HO', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) +md.transient.requested_outputs = ['IceVolume'] +md = solve(md, 'Transient') #Fields and tolerances to track changes -field_names=[\ - 'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface2','Thickness1','Temperature1','BasalforcingsGroundediceMeltingRate1','Volume1', \ - 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsGroundediceMeltingRate2','Volume2', \ - 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsGroundediceMeltingRate3','Volume3'] -field_tolerances=[\ - 1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-05,1e-13,\ - 1e-09,1e-08,1e-08,1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-05,2e-11,\ - 1e-09,1e-08,1e-08,1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-05,1e-11] -field_values=[\ - md.results.TransientSolution[0].Vx,\ - md.results.TransientSolution[0].Vy,\ - md.results.TransientSolution[0].Vz,\ - md.results.TransientSolution[0].Vel,\ - md.results.TransientSolution[0].Pressure,\ - md.results.TransientSolution[0].Base,\ - md.results.TransientSolution[0].Surface,\ - md.results.TransientSolution[0].Thickness,\ - md.results.TransientSolution[0].Temperature,\ - md.results.TransientSolution[0].BasalforcingsGroundediceMeltingRate,\ - md.results.TransientSolution[0].IceVolume,\ - md.results.TransientSolution[1].Vx,\ - md.results.TransientSolution[1].Vy,\ - md.results.TransientSolution[1].Vz,\ - md.results.TransientSolution[1].Vel,\ - md.results.TransientSolution[1].Pressure,\ - md.results.TransientSolution[1].Base,\ - md.results.TransientSolution[1].Surface,\ - md.results.TransientSolution[1].Thickness,\ - md.results.TransientSolution[1].Temperature,\ - md.results.TransientSolution[1].BasalforcingsGroundediceMeltingRate,\ - md.results.TransientSolution[1].IceVolume,\ - md.results.TransientSolution[2].Vx,\ - md.results.TransientSolution[2].Vy,\ - md.results.TransientSolution[2].Vz,\ - md.results.TransientSolution[2].Vel,\ - md.results.TransientSolution[2].Pressure,\ - md.results.TransientSolution[2].Base,\ - md.results.TransientSolution[2].Surface,\ - md.results.TransientSolution[2].Thickness,\ - md.results.TransientSolution[2].Temperature,\ - md.results.TransientSolution[2].BasalforcingsGroundediceMeltingRate,\ - md.results.TransientSolution[2].IceVolume,\ - ] +field_names = ['Vx1', 'Vy1', 'Vz1', 'Vel1', 'Pressure1', 'Bed1', 'Surface2', 'Thickness1', 'Temperature1', 'BasalforcingsGroundediceMeltingRate1', 'Volume1', + 'Vx2', 'Vy2', 'Vz2', 'Vel2', 'Pressure2', 'Bed2', 'Surface2', 'Thickness2', 'Temperature2', 'BasalforcingsGroundediceMeltingRate2', 'Volume2', + 'Vx3', 'Vy3', 'Vz3', 'Vel3', 'Pressure3', 'Bed3', 'Surface3', 'Thickness3', 'Temperature3', 'BasalforcingsGroundediceMeltingRate3', 'Volume3'] +field_tolerances = [1e-09, 1e-09, 1e-09, 1e-09, 1e-09, 1e-09, 1e-09, 1e-09, 1e-09, 1e-05, 1e-13, + 1e-09, 1e-08, 1e-08, 1e-08, 1e-09, 1e-09, 1e-09, 1e-09, 1e-09, 1e-05, 2e-11, + 1e-09, 1e-08, 1e-08, 1e-08, 1e-09, 1e-09, 1e-09, 1e-09, 1e-09, 1e-05, 1e-11] +field_values = [md.results.TransientSolution[0].Vx, + md.results.TransientSolution[0].Vy, + md.results.TransientSolution[0].Vz, + md.results.TransientSolution[0].Vel, + md.results.TransientSolution[0].Pressure, + md.results.TransientSolution[0].Base, + md.results.TransientSolution[0].Surface, + md.results.TransientSolution[0].Thickness, + md.results.TransientSolution[0].Temperature, + md.results.TransientSolution[0].BasalforcingsGroundediceMeltingRate, + md.results.TransientSolution[0].IceVolume, + md.results.TransientSolution[1].Vx, + md.results.TransientSolution[1].Vy, + md.results.TransientSolution[1].Vz, + md.results.TransientSolution[1].Vel, + md.results.TransientSolution[1].Pressure, + md.results.TransientSolution[1].Base, + md.results.TransientSolution[1].Surface, + md.results.TransientSolution[1].Thickness, + md.results.TransientSolution[1].Temperature, + md.results.TransientSolution[1].BasalforcingsGroundediceMeltingRate, + md.results.TransientSolution[1].IceVolume, + md.results.TransientSolution[2].Vx, + md.results.TransientSolution[2].Vy, + md.results.TransientSolution[2].Vz, + md.results.TransientSolution[2].Vel, + md.results.TransientSolution[2].Pressure, + md.results.TransientSolution[2].Base, + md.results.TransientSolution[2].Surface, + md.results.TransientSolution[2].Thickness, + md.results.TransientSolution[2].Temperature, + md.results.TransientSolution[2].BasalforcingsGroundediceMeltingRate, + md.results.TransientSolution[2].IceVolume] Index: /issm/trunk-jpl/test/NightlyRun/test1110.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1110.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test1110.py (revision 23793) @@ -11,131 +11,135 @@ #This test is a test from the ISMP-HOM Intercomparison project. -#TestF +#TestF printingflag = False results = [] for i in range(4): - 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 = setmask(md,'','') #ice sheet test - md = parameterize(md,'../Par/ISMIPF.py') - md = md.extrude(4,1.) + 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 = setmask(md, '', '') #ice sheet test + md = parameterize(md, '../Par/ISMIPF.py') + md = md.extrude(4, 1.) - if (i == 0 or i == 1): - md = setflowequation(md,'HO','all') - else: - md = setflowequation(md,'FS','all') + if (i == 0 or i == 1): + md = setflowequation(md, 'HO', 'all') + else: + 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,)) - if (i == 0 or i == 2): - #Create dirichlet on the bed if no slip - pos = np.where(md.mesh.vertexonbase) - md.stressbalance.spcvx[pos] = 0. - md.stressbalance.spcvy[pos] = 0. - md.stressbalance.spcvz[pos] = 0. - else: - posA = np.where(md.mesh.vertexonbase) - posB = np.unique(np.concatenate(np.where(md.mesh.x == 0.),np.where(md.mesh.x == max(md.mesh.x)))) - posC = np.unique(np.concatenate(np.where(md.mesh.y == 0.),np.where(md.mesh.y == max(md.mesh.y)))) - pos = np.intersect1d(np.intersect1d(posA,posB),posC) - md.stressbalance.spcvx[pos] = 100. #because we need a dirichlet somewhere - md.stressbalance.spcvy[pos] = 0. - md.stressbalance.spcvz[pos] = 0. - - pos = np.where(np.logical_not(md.mesh.vertexonbase)) - md.thermal.spctemperature[pos] = 255. + 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 + pos = np.where(md.mesh.vertexonbase) + md.stressbalance.spcvx[pos] = 0. + md.stressbalance.spcvy[pos] = 0. + md.stressbalance.spcvz[pos] = 0. + else: + posA = np.where(md.mesh.vertexonbase) + posB = np.unique(np.concatenate(np.where(md.mesh.x == 0.), np.where(md.mesh.x == max(md.mesh.x)))) + posC = np.unique(np.concatenate(np.where(md.mesh.y == 0.), np.where(md.mesh.y == max(md.mesh.y)))) + pos = np.intersect1d(np.intersect1d(posA, posB), posC) + md.stressbalance.spcvx[pos] = 100. #because we need a dirichlet somewhere + md.stressbalance.spcvy[pos] = 0. + md.stressbalance.spcvz[pos] = 0. - #Create MPCs to have periodic boundary conditions - posx = np.where(md.mesh.x == 0.) - posx2 = np.where(md.mesh.x == max(md.mesh.x)) + pos = np.where(np.logical_not(md.mesh.vertexonbase)) + md.thermal.spctemperature[pos] = 255. - posy = np.where(md.mesh.y == 0.) - posy2 = np.where(md.mesh.y == max(md.mesh.y)) + #Create MPCs to have periodic boundary conditions + posx = np.where(md.mesh.x == 0.) + posx2 = np.where(md.mesh.x == max(md.mesh.x)) - md.stressbalance.vertex_pairing = np.column_stack((posx,posx2,posy,posy2)) - md.masstransport.vertex_pairing = np.column_stack((posx,posx2,posy,posy2)) + posy = np.where(md.mesh.y == 0.) + posy2 = np.where(md.mesh.y == max(md.mesh.y)) - md.timestepping.time_step = 3. - md.timestepping.final_time = 300. - md.settings.output_frequency = 50 - md.masstransport.stabilization = 1 - md.stressbalance.maxiter = 1 - - #Compute the stressbalance - md.cluster = generic('name',gethostname(),'np',8) - md.verbose = verbose('convergence',True,'solution',True) - md = solve(md,'Transient') + md.stressbalance.vertex_pairing = np.column_stack((posx, posx2, posy, posy2)) + md.masstransport.vertex_pairing = np.column_stack((posx, posx2, posy, posy2)) - #save the results - results[i] = md.results.TransientSolution() - - #Now plot vx and delta surface - if (i == 0 or i == 2): - plotmodel(md,'data',(md.results.TransientSolution().Vx),'layer',md.mesh.numberoflayers,'sectionvalue','../Exp/ISMIP100000.exp','title','','xlabel','','ylabel','Velocity (m/yr)','linewidth',3,'grid','on','unit','km','ylim',[91,100]) - elif (i == 1 or i == 3): - plotmodel(md,'data',(md.results.TransientSolution().Vx),'layer',md.mesh.numberoflayers,'sectionvalue','../Exp/ISMIP100000.exp','title','','xlabel','','ylabel','Velocity (m/yr)','linewidth',3,'grid','on','unit','km','ylim',[185,200]) - - if printingflag: - #set(gcf,'Color','w') - if i == 0: - printmodel('ismipfHOvxfrozen','png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off') - #system(['mv ismipfHOvxfrozen.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestF']) - elif i == 1: - printmodel('ismipfHOvxsliding','png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off') - #system(['mv ismipfHOvxsliding.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestF']) - elif i == 2: - printmodel('ismipfFSvxfrozen','png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off') - #system(['mv ismipfFSvxfrozen.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestF']) - elif i == 3: - printmodel('ismipfFSvxsliding','png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off') - #system(['mv ismipfFSvxsliding.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestF']) - - + md.timestepping.time_step = 3. + md.timestepping.final_time = 300. + md.settings.output_frequency = 50 + md.masstransport.stabilization = 1 + md.stressbalance.maxiter = 1 - 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') - if i == 0: - printmodel('ismipfHOdeltasurfacefrozen','png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off') - #system(['mv ismipfHOdeltasurfacefrozen.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestF']) - elif i == 1: - printmodel('ismipfHOdeltasurfacesliding','png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off') - #system(['mv ismipfHOdeltasurfacesliding.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestF']) - elif i == 2: - printmodel('ismipfFSdeltasurfacefrozen','png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off') - #system(['mv ismipfFSdeltasurfacefrozen.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestF']) - elif i == 3: - printmodel('ismipfFSdeltasurfacesliding','png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off') - #system(['mv ismipfFSdeltasurfacesliding.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestF']) - - + #Compute the stressbalance + md.cluster = generic('name', gethostname(), 'np', 8) + md.verbose = verbose('convergence', True, 'solution', True) + md = solve(md, 'Transient') + #save the results + results[i] = md.results.TransientSolution() + + #Now plot vx and delta surface + if (i == 0 or i == 2): + plotmodel(md, 'data', (md.results.TransientSolution().Vx), + 'layer', md.mesh.numberoflayers, + 'sectionvalue', '../Exp/ISMIP100000.exp', + 'title', '', + 'xlabel', '', + 'ylabel', 'Velocity (m/yr)', + 'linewidth', 3, + 'grid', 'on', + 'unit', 'km', + 'ylim', [91, 100]) + elif (i == 1 or i == 3): + plotmodel(md, 'data', (md.results.TransientSolution().Vx), + 'layer', md.mesh.numberoflayers, + 'sectionvalue', '../Exp/ISMIP100000.exp', + 'title', '', + 'xlabel', '', + 'ylabel', 'Velocity (m/yr)', + 'linewidth', 3, + 'grid', 'on', + 'unit', 'km', + 'ylim', [185, 200]) + + if printingflag: + #set(gcf, 'Color', 'w') + if i == 0: + printmodel('ismipfHOvxfrozen', 'png', 'margin', 'on', 'marginsize', 25, 'frame', 'off', 'resolution', 1.5, 'hardcopy', 'off') + #system(['mv ismipfHOvxfrozen.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestF']) + elif i == 1: + printmodel('ismipfHOvxsliding', 'png', 'margin', 'on', 'marginsize', 25, 'frame', 'off', 'resolution', 1.5, 'hardcopy', 'off') + #system(['mv ismipfHOvxsliding.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestF']) + elif i == 2: + printmodel('ismipfFSvxfrozen', 'png', 'margin', 'on', 'marginsize', 25, 'frame', 'off', 'resolution', 1.5, 'hardcopy', 'off') + #system(['mv ismipfFSvxfrozen.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestF']) + elif i == 3: + printmodel('ismipfFSvxsliding', 'png', 'margin', 'on', 'marginsize', 25, 'frame', 'off', 'resolution', 1.5, 'hardcopy', 'off') + #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]) + if printingflag: + #set(gcf, 'Color', 'w') + if i == 0: + printmodel('ismipfHOdeltasurfacefrozen', 'png', 'margin', 'on', 'marginsize', 25, 'frame', 'off', 'resolution', 1.5, 'hardcopy', 'off') + #system(['mv ismipfHOdeltasurfacefrozen.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestF']) + elif i == 1: + printmodel('ismipfHOdeltasurfacesliding', 'png', 'margin', 'on', 'marginsize', 25, 'frame', 'off', 'resolution', 1.5, 'hardcopy', 'off') + #system(['mv ismipfHOdeltasurfacesliding.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestF']) + elif i == 2: + printmodel('ismipfFSdeltasurfacefrozen', 'png', 'margin', 'on', 'marginsize', 25, 'frame', 'off', 'resolution', 1.5, 'hardcopy', 'off') + #system(['mv ismipfFSdeltasurfacefrozen.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestF']) + elif i == 3: + printmodel('ismipfFSdeltasurfacesliding', 'png', 'margin', 'on', 'marginsize', 25, 'frame', 'off', 'resolution', 1.5, 'hardcopy', 'off') + #system(['mv ismipfFSdeltasurfacesliding.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestF']) #Fields and tolerances to track changes -field_names = [ - 'VxPattynFrozen','VyPattynFrozen','VzPattynFrozen','SurfacePattynFrozen', - 'VxPattynSliding','VyPattynSliding','VzPattynSliding','SurfacePattynSliding', - 'VxStokesFrozen','VyStokesFrozen','VzStokesFrozen','SurfaceStokesFrozen', - 'VxStokesSliding','VyStokesSliding','VzStokesSliding','SurfaceStokesSliding' -] -field_tolerances = [ - 1e-10,1e-09,1e-09,1e-10, - 1e-10,1e-09,1e-09,1e-10, - 1e-08,1e-09,1e-08,1e-09, - 1e-08,2e-09,1e-08,1e-09 -] +field_names = ['VxPattynFrozen', 'VyPattynFrozen', 'VzPattynFrozen', 'SurfacePattynFrozen', + 'VxPattynSliding', 'VyPattynSliding', 'VzPattynSliding', 'SurfacePattynSliding', + 'VxStokesFrozen', 'VyStokesFrozen', 'VzStokesFrozen', 'SurfaceStokesFrozen', + 'VxStokesSliding', 'VyStokesSliding', 'VzStokesSliding', 'SurfaceStokesSliding'] +field_tolerances = [1e-10, 1e-09, 1e-09, 1e-10, + 1e-10, 1e-09, 1e-09, 1e-10, + 1e-08, 1e-09, 1e-08, 1e-09, + 1e-08, 2e-09, 1e-08, 1e-09] field_values = [] for i in range(4): - result = results[i] - field_values += ([ - result.Vx, - result.Vy, - result.Vz, - result.Surface] - md.geometry.surface) - + result = results[i] + field_values += ([result.Vx, result.Vy, result.Vz, result.Surface] - md.geometry.surface) Index: /issm/trunk-jpl/test/NightlyRun/test112.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test112.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test112.py (revision 23793) @@ -9,16 +9,14 @@ -md=triangle(model(),'../Exp/Square.exp',150000) -md=setmask(md,'all','') -md=parameterize(md,'../Par/SquareShelfConstrained.py') -md=setflowequation(md,'SSA','all') -md.cluster=generic('name',gethostname(),'np',3) -md=solve(md,'SurfaceSlope') +md = triangle(model(), '../Exp/Square.exp', 150000) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelfConstrained.py') +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'SurfaceSlope') #Fields and tolerances to track changes -field_names =['SurfaceSlopeX','SurfaceSlopeY'] -field_tolerances=[1e-13,1e-13] -field_values=[\ - md.results.SurfaceSlopeSolution.SurfaceSlopeX,\ - md.results.SurfaceSlopeSolution.SurfaceSlopeY,\ - ] +field_names = ['SurfaceSlopeX', 'SurfaceSlopeY'] +field_tolerances = [1e-13, 1e-13] +field_values = [md.results.SurfaceSlopeSolution.SurfaceSlopeX, + md.results.SurfaceSlopeSolution.SurfaceSlopeY] Index: /issm/trunk-jpl/test/NightlyRun/test113.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test113.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test113.py (revision 23793) @@ -9,17 +9,15 @@ -md=triangle(model(),'../Exp/Square.exp',150000) -md=setmask(md,'all','') -md=parameterize(md,'../Par/SquareShelfConstrained.py') -md.extrude(5,1.) -md=setflowequation(md,'SSA','all') -md.cluster=generic('name',gethostname(),'np',3) -md=solve(md,'SurfaceSlope') +md = triangle(model(), '../Exp/Square.exp', 150000) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelfConstrained.py') +md.extrude(5, 1.) +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'SurfaceSlope') #Fields and tolerances to track changes -field_names =['SurfaceSlopeX','SurfaceSlopeY'] -field_tolerances=[1e-13,1e-13] -field_values=[\ - md.results.SurfaceSlopeSolution.SurfaceSlopeX,\ - md.results.SurfaceSlopeSolution.SurfaceSlopeY,\ - ] +field_names = ['SurfaceSlopeX', 'SurfaceSlopeY'] +field_tolerances = [1e-13, 1e-13] +field_values = [md.results.SurfaceSlopeSolution.SurfaceSlopeX, + md.results.SurfaceSlopeSolution.SurfaceSlopeY] Index: /issm/trunk-jpl/test/NightlyRun/test114.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test114.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test114.py (revision 23793) @@ -9,16 +9,14 @@ -md=triangle(model(),'../Exp/Square.exp',150000) -md=setmask(md,'all','') -md=parameterize(md,'../Par/SquareShelfConstrained.py') -md=setflowequation(md,'SSA','all') -md.cluster=generic('name',gethostname(),'np',3) -md=solve(md,'BedSlope') +md = triangle(model(), '../Exp/Square.exp', 150000) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelfConstrained.py') +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'BedSlope') #Fields and tolerances to track changes -field_names =['BedSlopeX','BedSlopeY'] -field_tolerances=[1e-13,1e-13] -field_values=[\ - md.results.BedSlopeSolution.BedSlopeX,\ - md.results.BedSlopeSolution.BedSlopeY,\ - ] +field_names = ['BedSlopeX', 'BedSlopeY'] +field_tolerances = [1e-13, 1e-13] +field_values = [md.results.BedSlopeSolution.BedSlopeX, + md.results.BedSlopeSolution.BedSlopeY] Index: /issm/trunk-jpl/test/NightlyRun/test115.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test115.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test115.py (revision 23793) @@ -9,17 +9,15 @@ -md=triangle(model(),'../Exp/Square.exp',150000) -md=setmask(md,'all','') -md=parameterize(md,'../Par/SquareShelfConstrained.py') -md.extrude(5,1.) -md=setflowequation(md,'SSA','all') -md.cluster=generic('name',gethostname(),'np',3) -md=solve(md,'BedSlope') +md = triangle(model(), '../Exp/Square.exp', 150000) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelfConstrained.py') +md.extrude(5, 1.) +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'BedSlope') #Fields and tolerances to track changes -field_names =['BedSlopeX','BedSlopeY'] -field_tolerances=[1e-13,1e-13] -field_values=[\ - md.results.BedSlopeSolution.BedSlopeX,\ - md.results.BedSlopeSolution.BedSlopeY,\ - ] +field_names = ['BedSlopeX', 'BedSlopeY'] +field_tolerances = [1e-13, 1e-13] +field_values = [md.results.BedSlopeSolution.BedSlopeX, + md.results.BedSlopeSolution.BedSlopeY] Index: /issm/trunk-jpl/test/NightlyRun/test116.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test116.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test116.py (revision 23793) @@ -10,18 +10,16 @@ -md=triangle(model(),'../Exp/Square.exp',150000) -md=setmask(md,'all','') -md=parameterize(md,'../Par/SquareShelfConstrained.py') +md = triangle(model(), '../Exp/Square.exp', 150000) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelfConstrained.py') #Add boundary conditions on thickness on the border -pos=np.nonzero(md.mesh.vertexonboundary) -md.balancethickness.spcthickness[pos]=md.geometry.thickness[pos] -md=setflowequation(md,'SSA','all') -md.cluster=generic('name',gethostname(),'np',3) -md=solve(md,'Balancethickness') +pos = np.nonzero(md.mesh.vertexonboundary) +md.balancethickness.spcthickness[pos] = md.geometry.thickness[pos] +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'Balancethickness') #Fields and tolerances to track changes -field_names =['Thickness'] -field_tolerances=[1e-13] -field_values=[\ - md.results.BalancethicknessSolution.Thickness,\ - ] +field_names = ['Thickness'] +field_tolerances = [1e-13] +field_values = [md.results.BalancethicknessSolution.Thickness] Index: /issm/trunk-jpl/test/NightlyRun/test119.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test119.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test119.py (revision 23793) @@ -3,35 +3,30 @@ import time from model import * -from socket import gethostname from bamg import * #Simple mesh -md=bamg(model(),'domain','../Exp/Square.exp','hmax',100000.) -x1=md.mesh.x -y1=md.mesh.y +md = bamg(model(), 'domain', '../Exp/Square.exp', 'hmax', 100000.) +x1 = md.mesh.x +y1 = md.mesh.y #hVertices -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 +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 #big mesh -t0=time.time() -md=bamg(model(),'domain','../Exp/Square.exp','hmax',3000.) -nbelements=md.mesh.numberofelements -elapsedtime=time.time()-t0 -if nbelements>267895-50 and nbelements<267895+50: - nbewithinrange = 1. +t0 = time.time() +md = bamg(model(), 'domain', '../Exp/Square.exp', 'hmax', 3000.) +nbelements = md.mesh.numberofelements +elapsedtime = time.time() - t0 +if nbelements > 267895 - 50 and nbelements < 267895 + 50: + nbewithinrange = 1. else: - nbewithinrange = 0. + nbewithinrange = 0. #Fields and tolerances to track changes -field_names =['x1','y1','x2','y2','nbelements','elapsed time'] +field_names = ['x1', 'y1', 'x2', 'y2', 'nbelements', 'elapsed time'] # NOTE: Elapsed time tolerance has been increased to 7.0 for this test, but not the MATLBAB one -field_tolerances=[2e-9,2e-9,1e-13,1e-13,1e-13,7.0] -field_values=[\ - x1, y1,\ - x2, y2,\ - nbewithinrange,elapsedtime,\ - ] +field_tolerances = [2e-9, 2e-9, 1e-13, 1e-13, 1e-13, 7.0] +field_values = [x1, y1, x2, y2, nbewithinrange, elapsedtime] Index: /issm/trunk-jpl/test/NightlyRun/test120.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test120.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test120.py (revision 23793) @@ -10,22 +10,22 @@ -md=triangle(model(),'../Exp/Square.exp',180000) -md=setmask(md,'all','') -md=parameterize(md,'../Par/SquareShelfConstrained.py') -md.extrude(3,1.) -md=setflowequation(md,'SSA','all') -md.timestepping.time_step=0 -md.initialization.waterfraction=np.zeros(md.mesh.numberofvertices) -md.initialization.watercolumn=np.zeros(md.mesh.numberofvertices) +md = triangle(model(), '../Exp/Square.exp', 180000) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelfConstrained.py') +md.extrude(3, 1.) +md = setflowequation(md, 'SSA', 'all') +md.timestepping.time_step = 0 +md.initialization.waterfraction = np.zeros(md.mesh.numberofvertices) +md.initialization.watercolumn = np.zeros(md.mesh.numberofvertices) md.thermal.isenthalpy = 1 md.thermal.isdynamicbasalspc = 1 -md.cluster=generic('name',gethostname(),'np',3) -md=solve(md,'Thermal') +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'Thermal') #Fields and tolerances to track changes -field_names =['Enthalpy','Waterfraction','Temperature'] -field_tolerances=[1e-13,2e-10,1e-13] -field_values=[md.results.ThermalSolution.Enthalpy, - md.results.ThermalSolution.Waterfraction, - md.results.ThermalSolution.Temperature] +field_names = ['Enthalpy', 'Waterfraction', 'Temperature'] +field_tolerances = [1e-13, 2e-10, 1e-13] +field_values = [md.results.ThermalSolution.Enthalpy, + md.results.ThermalSolution.Waterfraction, + md.results.ThermalSolution.Temperature] Index: /issm/trunk-jpl/test/NightlyRun/test1201.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1201.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test1201.py (revision 23793) @@ -14,57 +14,57 @@ """ -printingflag=False -results=[] +printingflag = False +results = [] -for stabilization in range(1,4): - #The goal is to test the masstransport model - md=bamg(model(),'domain','../Exp/SquareEISMINT.exp','hmax',3000.) - md=setmask(md,'all','') - md=parameterize(md,'../Par/SquareEISMINT.py') - md.smb.mass_balance[:]=0. - md=setflowequation(md,'SSA','all') - md.cluster=generic('name',gethostname(),'np',8) +for stabilization in range(1, 4): + #The goal is to test the masstransport model + md = bamg(model(), 'domain', '../Exp/SquareEISMINT.exp', 'hmax', 3000.) + md = setmask(md, 'all', '') + md = parameterize(md, '../Par/SquareEISMINT.py') + md.smb.mass_balance[:] = 0. + md = setflowequation(md, 'SSA', 'all') + md.cluster = generic('name', gethostname(), 'np', 8) - print(" initial velocity") - md.initialization.vx=np.zeros((md.mesh.numberofvertices)) - md.initialization.vy=-400.*np.ones((md.mesh.numberofvertices)) + print(" initial velocity") + md.initialization.vx = np.zeros((md.mesh.numberofvertices)) + md.initialization.vy = -400. * np.ones((md.mesh.numberofvertices)) - #Stabilization - if stabilization==2: - md.masstransport.stabilization=0 - else: - md.masstransport.stabilization=stabilization + #Stabilization + if stabilization == 2: + md.masstransport.stabilization = 0 + else: + md.masstransport.stabilization = stabilization - #spc thickness - pos=np.where(md.mesh.y>199999.9)[0] - times=np.arange(0,501) - md.masstransport.spcthickness=np.nan*np.ones((md.mesh.numberofvertices+1,np.size(times))) - md.masstransport.spcthickness[-1,:]=times - md.masstransport.spcthickness[pos,:]=500.+100.*np.sin(2.*np.pi*times/200.) - if stabilization==3: - pos=np.nonzero(np.isnan(md.masstransport.spcthickness)) - md.masstransport.spcthickness[pos]=500. #No NaN for DG + #spc thickness + pos = np.where(md.mesh.y > 199999.9)[0] + times = np.arange(0, 501) + md.masstransport.spcthickness = np.nan * np.ones((md.mesh.numberofvertices + 1, np.size(times))) + md.masstransport.spcthickness[-1, :] = times + md.masstransport.spcthickness[pos, :] = 500. + 100. * np.sin(2. * np.pi * times / 200.) + if stabilization == 3: + pos = np.nonzero(np.isnan(md.masstransport.spcthickness)) + md.masstransport.spcthickness[pos] = 500. #No NaN for DG - #solve - md.transient.isstressbalance=False - md.settings.output_frequency=500 #keep only last step - md.verbose=verbose() - md=solve(md,'Transient') - results.append(md.results.TransientSolution[-1].Thickness) + #solve + md.transient.isstressbalance = False + md.settings.output_frequency = 500 #keep only last step + md.verbose = verbose() + md = solve(md, 'Transient') + results.append(md.results.TransientSolution[-1].Thickness) #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.) -#plot(s,h1,'r',s,h2,'b',s,h3,'g',s,hth,'k') -#legend('Art. diff.','No Art. diff.','D.G.','Theoretical') +#[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') if printingflag: - pass -# set(gcf,'Color','w') -# export_fig([issmdir() '/website/doc_pdf/validation/Images/EISMINT/IceShelf/eismintmasscthickness.pdf']) + pass +# set(gcf, 'Color', 'w') +# export_fig([issmdir() '/website/doc_pdf/validation/Images/EISMINT/IceShelf/eismintmasscthickness.pdf']) #Fields and tolerances to track changes -field_names =['ThicknessArtDiff','ThicknessNoArtDiff','ThicknessDG'] -field_tolerances=[1e-13, 1e-13, 1e-13] -field_values=[results[0],results[1],results[2]] +field_names = ['ThicknessArtDiff', 'ThicknessNoArtDiff', 'ThicknessDG'] +field_tolerances = [1e-13, 1e-13, 1e-13] +field_values = [results[0], results[1], results[2]] Index: /issm/trunk-jpl/test/NightlyRun/test1202.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1202.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test1202.py (revision 23793) @@ -1,4 +1,3 @@ #Test Name: EISMINTStress1 -import numpy as np from model import * from socket import gethostname @@ -14,39 +13,39 @@ """ -printingflag=False +printingflag = False #tests 3 and 4: using Glen's flow law -md=model() -md=triangle(md,'../Exp/SquareEISMINT.exp',3550.) -md=setmask(md,'all','') -md=parameterize(md,'../Par/SquareEISMINT.py') -md=setflowequation(md,'SSA','all') #SSA's model and 2d +md = model() +md = triangle(md, '../Exp/SquareEISMINT.exp', 3550.) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareEISMINT.py') +md = setflowequation(md, 'SSA', 'all') #SSA's model and 2d -#Compute solution for SSA's model -md.cluster=generic('name',gethostname(),'np',8) -md=solve(md,'Stressbalance') +#Compute solution for SSA's model +md.cluster = generic('name', gethostname(), 'np', 8) +md = solve(md, 'Stressbalance') #plot results -vx=md.results.StressbalanceSolution.Vx -vy=md.results.StressbalanceSolution.Vy +vx = md.results.StressbalanceSolution.Vx +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}, ... -# 'contourcolor','k') +#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: - pass -# set(gcf,'Color','w') -# printmodel('eismintdiag1vx','png','margin','on','marginsize',25,'frame','off','resolution',2,'hardcopy','off') -# system(['mv eismintdiag1vx.png ' ISSM_DIR '/website/doc_pdf/validation/Images/EISMINT/IceShelf ']) + pass +# set(gcf, 'Color', 'w') +# printmodel('eismintdiag1vx', 'png', 'margin', 'on', 'marginsize', 25, 'frame', 'off', 'resolution', 2, 'hardcopy', 'off') +# 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},... -# 'contourcolor','k') +#plotmodel(md, 'data', vy, 'contourlevels',{-100,-200,-300,-400,-500,-600,-700,-800,-900,-1000},... +# 'contourcolor', 'k') if printingflag: - pass -# set(gcf,'Color','w') -# printmodel('eismintdiag1vy','png','margin','on','marginsize',25,'frame','off','resolution',2,'hardcopy','off') -# system(['mv eismintdiag1vy.png ' ISSM_DIR '/website/doc_pdf/validation/Images/EISMINT/IceShelf ']) + pass +# set(gcf, 'Color', 'w') +# printmodel('eismintdiag1vy', 'png', 'margin', 'on', 'marginsize', 25, 'frame', 'off', 'resolution', 2, 'hardcopy', 'off') +# system(['mv eismintdiag1vy.png ' ISSM_DIR '/website/doc_pdf/validation/Images/EISMINT/IceShelf ']) #Fields and tolerances to track changes -field_names =['Vx','Vy'] -field_tolerances=[1e-13,1e-13] -field_values=[vx,vy] +field_names = ['Vx', 'Vy'] +field_tolerances = [1e-13, 1e-13] +field_values = [vx, vy] Index: /issm/trunk-jpl/test/NightlyRun/test1203.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1203.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test1203.py (revision 23793) @@ -15,44 +15,44 @@ """ -printingflag=False +printingflag = False -#test 5 and 6: -md=model() -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 +#test 5 and 6: +md = model() +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 -#Impose a non zero velocity on the upper boundary condition (y=max(y)) -pos=np.where(md.mesh.y==np.max(md.mesh.y)) -heavyside=np.where(np.logical_and(md.mesh.y==np.max(md.mesh.y),((1.+sys.float_info.epsilon)*np.ones((np.size(md.mesh.y)))-((md.mesh.x-100000.)/25000.)**2)>0)) -md.stressbalance.spcvy[pos]=np.zeros((np.size(pos))) -md.stressbalance.spcvy[heavyside]=400.*(((md.mesh.x[heavyside]-100000.)/25000.)**2-np.ones((np.size(heavyside)))) +#Impose a non zero velocity on the upper boundary condition (y = max(y)) +pos = np.where(md.mesh.y == np.max(md.mesh.y)) +heavyside = np.where(np.logical_and(md.mesh.y == np.max(md.mesh.y), ((1. + sys.float_info.epsilon) * np.ones((np.size(md.mesh.y))) - ((md.mesh.x - 100000.) / 25000.)**2) > 0)) +md.stressbalance.spcvy[pos] = np.zeros((np.size(pos))) +md.stressbalance.spcvy[heavyside] = 400. * (((md.mesh.x[heavyside] - 100000.) / 25000.)**2 - np.ones((np.size(heavyside)))) -#Compute solution for SSA's model -md.cluster=generic('name',gethostname(),'np',8) -md=solve(md,'Stressbalance') +#Compute solution for SSA's model +md.cluster = generic('name', gethostname(), 'np', 8) +md = solve(md, 'Stressbalance') -vx=md.results.StressbalanceSolution.Vx -vy=md.results.StressbalanceSolution.Vy +vx = md.results.StressbalanceSolution.Vx +vy = md.results.StressbalanceSolution.Vy #plot results -#plotmodel(md,'data',vx,'contourlevels',{0,20,40,60,80,100,-20,-40,-60,-80,-100},... -# 'contourcolor','k') +#plotmodel(md, 'data', vx, 'contourlevels',{0, 20, 40, 60, 80, 100,-20,-40,-60,-80,-100},... +# 'contourcolor', 'k') if printingflag: - pass -# set(gcf,'Color','w') -# 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},... -# 'contourcolor','k') + pass +# set(gcf, 'Color', 'w') +# 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},... +# 'contourcolor', 'k') if printingflag: - pass -# set(gcf,'Color','w') -# printmodel('eismintdiag2vy','png','margin','on','marginsize',25,'frame','off','resolution',2,'hardcopy','off') -# system(['mv eismintdiag2vy.png ' ISSM_DIR '/website/doc_pdf/validation/Images/EISMINT/IceShelf ']) + pass +# set(gcf, 'Color', 'w') +# printmodel('eismintdiag2vy', 'png', 'margin', 'on', 'marginsize', 25, 'frame', 'off', 'resolution', 2, 'hardcopy', 'off') +# system(['mv eismintdiag2vy.png ' ISSM_DIR '/website/doc_pdf/validation/Images/EISMINT/IceShelf ']) #Fields and tolerances to track changes -field_names =['Vx','Vy'] -field_tolerances=[1e-13,1e-13] -field_values=[vx,vy] +field_names = ['Vx', 'Vy'] +field_tolerances = [1e-13, 1e-13] +field_values = [vx, vy] Index: /issm/trunk-jpl/test/NightlyRun/test1204.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1204.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test1204.py (revision 23793) @@ -15,57 +15,57 @@ """ -printingflag=False +printingflag = False #tests 3 and 4: using Glen's flow law -md=model() -md=triangle(md,'../Exp/SquareEISMINT.exp',3550.) -md=setmask(md,'all','') -md=parameterize(md,'../Par/SquareEISMINT.py') -md=setflowequation(md,'SSA','all') #SSA's model and 2d +md = model() +md = triangle(md, '../Exp/SquareEISMINT.exp', 3550.) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareEISMINT.py') +md = setflowequation(md, 'SSA', 'all') #SSA's model and 2d -#Impose a non zero velocity on the upper boundary condition (y=max(y)) -pos=np.where(md.mesh.y==np.max(md.mesh.y)) -heavyside=np.where(np.logical_and(md.mesh.y==np.max(md.mesh.y),((1.+sys.float_info.epsilon)*np.ones((np.size(md.mesh.y)))-((md.mesh.x-100000.)/25000.)**2)>0)) -md.stressbalance.spcvy[pos]=np.zeros((np.size(pos))) -md.stressbalance.spcvy[heavyside]=400.*(((md.mesh.x[heavyside]-100000.)/25000.)**2-np.ones((np.size(heavyside)))) +#Impose a non zero velocity on the upper boundary condition (y = max(y)) +pos = np.where(md.mesh.y == np.max(md.mesh.y)) +heavyside = np.where(np.logical_and(md.mesh.y == np.max(md.mesh.y), ((1. + sys.float_info.epsilon) * np.ones((np.size(md.mesh.y))) - ((md.mesh.x - 100000.) / 25000.)**2) > 0)) +md.stressbalance.spcvy[pos] = np.zeros((np.size(pos))) +md.stressbalance.spcvy[heavyside] = 400. * (((md.mesh.x[heavyside] - 100000.) / 25000.)**2 - np.ones((np.size(heavyside)))) -#Compute solution for SSA's model -md.cluster=generic('name',gethostname(),'np',8) -md=solve(md,'Stressbalance') +#Compute solution for SSA's model +md.cluster = generic('name', gethostname(), 'np', 8) +md = solve(md, 'Stressbalance') #plot results -md.initialization.vx=md.results.StressbalanceSolution.Vx -md.initialization.vy=md.results.StressbalanceSolution.Vy +md.initialization.vx = md.results.StressbalanceSolution.Vx +md.initialization.vy = md.results.StressbalanceSolution.Vy -md.timestepping.time_step=1. -md.timestepping.final_time=5000. -md.masstransport.stabilization=1 -md=solve(md,'Transient') +md.timestepping.time_step = 1. +md.timestepping.final_time = 5000. +md.masstransport.stabilization = 1 +md = solve(md, 'Transient') -#plotmodel(md,'data',(md.results.TransientSolution(end).Vx)) +#plotmodel(md, 'data',(md.results.TransientSolution(end).Vx)) if printingflag: - pass -# set(gcf,'Color','w') -# printmodel('eisminttrans2vx','png','margin','on','marginsize',25,'frame','off','resolution',2,'hardcopy','off') -# system(['mv eisminttrans2vx.png ' ISSM_DIR '/website/doc_pdf/validation/Images/EISMINT/IceShelf ']) + pass +# set(gcf, 'Color', 'w') +# printmodel('eisminttrans2vx', 'png', 'margin', 'on', 'marginsize', 25, 'frame', 'off', 'resolution', 2, 'hardcopy', 'off') +# 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 -# set(gcf,'Color','w') -# printmodel('eisminttrans2vy','png','margin','on','marginsize',25,'frame','off','resolution',2,'hardcopy','off') -# system(['mv eisminttrans2vy.png ' ISSM_DIR '/website/doc_pdf/validation/Images/EISMINT/IceShelf ']) + pass +# set(gcf, 'Color', 'w') +# printmodel('eisminttrans2vy', 'png', 'margin', 'on', 'marginsize', 25, 'frame', 'off', 'resolution', 2, 'hardcopy', 'off') +# 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 -# set(gcf,'Color','w') -# printmodel('eisminttrans2thickness','png','margin','on','marginsize',25,'frame','off','resolution',2,'hardcopy','off') -# system(['mv eisminttrans2thickness.png ' ISSM_DIR '/website/doc_pdf/validation/Images/EISMINT/IceShelf ']) + pass +# set(gcf, 'Color', 'w') +# printmodel('eisminttrans2thickness', 'png', 'margin', 'on', 'marginsize', 25, 'frame', 'off', 'resolution', 2, 'hardcopy', 'off') +# system(['mv eisminttrans2thickness.png ' ISSM_DIR '/website/doc_pdf/validation/Images/EISMINT/IceShelf ']) #Fields and tolerances to track changes -field_names =['Vx','Vy','Thickness'] -field_tolerances=[1e-13,1e-13,1e-13] -field_values=[md.results.TransientSolution[-1].Vx, - md.results.TransientSolution[-1].Vy, - md.results.TransientSolution[-1].Thickness] +field_names = ['Vx', 'Vy', 'Thickness'] +field_tolerances = [1e-13, 1e-13, 1e-13] +field_values = [md.results.TransientSolution[-1].Vx, + md.results.TransientSolution[-1].Vy, + md.results.TransientSolution[-1].Thickness] Index: /issm/trunk-jpl/test/NightlyRun/test1205.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1205.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test1205.py (revision 23793) @@ -14,89 +14,89 @@ """ -printingflag=False +printingflag = False -numlayers=10 -resolution=30000. +numlayers = 10 +resolution = 30000. #To begin with the numerical model -md=model() -md=roundmesh(md,750000.,resolution) -md=setmask(md,'','') #We can not test iceshelves nor ice rises with this analytical solution -md=parameterize(md,'../Par/RoundSheetStaticEISMINT.py') +md = model() +md = roundmesh(md, 750000., resolution) +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 -vel_obs=np.sqrt((md.inversion.vx_obs)**2+(md.inversion.vy_obs)**2) +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 +vel_obs = np.sqrt((md.inversion.vx_obs)**2 + (md.inversion.vy_obs)**2) #We extrude the model to have a 3d model -md.extrude(numlayers,1.) -md=setflowequation(md,'SIA','all') +md.extrude(numlayers, 1.) +md = setflowequation(md, 'SIA', 'all') #Spc the nodes on the bed -pos=np.where(md.mesh.vertexonbase) -md.stressbalance.spcvx[pos]=0. -md.stressbalance.spcvy[pos]=0. -md.stressbalance.spcvz[pos]=0. +pos = np.where(md.mesh.vertexonbase) +md.stressbalance.spcvx[pos] = 0. +md.stressbalance.spcvy[pos] = 0. +md.stressbalance.spcvz[pos] = 0. -#Now we can solve the problem -md.cluster=generic('name',gethostname(),'np',8) -md=solve(md,'Stressbalance') +#Now we can solve the problem +md.cluster = generic('name', gethostname(), 'np', 8) +md = solve(md, 'Stressbalance') #Calculate the depth averaged velocity field (2d): -vx=md.results.StressbalanceSolution.Vx -vy=md.results.StressbalanceSolution.Vy -vel=np.zeros((md.mesh.numberofvertices2d)) +vx = md.results.StressbalanceSolution.Vx +vy = md.results.StressbalanceSolution.Vy +vel = np.zeros((md.mesh.numberofvertices2d)) -for i in range(0,md.mesh.numberofvertices2d): - node_vel=0. - for j in range(0,md.mesh.numberoflayers-1): - node_vel=node_vel+1./(2.*(md.mesh.numberoflayers-1))*(np.sqrt(vx[i+(j+1)*md.mesh.numberofvertices2d,0]**2+vy[i+(j+1)*md.mesh.numberofvertices2d,0]**2)+np.sqrt(vx[i+j*md.mesh.numberofvertices2d,0]**2+vy[i+j*md.mesh.numberofvertices2d,0]**2)) - vel[i]=node_vel +for i in range(0, md.mesh.numberofvertices2d): + node_vel = 0. + for j in range(0, md.mesh.numberoflayers - 1): + node_vel = node_vel + 1. / (2. * (md.mesh.numberoflayers - 1)) * (np.sqrt(vx[i + (j + 1) * md.mesh.numberofvertices2d, 0]**2 + vy[i + (j + 1) * md.mesh.numberofvertices2d, 0]**2) + np.sqrt(vx[i + j * md.mesh.numberofvertices2d, 0]**2 + vy[i + j * md.mesh.numberofvertices2d, 0]**2)) + vel[i] = node_vel #Plot of the velocity from the exact and calculated solutions #figure(1) -#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',... -#vel,'FaceColor','interp','EdgeColor','none') -#title('Modelled velocity','FontSize',14,'FontWeight','bold') -#colorbar -#caxis([0 200]) - -#subplot(2,2,2) -#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') -#colorbar +#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',... +#vel, 'FaceColor', 'interp', 'EdgeColor', 'none') +#title('Modelled velocity', 'FontSize', 14, 'FontWeight', 'bold') +#colorbar #caxis([0 200]) -#subplot(2,2,3) +#subplot(2, 2, 2) +#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') +#colorbar +#caxis([0 200]) + +#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.') -#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') -#legend('calculated velocity','exact velocity') +#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') +#legend('calculated velocity', 'exact velocity') #axis([0 750000 0 200]) #hold off -#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') -#title('Relative misfit [%]','FontSize',14,'FontWeight','bold') +#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') +#title('Relative misfit [%]', 'FontSize', 14, 'FontWeight', 'bold') #colorbar #caxis([0 100]) if printingflag: - pass -# set(gcf,'Color','w') -# printmodel('SIAstatic','png','margin','on','marginsize',25,'frame','off','resolution',0.7,'hardcopy','off') -# system(['mv SIAstatic.png ' ISSM_DIR '/website/doc_pdf/validation/Images/EISMINT/IceSheet']) + pass +# set(gcf, 'Color', 'w') +# printmodel('SIAstatic', 'png', 'margin', 'on', 'marginsize', 25, 'frame', 'off', 'resolution', 0.7, 'hardcopy', 'off') +# system(['mv SIAstatic.png ' ISSM_DIR '/website/doc_pdf/validation/Images/EISMINT/IceSheet']) #Fields and tolerances to track changes -field_names =['Vx','Vy','Vel'] -field_tolerances=[1e-13,1e-13,1e-13] -field_values=[vx,vy,vel] +field_names = ['Vx', 'Vy', 'Vel'] +field_tolerances = [1e-13, 1e-13, 1e-13] +field_values = [vx, vy, vel] Index: /issm/trunk-jpl/test/NightlyRun/test1206.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1206.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test1206.py (revision 23793) @@ -14,90 +14,88 @@ """ -printingflag=False +printingflag = False -numlayers=10 -resolution=30000. +numlayers = 10 +resolution = 30000. #To begin with the numerical model -md=model() -md=roundmesh(md,750000.,resolution) -md=setmask(md,'','') #We can not test iceshelves nor ice rises with this analytical solution -md=parameterize(md,'../Par/RoundSheetStaticEISMINT.py') +md = model() +md = roundmesh(md, 750000., resolution) +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 -vel_obs=np.sqrt((md.inversion.vx_obs)**2+(md.inversion.vy_obs)**2) +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 +vel_obs = np.sqrt((md.inversion.vx_obs)**2 + (md.inversion.vy_obs)**2) #We extrude the model to have a 3d model -md.extrude(numlayers,1.) -md=setflowequation(md,'HO','all') +md.extrude(numlayers, 1.) +md = setflowequation(md, 'HO', 'all') #Spc the nodes on the bed -pos=np.where(md.mesh.vertexonbase) -md.stressbalance.spcvx[pos]=0. -md.stressbalance.spcvy[pos]=0. -md.stressbalance.spcvz[pos]=0. +pos = np.where(md.mesh.vertexonbase) +md.stressbalance.spcvx[pos] = 0. +md.stressbalance.spcvy[pos] = 0. +md.stressbalance.spcvz[pos] = 0. -#Now we can solve the problem -md.cluster=generic('name',gethostname(),'np',8) -md=solve(md,'Stressbalance') +#Now we can solve the problem +md.cluster = generic('name', gethostname(), 'np', 8) +md = solve(md, 'Stressbalance') #Calculate the depth averaged velocity field (2d): -vx=md.results.StressbalanceSolution.Vx -vy=md.results.StressbalanceSolution.Vy -vel=np.zeros((md.mesh.numberofvertices2d)) +vx = md.results.StressbalanceSolution.Vx +vy = md.results.StressbalanceSolution.Vy +vel = np.zeros((md.mesh.numberofvertices2d)) -for i in range(0,md.mesh.numberofvertices2d): - node_vel=0. - for j in range(0,md.mesh.numberoflayers-1): - node_vel=node_vel+1./(2.*(md.mesh.numberoflayers-1))*\ - (np.sqrt(vx[i+(j+1)*md.mesh.numberofvertices2d,0]**2+vy[i+(j+1)*md.mesh.numberofvertices2d,0]**2)+\ - np.sqrt(vx[i+j*md.mesh.numberofvertices2d,0]**2+vy[i+j*md.mesh.numberofvertices2d,0]**2)) - vel[i]=node_vel +for i in range(0, md.mesh.numberofvertices2d): + node_vel = 0. + for j in range(0, md.mesh.numberoflayers - 1): + node_vel = node_vel + 1. / (2. * (md.mesh.numberoflayers - 1)) * (np.sqrt(vx[i + (j + 1) * md.mesh.numberofvertices2d, 0]**2 + vy[i + (j + 1) * md.mesh.numberofvertices2d, 0]**2) + np.sqrt(vx[i + j * md.mesh.numberofvertices2d, 0]**2 + vy[i + j * md.mesh.numberofvertices2d, 0]**2)) + vel[i] = node_vel #Plot of the velocity from the exact and calculated solutions #figure(1) -#subplot(2,2,1) -#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') -#colorbar -#caxis([0 200]) - -#subplot(2,2,2) -#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') -#colorbar +#subplot(2, 2, 1) +#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') +#colorbar #caxis([0 200]) -#subplot(2,2,3) +#subplot(2, 2, 2) +#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') +#colorbar +#caxis([0 200]) + +#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.') -#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') -#legend('calculated velocity','exact velocity') +#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') +#legend('calculated velocity', 'exact velocity') #axis([0 750000 0 200]) #hold off -#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') -#title('Relative misfit [%]','FontSize',14,'FontWeight','bold') +#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') +#title('Relative misfit [%]', 'FontSize', 14, 'FontWeight', 'bold') #colorbar #caxis([0 100]) if printingflag: - pass -# set(gcf,'Color','w') -# printmodel('HOstatic','png','margin','on','marginsize',25,'frame','off','resolution',0.7,'hardcopy','off') -# system(['mv HOstatic.png ' ISSM_DIR '/website/doc_pdf/validation/Images/EISMINT/IceSheet']) + pass +# set(gcf, 'Color', 'w') +# printmodel('HOstatic', 'png', 'margin', 'on', 'marginsize', 25, 'frame', 'off', 'resolution', 0.7, 'hardcopy', 'off') +# system(['mv HOstatic.png ' ISSM_DIR '/website/doc_pdf/validation/Images/EISMINT/IceSheet']) #Fields and tolerances to track changes -field_names =['Vx','Vy','Vel'] -field_tolerances=[1e-12,1e-12,1e-12] -field_values=[vx,vy,vel] +field_names = ['Vx', 'Vy', 'Vel'] +field_tolerances = [1e-12, 1e-12, 1e-12] +field_values = [vx, vy, vel] Index: /issm/trunk-jpl/test/NightlyRun/test1207.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1207.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test1207.py (revision 23793) @@ -14,90 +14,88 @@ """ -printingflag=False +printingflag = False -numlayers=10 -resolution=30000. +numlayers = 10 +resolution = 30000. #To begin with the numerical model -md=model() -md=roundmesh(md,750000.,resolution) -md=setmask(md,'','') #We can not test iceshelves nor ice rises with this analytical solution -md=parameterize(md,'../Par/RoundSheetStaticEISMINT.py') +md = model() +md = roundmesh(md, 750000., resolution) +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 -vel_obs=np.sqrt((md.inversion.vx_obs)**2+(md.inversion.vy_obs)**2) +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 +vel_obs = np.sqrt((md.inversion.vx_obs)**2 + (md.inversion.vy_obs)**2) #We extrude the model to have a 3d model -md.extrude(numlayers,1.) -md=setflowequation(md,'FS','all') +md.extrude(numlayers, 1.) +md = setflowequation(md, 'FS', 'all') #Spc the nodes on the bed -pos=np.where(md.mesh.vertexonbase) -md.stressbalance.spcvx[pos]=0. -md.stressbalance.spcvy[pos]=0. -md.stressbalance.spcvz[pos]=0. +pos = np.where(md.mesh.vertexonbase) +md.stressbalance.spcvx[pos] = 0. +md.stressbalance.spcvy[pos] = 0. +md.stressbalance.spcvz[pos] = 0. -#Now we can solve the problem -md.cluster=generic('name',gethostname(),'np',8) -md=solve(md,'Stressbalance') +#Now we can solve the problem +md.cluster = generic('name', gethostname(), 'np', 8) +md = solve(md, 'Stressbalance') #Calculate the depth averaged velocity field (2d): -vx=md.results.StressbalanceSolution.Vx -vy=md.results.StressbalanceSolution.Vy -vel=np.zeros((md.mesh.numberofvertices2d)) +vx = md.results.StressbalanceSolution.Vx +vy = md.results.StressbalanceSolution.Vy +vel = np.zeros((md.mesh.numberofvertices2d)) -for i in range(0,md.mesh.numberofvertices2d): - node_vel=0. - for j in range(0,md.mesh.numberoflayers-1): - node_vel=node_vel+1./(2.*(md.mesh.numberoflayers-1))*\ - (np.sqrt(vx[i+(j+1)*md.mesh.numberofvertices2d,0]**2+vy[i+(j+1)*md.mesh.numberofvertices2d,0]**2)+\ - np.sqrt(vx[i+j*md.mesh.numberofvertices2d,0]**2+vy[i+j*md.mesh.numberofvertices2d,0]**2)) - vel[i]=node_vel +for i in range(0, md.mesh.numberofvertices2d): + node_vel = 0. + for j in range(0, md.mesh.numberoflayers - 1): + node_vel = node_vel + (1. / (2. * (md.mesh.numberoflayers - 1)) * (np.sqrt(vx[i + (j + 1) * md.mesh.numberofvertices2d, 0]**2 + vy[i + (j + 1) * md.mesh.numberofvertices2d, 0]**2) + np.sqrt(vx[i + j * md.mesh.numberofvertices2d, 0]**2 + vy[i + j * md.mesh.numberofvertices2d, 0]**2))) + vel[i] = node_vel #Plot of the velocity from the exact and calculated solutions #figure(1) -#subplot(2,2,1) -#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') -#colorbar -#caxis([0 200]) - -#subplot(2,2,2) -#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') -#colorbar +#subplot(2, 2, 1) +#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') +#colorbar #caxis([0 200]) -#subplot(2,2,3) +#subplot(2, 2, 2) +#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') +#colorbar +#caxis([0 200]) + +#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.') -#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') -#legend('calculated velocity','exact velocity') +#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') +#legend('calculated velocity', 'exact velocity') #axis([0 750000 0 200]) #hold off -#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') -#title('Relative misfit [%]','FontSize',14,'FontWeight','bold') +#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') +#title('Relative misfit [%]', 'FontSize', 14, 'FontWeight', 'bold') #colorbar #caxis([0 100]) if printingflag: - pass -# set(gcf,'Color','w') -# printmodel('FSstatic','png','margin','on','marginsize',25,'frame','off','resolution',0.7,'hardcopy','off') -# system(['mv FSstatic.png ' ISSM_DIR '/website/doc_pdf/validation/Images/EISMINT/IceSheet']) + pass +# set(gcf, 'Color', 'w') +# printmodel('FSstatic', 'png', 'margin', 'on', 'marginsize', 25, 'frame', 'off', 'resolution', 0.7, 'hardcopy', 'off') +# system(['mv FSstatic.png ' ISSM_DIR '/website/doc_pdf/validation/Images/EISMINT/IceSheet']) #Fields and tolerances to track changes -field_names =['Vx','Vy','Vel'] -field_tolerances=[1e-12,1e-12,1e-12] -field_values=[vx,vy,vel] +field_names = ['Vx', 'Vy', 'Vel'] +field_tolerances = [1e-12, 1e-12, 1e-12] +field_values = [vx, vy, vel] Index: /issm/trunk-jpl/test/NightlyRun/test1208.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1208.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test1208.py (revision 23793) @@ -14,44 +14,44 @@ """ -numlayers=8 -resolution=50000. +numlayers = 8 +resolution = 50000. #To begin with the numerical model -md=triangle(model(),'../Exp/SquareEISMINT750000.exp',resolution) -md=setmask(md,'','') -md=parameterize(md,'../Par/RoundSheetEISMINT.py') +md = triangle(model(), '../Exp/SquareEISMINT750000.exp', resolution) +md = setmask(md, '', '') +md = parameterize(md, '../Par/RoundSheetEISMINT.py') #We extrude the model to have a 3d model -md.extrude(numlayers,1.) -md=setflowequation(md,'SIA','all') +md.extrude(numlayers, 1.) +md = setflowequation(md, 'SIA', 'all') #Spc the nodes on the bed -pos=np.where(md.mesh.vertexonbase) -md.stressbalance.spcvx[pos]=0. -md.stressbalance.spcvy[pos]=0. -md.stressbalance.spcvz[pos]=0. +pos = np.where(md.mesh.vertexonbase) +md.stressbalance.spcvx[pos] = 0. +md.stressbalance.spcvy[pos] = 0. +md.stressbalance.spcvz[pos] = 0. #Adapt the time steps to the resolution -md.timestepping.time_step=15. -md.settings.output_frequency=500 -md.timestepping.final_time=30000. -md.masstransport.stabilization=1 -md.thermal.stabilization=1 +md.timestepping.time_step = 15. +md.settings.output_frequency = 500 +md.timestepping.final_time = 30000. +md.masstransport.stabilization = 1 +md.thermal.stabilization = 1 -#Now we can solve the problem -md.cluster=generic('name',gethostname(),'np',8) -md=solve(md,'Transient') +#Now we can solve the problem +md.cluster = generic('name', gethostname(), 'np', 8) +md = solve(md, 'Transient') #Fields and tolerances to track changes -field_names =['Vx','Vy','Vz','Vel','Pressure','Thickness','Base','Surface','Temperature','BasalforcingsGroundediceMeltingRate'] -field_tolerances=[1e-08,1e-08,1e-07,1e-08,1e-08,1e-08,1e-08,1e-08,1e-07,1e-07] -field_values=[md.results.TransientSolution[-1].Vx, - md.results.TransientSolution[-1].Vy, - md.results.TransientSolution[-1].Vz, - md.results.TransientSolution[-1].Vel, - md.results.TransientSolution[-1].Pressure, - md.results.TransientSolution[-1].Thickness, - md.results.TransientSolution[-1].Base, - md.results.TransientSolution[-1].Surface, - md.results.TransientSolution[-1].Temperature, - md.results.TransientSolution[-1].BasalforcingsGroundediceMeltingRate] +field_names = ['Vx', 'Vy', 'Vz', 'Vel', 'Pressure', 'Thickness', 'Base', 'Surface', 'Temperature', 'BasalforcingsGroundediceMeltingRate'] +field_tolerances = [1e-08, 1e-08, 1e-07, 1e-08, 1e-08, 1e-08, 1e-08, 1e-08, 1e-07, 1e-07] +field_values = [md.results.TransientSolution[-1].Vx, + md.results.TransientSolution[-1].Vy, + md.results.TransientSolution[-1].Vz, + md.results.TransientSolution[-1].Vel, + md.results.TransientSolution[-1].Pressure, + md.results.TransientSolution[-1].Thickness, + md.results.TransientSolution[-1].Base, + md.results.TransientSolution[-1].Surface, + md.results.TransientSolution[-1].Temperature, + md.results.TransientSolution[-1].BasalforcingsGroundediceMeltingRate] Index: /issm/trunk-jpl/test/NightlyRun/test121.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test121.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test121.py (revision 23793) @@ -9,35 +9,33 @@ -md=triangle(model(),'../Exp/Square.exp',180000) -md=setmask(md,'all','') -md=parameterize(md,'../Par/SquareShelfConstrained.py') -md.extrude(3,1.) -md=setflowequation(md,'SSA','all') -md.cluster=generic('name',gethostname(),'np',3) -md.initialization.waterfraction=np.zeros((md.mesh.numberofvertices)) -md.initialization.watercolumn=np.zeros((md.mesh.numberofvertices)) -md.transient.isstressbalance=False -md.transient.ismasstransport=False -md.transient.issmb=True -md.transient.isthermal=True -md.transient.isgroundingline=False -md.thermal.isenthalpy=1 -md.thermal.isdynamicbasalspc=1 -md=solve(md,'Transient') +md = triangle(model(), '../Exp/Square.exp', 180000) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelfConstrained.py') +md.extrude(3, 1.) +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) +md.initialization.waterfraction = np.zeros((md.mesh.numberofvertices)) +md.initialization.watercolumn = np.zeros((md.mesh.numberofvertices)) +md.transient.isstressbalance = False +md.transient.ismasstransport = False +md.transient.issmb = True +md.transient.isthermal = True +md.transient.isgroundingline = False +md.thermal.isenthalpy = 1 +md.thermal.isdynamicbasalspc = 1 +md = solve(md, 'Transient') #Fields and tolerances to track changes -field_names =['Enthalpy1','Waterfraction1','Temperature1',\ - 'Enthalpy2','Waterfraction2','Temperature2',\ - 'Enthalpy3','Waterfraction3','Temperature3'] -field_tolerances=[1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-9,1e-13] -field_values=[\ - md.results.TransientSolution[0].Enthalpy,\ - md.results.TransientSolution[0].Waterfraction,\ - md.results.TransientSolution[0].Temperature,\ - md.results.TransientSolution[1].Enthalpy,\ - md.results.TransientSolution[1].Waterfraction,\ - md.results.TransientSolution[1].Temperature,\ - md.results.TransientSolution[2].Enthalpy,\ - md.results.TransientSolution[2].Waterfraction,\ - md.results.TransientSolution[2].Temperature,\ - ] +field_names = ['Enthalpy1', 'Waterfraction1', 'Temperature1', + 'Enthalpy2', 'Waterfraction2', 'Temperature2', + 'Enthalpy3', 'Waterfraction3', 'Temperature3'] +field_tolerances = [1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-9, 1e-13] +field_values = [md.results.TransientSolution[0].Enthalpy, + md.results.TransientSolution[0].Waterfraction, + md.results.TransientSolution[0].Temperature, + md.results.TransientSolution[1].Enthalpy, + md.results.TransientSolution[1].Waterfraction, + md.results.TransientSolution[1].Temperature, + md.results.TransientSolution[2].Enthalpy, + md.results.TransientSolution[2].Waterfraction, + md.results.TransientSolution[2].Temperature] Index: /issm/trunk-jpl/test/NightlyRun/test122.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test122.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test122.py (revision 23793) @@ -9,58 +9,55 @@ -md=triangle(model(),'../Exp/Square.exp',200000) -md=setmask(md,'all','') -md=parameterize(md,'../Par/SquareShelfConstrained.py') -md.extrude(3,1.) -md=setflowequation(md,'HO','all') -md.initialization.waterfraction=np.zeros((md.mesh.numberofvertices)) -md.initialization.watercolumn=np.zeros((md.mesh.numberofvertices)) -md.thermal.isenthalpy=1 -md.thermal.isdynamicbasalspc=1 -md.thermal.stabilization=2 -md.cluster=generic('name',gethostname(),'np',3) -md=solve(md,'Transient') +md = triangle(model(), '../Exp/Square.exp', 200000) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelfConstrained.py') +md.extrude(3, 1.) +md = setflowequation(md, 'HO', 'all') +md.initialization.waterfraction = np.zeros((md.mesh.numberofvertices)) +md.initialization.watercolumn = np.zeros((md.mesh.numberofvertices)) +md.thermal.isenthalpy = 1 +md.thermal.isdynamicbasalspc = 1 +md.thermal.stabilization = 2 +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'Transient') #Fields and tolerances to track changes -field_names =['Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','Enthalpy1','Waterfraction1',\ - 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','Enthalpy2','Waterfraction2',\ - 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','Enthalpy3','Waterfraction3'] -field_tolerances=[\ - 1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,\ - 1e-09,1e-09,1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,\ - 1e-09,1e-09,1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09] -field_values=[\ - md.results.TransientSolution[0].Vx,\ - md.results.TransientSolution[0].Vy,\ - md.results.TransientSolution[0].Vz,\ - md.results.TransientSolution[0].Vel,\ - md.results.TransientSolution[0].Pressure,\ - md.results.TransientSolution[0].Base,\ - md.results.TransientSolution[0].Surface,\ - md.results.TransientSolution[0].Thickness,\ - md.results.TransientSolution[0].Temperature,\ - md.results.TransientSolution[0].Enthalpy,\ - md.results.TransientSolution[0].Waterfraction,\ - md.results.TransientSolution[1].Vx,\ - md.results.TransientSolution[1].Vy,\ - md.results.TransientSolution[1].Vz,\ - md.results.TransientSolution[1].Vel,\ - md.results.TransientSolution[1].Pressure,\ - md.results.TransientSolution[1].Base,\ - md.results.TransientSolution[1].Surface,\ - md.results.TransientSolution[1].Thickness,\ - md.results.TransientSolution[1].Temperature,\ - md.results.TransientSolution[1].Enthalpy,\ - md.results.TransientSolution[1].Waterfraction,\ - md.results.TransientSolution[2].Vx,\ - md.results.TransientSolution[2].Vy,\ - md.results.TransientSolution[2].Vz,\ - md.results.TransientSolution[2].Vel,\ - md.results.TransientSolution[2].Pressure,\ - md.results.TransientSolution[2].Base,\ - md.results.TransientSolution[2].Surface,\ - md.results.TransientSolution[2].Thickness,\ - md.results.TransientSolution[2].Temperature,\ - md.results.TransientSolution[2].Enthalpy,\ - md.results.TransientSolution[2].Waterfraction,\ - ] +field_names = ['Vx1', 'Vy1', 'Vz1', 'Vel1', 'Pressure1', 'Bed1', 'Surface1', 'Thickness1', 'Temperature1', 'Enthalpy1', 'Waterfraction1', + 'Vx2', 'Vy2', 'Vz2', 'Vel2', 'Pressure2', 'Bed2', 'Surface2', 'Thickness2', 'Temperature2', 'Enthalpy2', 'Waterfraction2', + 'Vx3', 'Vy3', 'Vz3', 'Vel3', 'Pressure3', 'Bed3', 'Surface3', 'Thickness3', 'Temperature3', 'Enthalpy3', 'Waterfraction3'] +field_tolerances = [1e-09, 1e-09, 1e-09, 1e-09, 1e-09, 1e-09, 1e-09, 1e-09, 1e-09, 1e-09, 1e-09, + 1e-09, 1e-09, 1e-08, 1e-09, 1e-09, 1e-09, 1e-09, 1e-09, 1e-09, 1e-09, 1e-09, + 1e-09, 1e-09, 1e-08, 1e-09, 1e-09, 1e-09, 1e-09, 1e-09, 1e-09, 1e-09, 1e-09] +field_values = [md.results.TransientSolution[0].Vx, + md.results.TransientSolution[0].Vy, + md.results.TransientSolution[0].Vz, + md.results.TransientSolution[0].Vel, + md.results.TransientSolution[0].Pressure, + md.results.TransientSolution[0].Base, + md.results.TransientSolution[0].Surface, + md.results.TransientSolution[0].Thickness, + md.results.TransientSolution[0].Temperature, + md.results.TransientSolution[0].Enthalpy, + md.results.TransientSolution[0].Waterfraction, + md.results.TransientSolution[1].Vx, + md.results.TransientSolution[1].Vy, + md.results.TransientSolution[1].Vz, + md.results.TransientSolution[1].Vel, + md.results.TransientSolution[1].Pressure, + md.results.TransientSolution[1].Base, + md.results.TransientSolution[1].Surface, + md.results.TransientSolution[1].Thickness, + md.results.TransientSolution[1].Temperature, + md.results.TransientSolution[1].Enthalpy, + md.results.TransientSolution[1].Waterfraction, + md.results.TransientSolution[2].Vx, + md.results.TransientSolution[2].Vy, + md.results.TransientSolution[2].Vz, + md.results.TransientSolution[2].Vel, + md.results.TransientSolution[2].Pressure, + md.results.TransientSolution[2].Base, + md.results.TransientSolution[2].Surface, + md.results.TransientSolution[2].Thickness, + md.results.TransientSolution[2].Temperature, + md.results.TransientSolution[2].Enthalpy, + md.results.TransientSolution[2].Waterfraction] Index: /issm/trunk-jpl/test/NightlyRun/test123.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test123.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test123.py (revision 23793) @@ -10,34 +10,30 @@ -md=triangle(model(),'../Exp/Square.exp',180000) -md=setmask(md,'all','') -md=parameterize(md,'../Par/SquareShelfConstrained.py') -md=setflowequation(md,'SSA','all') -md.cluster=generic('name',gethostname(),'np',3) +md = triangle(model(), '../Exp/Square.exp', 180000) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelfConstrained.py') +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) -fake_surface = np.vstack((np.append(np.array(md.geometry.surface)+100,1.1), - np.append(np.array(md.geometry.surface)+200,2.1), - np.append(np.array(md.geometry.surface)+300,2.5))).T +fake_surface = np.vstack((np.append(np.array(md.geometry.surface) + 100, 1.1), + np.append(np.array(md.geometry.surface) + 200, 2.1), + np.append(np.array(md.geometry.surface) + 300, 2.5))).T -md.transient.requested_outputs = ['default','SurfaceMisfit'] -md.outputdefinition.definitions = [misfit( - name='SurfaceMisfit', - definitionstring='Outputdefinition1', - model_string='Surface', - observation=fake_surface, - observation_string='SurfaceObservation', - timeinterpolation='nearestneighbor', - weights=np.ones((md.mesh.numberofvertices,1)), - weights_string='WeightsSurfaceObservation' - )] +md.transient.requested_outputs = ['default', 'SurfaceMisfit'] +md.outputdefinition.definitions = [misfit(name='SurfaceMisfit', + definitionstring='Outputdefinition1', + model_string='Surface', + observation=fake_surface, + observation_string='SurfaceObservation', + timeinterpolation='nearestneighbor', + weights=np.ones((md.mesh.numberofvertices, 1)), + weights_string='WeightsSurfaceObservation')] -md=solve(md,'Transient') +md = solve(md, 'Transient') #Fields and tolerances to track changes -field_names = ['SurfaceMisfitFirstStep','SurfaceMisfitSecondStep','SurfaceMisfitThirdStep'] -field_tolerances = [1e-13,1e-13,1e-13] -field_values = [ - md.results.TransientSolution[0].SurfaceMisfit, - md.results.TransientSolution[1].SurfaceMisfit, - md.results.TransientSolution[2].SurfaceMisfit - ] +field_names = ['SurfaceMisfitFirstStep', 'SurfaceMisfitSecondStep', 'SurfaceMisfitThirdStep'] +field_tolerances = [1e-13, 1e-13, 1e-13] +field_values = [md.results.TransientSolution[0].SurfaceMisfit, + md.results.TransientSolution[1].SurfaceMisfit, + md.results.TransientSolution[2].SurfaceMisfit] Index: /issm/trunk-jpl/test/NightlyRun/test124.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test124.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test124.py (revision 23793) @@ -8,9 +8,9 @@ from solve import * -md=triangle(model(),'../Exp/Square.exp',150000) -md=setmask(md,'all','') -md=parameterize(md,'../Par/SquareShelfConstrained.py') -md.extrude(3,1) -md=setflowequation(md,'FS','all') +md = triangle(model(), '../Exp/Square.exp', 150000) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelfConstrained.py') +md.extrude(3, 1) +md = setflowequation(md, 'FS', 'all') #Free surface @@ -20,37 +20,33 @@ #Go solve -md.cluster=generic('name',gethostname(),'np',3) -md=solve(md,'Transient') +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'Transient') #Fields and tolerances to track changes -field_names = [ - 'Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1', - 'Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2', - 'Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3'] -field_tolerances = [ - 2e-09,3e-9,3e-9,3e-9,1e-13,1e-12,1e-12, - 2e-09,3e-9,3e-9,3e-9,1e-10,1e-10,1e-10, - 2e-09,3e-9,3e-9,3e-9,1e-10,1e-10,1e-10] -field_values = [ - md.results.TransientSolution[0].Vx, - md.results.TransientSolution[0].Vy, - md.results.TransientSolution[0].Vel, - md.results.TransientSolution[0].Pressure, - md.results.TransientSolution[0].Base, - md.results.TransientSolution[0].Surface, - md.results.TransientSolution[0].Thickness, - md.results.TransientSolution[1].Vx, - md.results.TransientSolution[1].Vy, - md.results.TransientSolution[1].Vel, - md.results.TransientSolution[1].Pressure, - md.results.TransientSolution[1].Base, - md.results.TransientSolution[1].Surface, - md.results.TransientSolution[1].Thickness, - md.results.TransientSolution[2].Vx, - md.results.TransientSolution[2].Vy, - md.results.TransientSolution[2].Vel, - md.results.TransientSolution[2].Pressure, - md.results.TransientSolution[2].Base, - md.results.TransientSolution[2].Surface, - md.results.TransientSolution[2].Thickness, - ] +field_names = ['Vx1', 'Vy1', 'Vel1', 'Pressure1', 'Bed1', 'Surface1', 'Thickness1', + 'Vx2', 'Vy2', 'Vel2', 'Pressure2', 'Bed2', 'Surface2', 'Thickness2', + 'Vx3', 'Vy3', 'Vel3', 'Pressure3', 'Bed3', 'Surface3', 'Thickness3'] +field_tolerances = [2e-09, 3e-9, 3e-9, 3e-9, 1e-13, 1e-12, 1e-12, + 2e-09, 3e-9, 3e-9, 3e-9, 1e-10, 1e-10, 1e-10, + 2e-09, 3e-9, 3e-9, 3e-9, 1e-10, 1e-10, 1e-10] +field_values = [md.results.TransientSolution[0].Vx, + md.results.TransientSolution[0].Vy, + md.results.TransientSolution[0].Vel, + md.results.TransientSolution[0].Pressure, + md.results.TransientSolution[0].Base, + md.results.TransientSolution[0].Surface, + md.results.TransientSolution[0].Thickness, + md.results.TransientSolution[1].Vx, + md.results.TransientSolution[1].Vy, + md.results.TransientSolution[1].Vel, + md.results.TransientSolution[1].Pressure, + md.results.TransientSolution[1].Base, + md.results.TransientSolution[1].Surface, + md.results.TransientSolution[1].Thickness, + md.results.TransientSolution[2].Vx, + md.results.TransientSolution[2].Vy, + md.results.TransientSolution[2].Vel, + md.results.TransientSolution[2].Pressure, + md.results.TransientSolution[2].Base, + md.results.TransientSolution[2].Surface, + md.results.TransientSolution[2].Thickness] Index: /issm/trunk-jpl/test/NightlyRun/test125.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test125.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test125.py (revision 23793) @@ -7,58 +7,53 @@ from setflowequation import * from solve import * - -from massfluxatgate import massfluxatgate from generic import generic import copy -md=triangle(model(),'../Exp/Square.exp',150000.) -md=setmask(md,'all','') -md=parameterize(md,'../Par/SquareShelfConstrained.py') -md=setflowequation(md,'SSA','all') -md.cluster=generic('name',gethostname(),'np',1) -md.transient.requested_outputs=['IceVolume','TotalSmb'] +md = triangle(model(), '../Exp/Square.exp', 150000.) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelfConstrained.py') +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 1) +md.transient.requested_outputs = ['IceVolume', 'TotalSmb'] -md.verbose=verbose('solution',1) -md.settings.recording_frequency=4 +md.verbose = verbose('solution', 1) +md.settings.recording_frequency = 4 # time steps and resolution -md.timestepping.final_time=19 -md.settings.output_frequency=2 +md.timestepping.final_time = 19 +md.settings.output_frequency = 2 -md=solve(md,'Transient') -md2=copy.deepcopy(md) -md=solve(md,'Transient','restart',1) +md = solve(md, 'Transient') +md2 = copy.deepcopy(md) +md = solve(md, 'Transient', 'restart', 1) #Fields and tolerances to track changes -field_names =['Vx1','Vy1','Vel1','TotalSmb1','Bed1','Surface1','Thickness1','Volume1','Vx2','Vy2','Vel2','TotalSmb2','Bed2','Surface2','Thickness2','Volume2','Vx3','Vy3','Vel3','TotalSmb3','Bed3','Surface3','Thickness3','Volume3'] -field_tolerances=[1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,\ - 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,\ - 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,\ - 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13] -field_values=[\ - md2.results.TransientSolution[6].Vx-md.results.TransientSolution[6].Vx,\ - md2.results.TransientSolution[6].Vy-md.results.TransientSolution[6].Vy,\ - md2.results.TransientSolution[6].Vel-md.results.TransientSolution[6].Vel,\ - md2.results.TransientSolution[6].TotalSmb-md.results.TransientSolution[6].TotalSmb,\ - md2.results.TransientSolution[6].Base-md.results.TransientSolution[6].Base,\ - md2.results.TransientSolution[6].Surface-md.results.TransientSolution[6].Surface,\ - md2.results.TransientSolution[6].Thickness-md.results.TransientSolution[6].Thickness,\ - md2.results.TransientSolution[6].IceVolume-md.results.TransientSolution[6].IceVolume,\ - md2.results.TransientSolution[7].Vx-md.results.TransientSolution[7].Vx,\ - md2.results.TransientSolution[7].Vy-md.results.TransientSolution[7].Vy,\ - md2.results.TransientSolution[7].Vel-md.results.TransientSolution[7].Vel,\ - md2.results.TransientSolution[7].TotalSmb-md.results.TransientSolution[7].TotalSmb,\ - md2.results.TransientSolution[7].Base-md.results.TransientSolution[7].Base,\ - md2.results.TransientSolution[7].Surface-md.results.TransientSolution[7].Surface,\ - md2.results.TransientSolution[7].Thickness-md.results.TransientSolution[7].Thickness,\ - md2.results.TransientSolution[7].IceVolume-md.results.TransientSolution[7].IceVolume,\ - md2.results.TransientSolution[8].Vx-md.results.TransientSolution[8].Vx,\ - md2.results.TransientSolution[8].Vy-md.results.TransientSolution[8].Vy,\ - md2.results.TransientSolution[8].Vel-md.results.TransientSolution[8].Vel,\ - md2.results.TransientSolution[8].TotalSmb-md.results.TransientSolution[8].TotalSmb,\ - md2.results.TransientSolution[8].Base-md.results.TransientSolution[8].Base,\ - md2.results.TransientSolution[8].Surface-md.results.TransientSolution[8].Surface,\ - md2.results.TransientSolution[8].Thickness-md.results.TransientSolution[8].Thickness,\ - md2.results.TransientSolution[8].IceVolume-md.results.TransientSolution[8].IceVolume\ - ] - +field_names = ['Vx1', 'Vy1', 'Vel1', 'TotalSmb1', 'Bed1', 'Surface1', 'Thickness1', 'Volume1', 'Vx2', 'Vy2', 'Vel2', 'TotalSmb2', 'Bed2', 'Surface2', 'Thickness2', 'Volume2', 'Vx3', 'Vy3', 'Vel3', 'TotalSmb3', 'Bed3', 'Surface3', 'Thickness3', 'Volume3'] +field_tolerances = [1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, + 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, + 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, + 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13] +field_values = [md2.results.TransientSolution[6].Vx - md.results.TransientSolution[6].Vx, + md2.results.TransientSolution[6].Vy - md.results.TransientSolution[6].Vy, + md2.results.TransientSolution[6].Vel - md.results.TransientSolution[6].Vel, + md2.results.TransientSolution[6].TotalSmb - md.results.TransientSolution[6].TotalSmb, + md2.results.TransientSolution[6].Base - md.results.TransientSolution[6].Base, + md2.results.TransientSolution[6].Surface - md.results.TransientSolution[6].Surface, + md2.results.TransientSolution[6].Thickness - md.results.TransientSolution[6].Thickness, + md2.results.TransientSolution[6].IceVolume - md.results.TransientSolution[6].IceVolume, + md2.results.TransientSolution[7].Vx - md.results.TransientSolution[7].Vx, + md2.results.TransientSolution[7].Vy - md.results.TransientSolution[7].Vy, + md2.results.TransientSolution[7].Vel - md.results.TransientSolution[7].Vel, + md2.results.TransientSolution[7].TotalSmb - md.results.TransientSolution[7].TotalSmb, + md2.results.TransientSolution[7].Base - md.results.TransientSolution[7].Base, + md2.results.TransientSolution[7].Surface - md.results.TransientSolution[7].Surface, + md2.results.TransientSolution[7].Thickness - md.results.TransientSolution[7].Thickness, + md2.results.TransientSolution[7].IceVolume - md.results.TransientSolution[7].IceVolume, + md2.results.TransientSolution[8].Vx - md.results.TransientSolution[8].Vx, + md2.results.TransientSolution[8].Vy - md.results.TransientSolution[8].Vy, + md2.results.TransientSolution[8].Vel - md.results.TransientSolution[8].Vel, + md2.results.TransientSolution[8].TotalSmb - md.results.TransientSolution[8].TotalSmb, + md2.results.TransientSolution[8].Base - md.results.TransientSolution[8].Base, + md2.results.TransientSolution[8].Surface - md.results.TransientSolution[8].Surface, + md2.results.TransientSolution[8].Thickness - md.results.TransientSolution[8].Thickness, + md2.results.TransientSolution[8].IceVolume - md.results.TransientSolution[8].IceVolume] Index: /issm/trunk-jpl/test/NightlyRun/test126.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test126.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test126.py (revision 23793) @@ -7,65 +7,60 @@ from setflowequation import * from solve import * - -from massfluxatgate import massfluxatgate from generic import generic import copy -md=triangle(model(),'../Exp/Square.exp',150000.) -md=setmask(md,'all','') -md=parameterize(md,'../Par/SquareShelfConstrained.py') -md.cluster=generic('name',gethostname(),'np',1) -md.transient.requested_outputs=['IceVolume','TotalSmb'] -md.extrude(3,1.) -md=setflowequation(md,'HO','all') +md = triangle(model(), '../Exp/Square.exp', 150000.) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelfConstrained.py') +md.cluster = generic('name', gethostname(), 'np', 1) +md.transient.requested_outputs = ['IceVolume', 'TotalSmb'] +md.extrude(3, 1.) +md = setflowequation(md, 'HO', 'all') -md.verbose=verbose('solution',1) -md.settings.recording_frequency=5 +md.verbose = verbose('solution', 1) +md.settings.recording_frequency = 5 # time steps and resolution -md.timestepping.final_time=8 +md.timestepping.final_time = 8 -md=solve(md,'Transient') -md2=copy.deepcopy(md) -md=solve(md,'Transient','restart',1) +md = solve(md, 'Transient') +md2 = copy.deepcopy(md) +md = solve(md, 'Transient', 'restart', 1) #Fields and tolerances to track changes -field_names =['Vx1','Vy1','Vel1','TotalSmb1','Bed1','Surface1','Thickness1','Volume1','Temperature1','Pressure1','Vx2','Vy2','Vel2','TotalSmb2','Bed2','Surface2','Thickness2','Volume2','Temperature2','Pressure2','Vx3','Vy3','Vel3','TotalSmb3','Bed3','Surface3','Thickness3','Volume3','Temperature3','Pressure3'] -field_tolerances=[1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,\ - 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,\ - 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,\ - 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,\ - 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13] -field_values=[\ - md2.results.TransientSolution[5].Vx-md.results.TransientSolution[5].Vx,\ - md2.results.TransientSolution[5].Vy-md.results.TransientSolution[5].Vy,\ - md2.results.TransientSolution[5].Vel-md.results.TransientSolution[5].Vel,\ - md2.results.TransientSolution[5].TotalSmb-md.results.TransientSolution[5].TotalSmb,\ - md2.results.TransientSolution[5].Base-md.results.TransientSolution[5].Base,\ - md2.results.TransientSolution[5].Surface-md.results.TransientSolution[5].Surface,\ - md2.results.TransientSolution[5].Thickness-md.results.TransientSolution[5].Thickness,\ - md2.results.TransientSolution[5].IceVolume-md.results.TransientSolution[5].IceVolume,\ - md2.results.TransientSolution[5].Temperature-md.results.TransientSolution[5].Temperature,\ - md2.results.TransientSolution[5].Pressure-md.results.TransientSolution[5].Pressure,\ - md2.results.TransientSolution[6].Vx-md.results.TransientSolution[6].Vx,\ - md2.results.TransientSolution[6].Vy-md.results.TransientSolution[6].Vy,\ - md2.results.TransientSolution[6].Vel-md.results.TransientSolution[6].Vel,\ - md2.results.TransientSolution[6].TotalSmb-md.results.TransientSolution[6].TotalSmb,\ - md2.results.TransientSolution[6].Base-md.results.TransientSolution[6].Base,\ - md2.results.TransientSolution[6].Surface-md.results.TransientSolution[6].Surface,\ - md2.results.TransientSolution[6].Thickness-md.results.TransientSolution[6].Thickness,\ - md2.results.TransientSolution[6].IceVolume-md.results.TransientSolution[6].IceVolume,\ - md2.results.TransientSolution[6].Temperature-md.results.TransientSolution[6].Temperature,\ - md2.results.TransientSolution[6].Pressure-md.results.TransientSolution[6].Pressure,\ - md2.results.TransientSolution[7].Vx-md.results.TransientSolution[7].Vx,\ - md2.results.TransientSolution[7].Vy-md.results.TransientSolution[7].Vy,\ - md2.results.TransientSolution[7].Vel-md.results.TransientSolution[7].Vel,\ - md2.results.TransientSolution[7].TotalSmb-md.results.TransientSolution[7].TotalSmb,\ - md2.results.TransientSolution[7].Base-md.results.TransientSolution[7].Base,\ - md2.results.TransientSolution[7].Surface-md.results.TransientSolution[7].Surface,\ - md2.results.TransientSolution[7].Thickness-md.results.TransientSolution[7].Thickness,\ - md2.results.TransientSolution[7].IceVolume-md.results.TransientSolution[7].IceVolume,\ - md2.results.TransientSolution[7].Temperature-md.results.TransientSolution[7].Temperature,\ - md2.results.TransientSolution[7].Pressure-md.results.TransientSolution[7].Pressure\ - ] - +field_names = ['Vx1', 'Vy1', 'Vel1', 'TotalSmb1', 'Bed1', 'Surface1', 'Thickness1', 'Volume1', 'Temperature1', 'Pressure1', 'Vx2', 'Vy2', 'Vel2', 'TotalSmb2', 'Bed2', 'Surface2', 'Thickness2', 'Volume2', 'Temperature2', 'Pressure2', 'Vx3', 'Vy3', 'Vel3', 'TotalSmb3', 'Bed3', 'Surface3', 'Thickness3', 'Volume3', 'Temperature3', 'Pressure3'] +field_tolerances = [1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, + 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, + 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, + 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, + 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13] +field_values = [md2.results.TransientSolution[5].Vx - md.results.TransientSolution[5].Vx, + md2.results.TransientSolution[5].Vy - md.results.TransientSolution[5].Vy, + md2.results.TransientSolution[5].Vel - md.results.TransientSolution[5].Vel, + md2.results.TransientSolution[5].TotalSmb - md.results.TransientSolution[5].TotalSmb, + md2.results.TransientSolution[5].Base - md.results.TransientSolution[5].Base, + md2.results.TransientSolution[5].Surface - md.results.TransientSolution[5].Surface, + md2.results.TransientSolution[5].Thickness - md.results.TransientSolution[5].Thickness, + md2.results.TransientSolution[5].IceVolume - md.results.TransientSolution[5].IceVolume, + md2.results.TransientSolution[5].Temperature - md.results.TransientSolution[5].Temperature, + md2.results.TransientSolution[5].Pressure - md.results.TransientSolution[5].Pressure, + md2.results.TransientSolution[6].Vx - md.results.TransientSolution[6].Vx, + md2.results.TransientSolution[6].Vy - md.results.TransientSolution[6].Vy, + md2.results.TransientSolution[6].Vel - md.results.TransientSolution[6].Vel, + md2.results.TransientSolution[6].TotalSmb - md.results.TransientSolution[6].TotalSmb, + md2.results.TransientSolution[6].Base - md.results.TransientSolution[6].Base, + md2.results.TransientSolution[6].Surface - md.results.TransientSolution[6].Surface, + md2.results.TransientSolution[6].Thickness - md.results.TransientSolution[6].Thickness, + md2.results.TransientSolution[6].IceVolume - md.results.TransientSolution[6].IceVolume, + md2.results.TransientSolution[6].Temperature - md.results.TransientSolution[6].Temperature, + md2.results.TransientSolution[6].Pressure - md.results.TransientSolution[6].Pressure, + md2.results.TransientSolution[7].Vx - md.results.TransientSolution[7].Vx, + md2.results.TransientSolution[7].Vy - md.results.TransientSolution[7].Vy, + md2.results.TransientSolution[7].Vel - md.results.TransientSolution[7].Vel, + md2.results.TransientSolution[7].TotalSmb - md.results.TransientSolution[7].TotalSmb, + md2.results.TransientSolution[7].Base - md.results.TransientSolution[7].Base, + md2.results.TransientSolution[7].Surface - md.results.TransientSolution[7].Surface, + md2.results.TransientSolution[7].Thickness - md.results.TransientSolution[7].Thickness, + md2.results.TransientSolution[7].IceVolume - md.results.TransientSolution[7].IceVolume, + md2.results.TransientSolution[7].Temperature - md.results.TransientSolution[7].Temperature, + md2.results.TransientSolution[7].Pressure - md.results.TransientSolution[7].Pressure] Index: /issm/trunk-jpl/test/NightlyRun/test1301.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1301.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test1301.py (revision 23793) @@ -18,44 +18,44 @@ """ -printingflag=False +printingflag = False -md=model() -md=triangle(md,'../Exp/Square.exp',100000.) -md=setmask(md,'','') -md=parameterize(md,'../Par/SquareThermal.py') -md.extrude(3,2.) -md=setflowequation(md,'HO','all') +md = model() +md = triangle(md, '../Exp/Square.exp', 100000.) +md = setmask(md, '', '') +md = parameterize(md, '../Par/SquareThermal.py') +md.extrude(3, 2.) +md = setflowequation(md, 'HO', 'all') #Some conditions specific to melting test -md.initialization.pressure=np.zeros((md.mesh.numberofvertices,1),int) -md.initialization.temperature=273.15*np.ones((md.mesh.numberofvertices)) -pos=np.nonzero(md.mesh.vertexonsurface)[0] -md.thermal.spctemperature[pos]=md.initialization.temperature[pos] -md.materials.rheology_B=paterson(md.initialization.temperature) +md.initialization.pressure = np.zeros((md.mesh.numberofvertices, 1), int) +md.initialization.temperature = 273.15 * np.ones((md.mesh.numberofvertices)) +pos = np.nonzero(md.mesh.vertexonsurface)[0] +md.thermal.spctemperature[pos] = md.initialization.temperature[pos] +md.materials.rheology_B = paterson(md.initialization.temperature) #analytical results #melting heat = geothermal flux -#Mb*L*rho=G => Mb=G/L*rho -melting=md.basalforcings.geothermalflux/(md.materials.rho_ice*md.materials.latentheat)*md.constants.yts +#Mb*L*rho = G => Mb = G/L*rho +melting = md.basalforcings.geothermalflux / (md.materials.rho_ice * md.materials.latentheat) * md.constants.yts #modeled results -md.cluster=generic('name',gethostname(),'np',2) -md=solve(md,'Thermal') +md.cluster = generic('name', gethostname(), 'np', 2) +md = solve(md, 'Thermal') #plot results -comp_melting=md.results.ThermalSolution.BasalforcingsGroundediceMeltingRate -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') +comp_melting = md.results.ThermalSolution.BasalforcingsGroundediceMeltingRate +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') if printingflag: - pass -# set(gcf,'Color','w') -# printmodel('thermalmelting','png','margin','on','marginsize',25,'frame','off','resolution',0.7,'hardcopy','off') -# system(['mv thermalmelting.png ' ISSM_DIR '/website/doc_pdf/validation/Images/Thermal ']) + pass +# set(gcf, 'Color', 'w') +# printmodel('thermalmelting', 'png', 'margin', 'on', 'marginsize', 25, 'frame', 'off', 'resolution', 0.7, 'hardcopy', 'off') +# system(['mv thermalmelting.png ' ISSM_DIR '/website/doc_pdf/validation/Images/Thermal ']) #Fields and tolerances to track changes -field_names =['BasalMelting'] -field_tolerances=[1e-08] -field_values =[comp_melting] +field_names = ['BasalMelting'] +field_tolerances = [1e-08] +field_values = [comp_melting] Index: /issm/trunk-jpl/test/NightlyRun/test1302.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1302.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test1302.py (revision 23793) @@ -1,5 +1,4 @@ #Test Name: ThermalAdvection import numpy as np -import sys from model import * from socket import gethostname @@ -13,54 +12,54 @@ """ 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 +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. """ -printingflag=False +printingflag = False -md=model() -md=triangle(md,'../Exp/Square.exp',100000.) -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=setflowequation(md,'HO','all') +md = model() +md = triangle(md, '../Exp/Square.exp', 100000.) +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 = setflowequation(md, 'HO', 'all') #Thermal boundary conditions -pos1=np.where(np.isnan(md.mesh.lowerelements))[0] -md.thermal.spctemperature[md.mesh.elements[pos1,0:3]-1]=10. -pos2=np.where(np.isnan(md.mesh.upperelements))[0] -md.thermal.spctemperature[md.mesh.elements[pos2,3:6]-1]=0. -md.initialization.vz=0.1*np.ones((md.mesh.numberofvertices)) -md.initialization.vel=np.sqrt(md.initialization.vx**2+ md.initialization.vy**2+ md.initialization.vz**2) -md.initialization.pressure=np.zeros((md.mesh.numberofvertices),int) +pos1 = np.where(np.isnan(md.mesh.lowerelements))[0] +md.thermal.spctemperature[md.mesh.elements[pos1, 0:3] - 1] = 10. +pos2 = np.where(np.isnan(md.mesh.upperelements))[0] +md.thermal.spctemperature[md.mesh.elements[pos2, 3:6] - 1] = 0. +md.initialization.vz = 0.1 * np.ones((md.mesh.numberofvertices)) +md.initialization.vel = np.sqrt(md.initialization.vx**2 + md.initialization.vy**2 + md.initialization.vz**2) +md.initialization.pressure = np.zeros((md.mesh.numberofvertices), int) -md.thermal.stabilization=2 +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 -md.initialization.temperature=A*np.exp(alpha*md.mesh.z)+B +#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 #modeled results -md.cluster=generic('name',gethostname(),'np',2) -md=solve(md,'Thermal') +md.cluster = generic('name', gethostname(), 'np', 2) +md = solve(md, 'Thermal') #plot results -comp_temp=md.results.ThermalSolution.Temperature -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) +comp_temp = md.results.ThermalSolution.Temperature +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) if printingflag: - pass -# set(gcf,'Color','w') -# printmodel('thermaladvection','png','margin','on','marginsize',25,'frame','off','resolution',0.7,'hardcopy','off') -# system(['mv thermaladvection.png ' ISSM_DIR '/website/doc_pdf/validation/Images/EISMINT ']) + pass +# set(gcf, 'Color', 'w') +# printmodel('thermaladvection', 'png', 'margin', 'on', 'marginsize', 25, 'frame', 'off', 'resolution', 0.7, 'hardcopy', 'off') +# system(['mv thermaladvection.png ' ISSM_DIR '/website/doc_pdf/validation/Images/EISMINT ']) #Fields and tolerances to track changes -field_names =['AdvectionTemperature'] -field_tolerances=[1e-13] -field_values =[comp_temp] +field_names = ['AdvectionTemperature'] +field_tolerances = [1e-13] +field_values = [comp_temp] Index: /issm/trunk-jpl/test/NightlyRun/test1303.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1303.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test1303.py (revision 23793) @@ -1,5 +1,4 @@ #Test Name: ThermalConduction import numpy as np -import sys from model import * from socket import gethostname @@ -18,45 +17,45 @@ """ -printingflag=False +printingflag = False -md=model() -md=triangle(md,'../Exp/Square.exp',100000.) -md=setmask(md,'all','') -md=parameterize(md,'../Par/SquareThermal.py') -md.extrude(11,2.) -md=setflowequation(md,'HO','all') +md = model() +md = triangle(md, '../Exp/Square.exp', 100000.) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareThermal.py') +md.extrude(11, 2.) +md = setflowequation(md, 'HO', 'all') -pos1=np.where(np.isnan(md.mesh.lowerelements))[0] -md.thermal.spctemperature[md.mesh.elements[pos1,0:3]-1]=10. -pos2=np.where(np.isnan(md.mesh.upperelements))[0] -md.thermal.spctemperature[md.mesh.elements[pos2,3:6]-1]=0. -md.initialization.pressure=np.zeros((md.mesh.numberofvertices),int) +pos1 = np.where(np.isnan(md.mesh.lowerelements))[0] +md.thermal.spctemperature[md.mesh.elements[pos1, 0:3] - 1] = 10. +pos2 = np.where(np.isnan(md.mesh.upperelements))[0] +md.thermal.spctemperature[md.mesh.elements[pos2, 3:6] - 1] = 0. +md.initialization.pressure = np.zeros((md.mesh.numberofvertices), int) #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 +md.initialization.temperature = 10. * (md.geometry.surface - md.mesh.z) / md.geometry.thickness #modeled results -md.cluster=generic('name',gethostname(),'np',2) -md=solve(md,'Thermal') +md.cluster = generic('name', gethostname(), 'np', 2) +md = solve(md, 'Thermal') #plot results -comp_temp=md.results.ThermalSolution.Temperature -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) +comp_temp = md.results.ThermalSolution.Temperature +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) if printingflag: - pass -# set(gcf,'Color','w') -# printmodel('thermalconduction','png','margin','on','marginsize',25,'frame','off','resolution',0.7,'hardcopy','off') -# system(['mv thermalconduction.png ' ISSM_DIR '/website/doc_pdf/validation/Images/Thermal ']) + pass +# set(gcf, 'Color', 'w') +# printmodel('thermalconduction', 'png', 'margin', 'on', 'marginsize', 25, 'frame', 'off', 'resolution', 0.7, 'hardcopy', 'off') +# system(['mv thermalconduction.png ' ISSM_DIR '/website/doc_pdf/validation/Images/Thermal ']) #Fields and tolerances to track changes -field_names =['ConductionTemperature'] -field_tolerances=[1e-13] -field_values =[comp_temp] +field_names = ['ConductionTemperature'] +field_tolerances = [1e-13] +field_values = [comp_temp] Index: /issm/trunk-jpl/test/NightlyRun/test1304.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1304.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test1304.py (revision 23793) @@ -1,5 +1,4 @@ #Test Name: ThermalGeothermalFlux import numpy as np -import sys from model import * from socket import gethostname @@ -18,43 +17,43 @@ """ -printingflag=False +printingflag = False -md=model() -md=triangle(md,'../Exp/Square.exp',100000.) -md=setmask(md,'','') -md=parameterize(md,'../Par/SquareThermal.py') -md.extrude(11,1.) -md=setflowequation(md,'HO','all') +md = model() +md = triangle(md, '../Exp/Square.exp', 100000.) +md = setmask(md, '', '') +md = parameterize(md, '../Par/SquareThermal.py') +md.extrude(11, 1.) +md = setflowequation(md, 'HO', 'all') -pos2=np.where(np.isnan(md.mesh.upperelements))[0] -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 +pos2 = np.where(np.isnan(md.mesh.upperelements))[0] +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 #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 -md.cluster=generic('name',gethostname(),'np',2) -md=solve(md,'Thermal') +md.cluster = generic('name', gethostname(), 'np', 2) +md = solve(md, 'Thermal') #plot results -comp_temp=md.results.ThermalSolution.Temperature -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) +comp_temp = md.results.ThermalSolution.Temperature +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) if printingflag: - pass -# set(gcf,'Color','w') -# printmodel('thermalgeothermalflux','png','margin','on','marginsize',25,'frame','off','resolution',0.7,'hardcopy','off') -# system(['mv thermalgeothermalflux.png ' ISSM_DIR '/website/doc_pdf/validation/Images/Thermal ']) + pass +# set(gcf, 'Color', 'w') +# printmodel('thermalgeothermalflux', 'png', 'margin', 'on', 'marginsize', 25, 'frame', 'off', 'resolution', 0.7, 'hardcopy', 'off') +# system(['mv thermalgeothermalflux.png ' ISSM_DIR '/website/doc_pdf/validation/Images/Thermal ']) #Fields and tolerances to track changes -field_names =['GeothermalFluxTemperature'] -field_tolerances=[1e-13] -field_values =[comp_temp] +field_names = ['GeothermalFluxTemperature'] +field_tolerances = [1e-13] +field_values = [comp_temp] Index: /issm/trunk-jpl/test/NightlyRun/test1501.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1501.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test1501.py (revision 23793) @@ -1,5 +1,4 @@ #Test Name: SquareShelfTranSawTooth2d import numpy as np -import sys from model import * from socket import gethostname @@ -13,211 +12,207 @@ printingflag = False -md=triangle(model(),'../Exp/Square.exp',350000.) -md=setmask(md,'all','') -md=parameterize(md,'../Par/SquareShelf.py') -md=setflowequation(md,'SSA','all') -md.cluster=generic('name',gethostname(),'np',3) -md.transient.isthermal=False - -md.timestepping.time_step=1. -md.settings.output_frequency=1 -md.timestepping.final_time=2000. +md = triangle(model(), '../Exp/Square.exp', 350000.) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelf.py') +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) +md.transient.isthermal = False + +md.timestepping.time_step = 1. +md.settings.output_frequency = 1 +md.timestepping.final_time = 2000. #Solve for thinning rate -> -1 * surface mass balance -smb= 2.*np.ones((md.mesh.numberofvertices)) -md.smb.mass_balance= smb -md.basalforcings.groundedice_melting_rate= smb - -md=solve(md,'Masstransport') - -for i in range(1,11): - md=solve(md,'Masstransport') - md.smb.mass_balance= md.smb.mass_balance - ((md.results.MasstransportSolution.Thickness)-md.geometry.thickness) +smb = 2. * np.ones((md.mesh.numberofvertices)) +md.smb.mass_balance = smb +md.basalforcings.groundedice_melting_rate = smb + +md = solve(md, 'Masstransport') + +for i in range(1, 11): + md = solve(md, 'Masstransport') + md.smb.mass_balance = md.smb.mass_balance - ((md.results.MasstransportSolution.Thickness) - md.geometry.thickness) #Set up transient smb = md.smb.mass_balance -#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=np.hstack((np.tile(smb,(1,399)),smb,tooth,tooth)) +#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 = 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=np.vstack((smb,np.arange(1,2001))) - -md=solve(md,'Transient') +md.smb.mass_balance = np.vstack((smb, np.arange(1, 2001))) + +md = solve(md, 'Transient') #Fields and tolerances to track changes -field_names=['Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','SmbMassBalance1', \ - 'Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2','SmbMassBalance2', \ - 'Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3','SmbMassBalance3', \ - 'Vx4','Vy4','Vel4','Pressure4','Bed4','Surface4','Thickness4','SmbMassBalance4', \ - 'Vx5','Vy5','Vel5','Pressure5','Bed5','Surface5','Thickness5','SmbMassBalance5'] -field_tolerances=[1e-09,1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,\ - 1e-09,1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,\ - 1e-09,1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,\ - 1e-09,1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,\ - 1e-09,1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10] -field_values=[\ - md.results.TransientSolution[400-1].Vx,\ - md.results.TransientSolution[400-1].Vy,\ - md.results.TransientSolution[400-1].Vel,\ - md.results.TransientSolution[400-1].Pressure,\ - md.results.TransientSolution[400-1].Base,\ - md.results.TransientSolution[400-1].Surface,\ - md.results.TransientSolution[400-1].Thickness,\ - md.results.TransientSolution[400-1].SmbMassBalance,\ - md.results.TransientSolution[800-1].Vx,\ - md.results.TransientSolution[800-1].Vy,\ - md.results.TransientSolution[800-1].Vel,\ - md.results.TransientSolution[800-1].Pressure,\ - md.results.TransientSolution[800-1].Base,\ - md.results.TransientSolution[800-1].Surface,\ - md.results.TransientSolution[800-1].Thickness,\ - md.results.TransientSolution[800-1].SmbMassBalance,\ - md.results.TransientSolution[1200-1].Vx,\ - md.results.TransientSolution[1200-1].Vy,\ - md.results.TransientSolution[1200-1].Vel,\ - md.results.TransientSolution[1200-1].Pressure,\ - md.results.TransientSolution[1200-1].Base,\ - md.results.TransientSolution[1200-1].Surface,\ - md.results.TransientSolution[1200-1].Thickness,\ - md.results.TransientSolution[1200-1].SmbMassBalance,\ - md.results.TransientSolution[1600-1].Vx,\ - md.results.TransientSolution[1600-1].Vy,\ - md.results.TransientSolution[1600-1].Vel,\ - md.results.TransientSolution[1600-1].Pressure,\ - md.results.TransientSolution[1600-1].Base,\ - md.results.TransientSolution[1600-1].Surface,\ - md.results.TransientSolution[1600-1].Thickness,\ - md.results.TransientSolution[1600-1].SmbMassBalance,\ - md.results.TransientSolution[2000-1].Vx,\ - md.results.TransientSolution[2000-1].Vy,\ - md.results.TransientSolution[2000-1].Vel,\ - md.results.TransientSolution[2000-1].Pressure,\ - md.results.TransientSolution[2000-1].Base,\ - md.results.TransientSolution[2000-1].Surface,\ - md.results.TransientSolution[2000-1].Thickness,\ - md.results.TransientSolution[2000-1].SmbMassBalance,\ - ] +field_names = ['Vx1', 'Vy1', 'Vel1', 'Pressure1', 'Bed1', 'Surface1', 'Thickness1', 'SmbMassBalance1', + 'Vx2', 'Vy2', 'Vel2', 'Pressure2', 'Bed2', 'Surface2', 'Thickness2', 'SmbMassBalance2', + 'Vx3', 'Vy3', 'Vel3', 'Pressure3', 'Bed3', 'Surface3', 'Thickness3', 'SmbMassBalance3', + 'Vx4', 'Vy4', 'Vel4', 'Pressure4', 'Bed4', 'Surface4', 'Thickness4', 'SmbMassBalance4', + 'Vx5', 'Vy5', 'Vel5', 'Pressure5', 'Bed5', 'Surface5', 'Thickness5', 'SmbMassBalance5'] +field_tolerances = [1e-09, 1e-09, 1e-09, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10, + 1e-09, 1e-09, 1e-09, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10, + 1e-09, 1e-09, 1e-09, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10, + 1e-09, 1e-09, 1e-09, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10, + 1e-09, 1e-09, 1e-09, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10] +field_values = [md.results.TransientSolution[400 - 1].Vx, + md.results.TransientSolution[400 - 1].Vy, + md.results.TransientSolution[400 - 1].Vel, + md.results.TransientSolution[400 - 1].Pressure, + md.results.TransientSolution[400 - 1].Base, + md.results.TransientSolution[400 - 1].Surface, + md.results.TransientSolution[400 - 1].Thickness, + md.results.TransientSolution[400 - 1].SmbMassBalance, + md.results.TransientSolution[800 - 1].Vx, + md.results.TransientSolution[800 - 1].Vy, + md.results.TransientSolution[800 - 1].Vel, + md.results.TransientSolution[800 - 1].Pressure, + md.results.TransientSolution[800 - 1].Base, + md.results.TransientSolution[800 - 1].Surface, + md.results.TransientSolution[800 - 1].Thickness, + md.results.TransientSolution[800 - 1].SmbMassBalance, + md.results.TransientSolution[1200 - 1].Vx, + md.results.TransientSolution[1200 - 1].Vy, + md.results.TransientSolution[1200 - 1].Vel, + md.results.TransientSolution[1200 - 1].Pressure, + md.results.TransientSolution[1200 - 1].Base, + md.results.TransientSolution[1200 - 1].Surface, + md.results.TransientSolution[1200 - 1].Thickness, + md.results.TransientSolution[1200 - 1].SmbMassBalance, + md.results.TransientSolution[1600 - 1].Vx, + md.results.TransientSolution[1600 - 1].Vy, + md.results.TransientSolution[1600 - 1].Vel, + md.results.TransientSolution[1600 - 1].Pressure, + md.results.TransientSolution[1600 - 1].Base, + md.results.TransientSolution[1600 - 1].Surface, + md.results.TransientSolution[1600 - 1].Thickness, + md.results.TransientSolution[1600 - 1].SmbMassBalance, + md.results.TransientSolution[2000 - 1].Vx, + md.results.TransientSolution[2000 - 1].Vy, + md.results.TransientSolution[2000 - 1].Vel, + md.results.TransientSolution[2000 - 1].Pressure, + md.results.TransientSolution[2000 - 1].Base, + md.results.TransientSolution[2000 - 1].Surface, + md.results.TransientSolution[2000 - 1].Thickness, + md.results.TransientSolution[2000 - 1].SmbMassBalance] if printingflag: - pass - - """ - starttime = 360 - endtime = 2000 - res = 40 - ts = [starttime:res:endtime] - - index = md.mesh.elements - 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))) - - thickness = [] - volume = [] - massbal = [] - velocity = [] - for t=starttime:endtime - thickness = [thickness (md.results.TransientSolution(t).Thickness)] - 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)] - end - - figure('Position', [0 0 860 932]) - - options = plotoptions('data','transient_movie','unit','km') - options = options.list{1} - options = checkplotoptions(md,options) - - %loop over the time steps - results=md.results.TransientSolution - count = 1 - for i=ts - - 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'] - 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]) - 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'] - 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) - - subplot(5,4,1:4) - cla - set(gca,'pos',get(gca,'pos')+[-0.07 0.03 0.12 0.015]) - plot(starttime:endtime,mean(massbal),'k','LineWidth', 4) - hold on - ya = ylim - plot([i i], ya, 'r', 'LineWidth',6) - ylim(ya) xlim([starttime endtime]) - title('Surface Mass Balance','FontSize',14) - ylabel('m/year','FontSize',14) - - 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) - hold on - ya = ylim - plot([i i], ya, 'r', 'LineWidth',6) - ylim(ya) xlim([starttime endtime]) - title('Ice Volume','FontSize',14) - ylabel('km^3','FontSize',14) - - 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) - hold on - ya = ylim - plot([i i], ya, 'r', 'LineWidth',6) - ylim(ya) xlim([starttime endtime]) - title('Mean Velocity','FontSize', 14) - ylabel('km/year','FontSize', 14) - xlabel('year','FontSize', 14) - - set(gcf,'Renderer','zbuffer','color','white') %fixes a bug on Mac OS X (not needed in future Matlab version) - if i==starttime, - %initialize images and frame - frame=getframe(gcf) - [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') - end - - count = count+1 - - end - - filename='transawtooth2d.gif' - imwrite(images,map,filename,'DelayTime',1.0,'LoopCount',inf) - """ - + pass + + """ + starttime = 360 + endtime = 2000 + res = 40 + ts = [starttime:res:endtime] + + index = md.mesh.elements + 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))) + + thickness = [] + volume = [] + massbal = [] + velocity = [] + for t = starttime:endtime + thickness = [thickness (md.results.TransientSolution(t).Thickness)] + 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)] + + figure('Position', [0 0 860 932]) + + options = plotoptions('data', 'transient_movie', 'unit', 'km') + options = options.list{1} + options = checkplotoptions(md, options) + + %loop over the time steps + results = md.results.TransientSolution + count = 1 + for i = ts + + 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'] + 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]) + 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'] + 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) + + subplot(5, 4, 1:4) + cla + set(gca, 'pos', get(gca, 'pos')+[-0.07 0.03 0.12 0.015]) + plot(starttime:endtime, mean(massbal), 'k', 'LineWidth', 4) + hold on + ya = ylim + plot([i i], ya, 'r', 'LineWidth', 6) + ylim(ya) xlim([starttime endtime]) + title('Surface Mass Balance', 'FontSize', 14) + ylabel('m/year', 'FontSize', 14) + + 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) + hold on + ya = ylim + plot([i i], ya, 'r', 'LineWidth', 6) + ylim(ya) xlim([starttime endtime]) + title('Ice Volume', 'FontSize', 14) + ylabel('km^3', 'FontSize', 14) + + 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) + hold on + ya = ylim + plot([i i], ya, 'r', 'LineWidth', 6) + ylim(ya) xlim([starttime endtime]) + title('Mean Velocity', 'FontSize', 14) + ylabel('km/year', 'FontSize', 14) + xlabel('year', 'FontSize', 14) + + set(gcf, 'Renderer', 'zbuffer', 'color', 'white') %fixes a bug on Mac OS X (not needed in future Matlab version) + if i = starttime, + %initialize images and frame + frame = getframe(gcf) + [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') + end + + count = count+1 + + end + + 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 23792) +++ /issm/trunk-jpl/test/NightlyRun/test1502.py (revision 23793) @@ -1,5 +1,4 @@ #Test Name: SquareShelfTranSawTooth3d import numpy as np -import sys from model import * from socket import gethostname @@ -13,217 +12,214 @@ printingflag = False -md=triangle(model(),'../Exp/Square.exp',450000.) -md=setmask(md,'all','') -md=parameterize(md,'../Par/SquareShelf.py') -md=setflowequation(md,'SSA','all') -md.extrude(3,1.) -md.cluster=generic('name',gethostname(),'np',2) -md.transient.isthermal=False - -md.timestepping.time_step=1. -md.settings.output_frequency=1 -md.timestepping.final_time=2000. +md = triangle(model(), '../Exp/Square.exp', 450000.) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelf.py') +md = setflowequation(md, 'SSA', 'all') +md.extrude(3, 1.) +md.cluster = generic('name', gethostname(), 'np', 2) +md.transient.isthermal = False + +md.timestepping.time_step = 1. +md.settings.output_frequency = 1 +md.timestepping.final_time = 2000. #Solve for thinning rate -> -1 * surface mass balance -smb= 2.*np.ones((md.mesh.numberofvertices)) -md.smb.mass_balance= smb -md.basalforcings.groundedice_melting_rate= smb - -md=solve(md,'Masstransport') - -for i in range(1,11): - md=solve(md,'Masstransport') - md.smb.mass_balance= md.smb.mass_balance - ((md.results.MasstransportSolution.Thickness)-md.geometry.thickness) +smb = 2. * np.ones((md.mesh.numberofvertices)) +md.smb.mass_balance = smb +md.basalforcings.groundedice_melting_rate = smb + +md = solve(md, 'Masstransport') + +for i in range(1, 11): + md = solve(md, 'Masstransport') + md.smb.mass_balance = md.smb.mass_balance - ((md.results.MasstransportSolution.Thickness) - md.geometry.thickness) #Set up transient smb = md.smb.mass_balance -#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=np.hstack((np.tile(smb,(1,399)),smb,tooth,tooth)) +#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 = 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=np.vstack((smb,np.arange(1,2001))) - -md=solve(md,'Transient') +md.smb.mass_balance = np.vstack((smb, np.arange(1, 2001))) + +md = solve(md, 'Transient') #Fields and tolerances to track changes -field_names=['Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','SmbMassBalance1', \ - 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','SmbMassBalance2', \ - 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','SmbMassBalance3', \ - 'Vx4','Vy4','Vz4','Vel4','Pressure4','Bed4','Surface4','Thickness4','SmbMassBalance4', \ - 'Vx5','Vy5','Vz5','Vel5','Pressure5','Bed5','Surface5','Thickness5','SmbMassBalance5'] -field_tolerances=[1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,\ - 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,\ - 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,\ - 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,\ - 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13] -field_values=[\ - md.results.TransientSolution[400-1].Vx,\ - md.results.TransientSolution[400-1].Vy,\ - md.results.TransientSolution[400-1].Vz,\ - md.results.TransientSolution[400-1].Vel,\ - md.results.TransientSolution[400-1].Pressure,\ - md.results.TransientSolution[400-1].Base,\ - md.results.TransientSolution[400-1].Surface,\ - md.results.TransientSolution[400-1].Thickness,\ - md.results.TransientSolution[400-1].SmbMassBalance,\ - md.results.TransientSolution[800-1].Vx,\ - md.results.TransientSolution[800-1].Vy,\ - md.results.TransientSolution[800-1].Vz,\ - md.results.TransientSolution[800-1].Vel,\ - md.results.TransientSolution[800-1].Pressure,\ - md.results.TransientSolution[800-1].Base,\ - md.results.TransientSolution[800-1].Surface,\ - md.results.TransientSolution[800-1].Thickness,\ - md.results.TransientSolution[800-1].SmbMassBalance,\ - md.results.TransientSolution[1200-1].Vx,\ - md.results.TransientSolution[1200-1].Vy,\ - md.results.TransientSolution[1200-1].Vz,\ - md.results.TransientSolution[1200-1].Vel,\ - md.results.TransientSolution[1200-1].Pressure,\ - md.results.TransientSolution[1200-1].Base,\ - md.results.TransientSolution[1200-1].Surface,\ - md.results.TransientSolution[1200-1].Thickness,\ - md.results.TransientSolution[1200-1].SmbMassBalance,\ - md.results.TransientSolution[1600-1].Vx,\ - md.results.TransientSolution[1600-1].Vy,\ - md.results.TransientSolution[1600-1].Vz,\ - md.results.TransientSolution[1600-1].Vel,\ - md.results.TransientSolution[1600-1].Pressure,\ - md.results.TransientSolution[1600-1].Base,\ - md.results.TransientSolution[1600-1].Surface,\ - md.results.TransientSolution[1600-1].Thickness,\ - md.results.TransientSolution[1600-1].SmbMassBalance,\ - md.results.TransientSolution[2000-1].Vx,\ - md.results.TransientSolution[2000-1].Vy,\ - md.results.TransientSolution[2000-1].Vz,\ - md.results.TransientSolution[2000-1].Vel,\ - md.results.TransientSolution[2000-1].Pressure,\ - md.results.TransientSolution[2000-1].Base,\ - md.results.TransientSolution[2000-1].Surface,\ - md.results.TransientSolution[2000-1].Thickness,\ - md.results.TransientSolution[2000-1].SmbMassBalance,\ - ] +field_names = ['Vx1', 'Vy1', 'Vz1', 'Vel1', 'Pressure1', 'Bed1', 'Surface1', 'Thickness1', 'SmbMassBalance1', + 'Vx2', 'Vy2', 'Vz2', 'Vel2', 'Pressure2', 'Bed2', 'Surface2', 'Thickness2', 'SmbMassBalance2', + 'Vx3', 'Vy3', 'Vz3', 'Vel3', 'Pressure3', 'Bed3', 'Surface3', 'Thickness3', 'SmbMassBalance3', + 'Vx4', 'Vy4', 'Vz4', 'Vel4', 'Pressure4', 'Bed4', 'Surface4', 'Thickness4', 'SmbMassBalance4', + 'Vx5', 'Vy5', 'Vz5', 'Vel5', 'Pressure5', 'Bed5', 'Surface5', 'Thickness5', 'SmbMassBalance5'] +field_tolerances = [1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, + 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, + 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, + 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, + 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13] +field_values = [md.results.TransientSolution[400 - 1].Vx, + md.results.TransientSolution[400 - 1].Vy, + md.results.TransientSolution[400 - 1].Vz, + md.results.TransientSolution[400 - 1].Vel, + md.results.TransientSolution[400 - 1].Pressure, + md.results.TransientSolution[400 - 1].Base, + md.results.TransientSolution[400 - 1].Surface, + md.results.TransientSolution[400 - 1].Thickness, + md.results.TransientSolution[400 - 1].SmbMassBalance, + md.results.TransientSolution[800 - 1].Vx, + md.results.TransientSolution[800 - 1].Vy, + md.results.TransientSolution[800 - 1].Vz, + md.results.TransientSolution[800 - 1].Vel, + md.results.TransientSolution[800 - 1].Pressure, + md.results.TransientSolution[800 - 1].Base, + md.results.TransientSolution[800 - 1].Surface, + md.results.TransientSolution[800 - 1].Thickness, + md.results.TransientSolution[800 - 1].SmbMassBalance, + md.results.TransientSolution[1200 - 1].Vx, + md.results.TransientSolution[1200 - 1].Vy, + md.results.TransientSolution[1200 - 1].Vz, + md.results.TransientSolution[1200 - 1].Vel, + md.results.TransientSolution[1200 - 1].Pressure, + md.results.TransientSolution[1200 - 1].Base, + md.results.TransientSolution[1200 - 1].Surface, + md.results.TransientSolution[1200 - 1].Thickness, + md.results.TransientSolution[1200 - 1].SmbMassBalance, + md.results.TransientSolution[1600 - 1].Vx, + md.results.TransientSolution[1600 - 1].Vy, + md.results.TransientSolution[1600 - 1].Vz, + md.results.TransientSolution[1600 - 1].Vel, + md.results.TransientSolution[1600 - 1].Pressure, + md.results.TransientSolution[1600 - 1].Base, + md.results.TransientSolution[1600 - 1].Surface, + md.results.TransientSolution[1600 - 1].Thickness, + md.results.TransientSolution[1600 - 1].SmbMassBalance, + md.results.TransientSolution[2000 - 1].Vx, + md.results.TransientSolution[2000 - 1].Vy, + md.results.TransientSolution[2000 - 1].Vz, + md.results.TransientSolution[2000 - 1].Vel, + md.results.TransientSolution[2000 - 1].Pressure, + md.results.TransientSolution[2000 - 1].Base, + md.results.TransientSolution[2000 - 1].Surface, + md.results.TransientSolution[2000 - 1].Thickness, + md.results.TransientSolution[2000 - 1].SmbMassBalance] if printingflag: - pass - """ - - starttime = 360 - endtime = 2000 - res = 40 - ts = [starttime:res:endtime] - - index = md.mesh.elements - 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))) - - thickness = [] - volume = [] - massbal = [] - velocity = [] - for t=starttime:endtime - thickness = [thickness (md.results.TransientSolution(t).Thickness)] - 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)] - end - - figure('Position', [0 0 1060 1060]) - - options = plotoptions('data','transient_movie','unit','km') - options = options.list{1} - options = checkplotoptions(md,options) - - %loop over the time steps - results=md.results.TransientSolution - count = 1 - for i=ts - - 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'] - 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]) - 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'] - 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) - - subplot(5,4,1:4) - cla - set(gca,'pos',get(gca,'pos')+[-0.07 0.03 0.12 0.015]) - plot(starttime:endtime,mean(massbal),'k','LineWidth', 4) - hold on - ya = ylim - plot([i i], ya, 'r', 'LineWidth',6) - ylim(ya) xlim([starttime endtime]) - title('Surface Mass Balance','FontSize',14) - ylabel('m/year','FontSize',14) - - 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) - hold on - ya = ylim - plot([i i], ya, 'r', 'LineWidth',6) - ylim(ya) xlim([starttime endtime]) - title('Ice Volume','FontSize',14) - ylabel('km^3','FontSize',14) - - 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) - hold on - ya = ylim - plot([i i], ya, 'r', 'LineWidth',6) - ylim(ya) xlim([starttime endtime]) - title('Mean Velocity','FontSize', 14) - ylabel('km/year','FontSize', 14) - xlabel('year','FontSize', 14) - - set(gcf,'Renderer','zbuffer','color','white') %fixes a bug on Mac OS X (not needed in future Matlab version) - if i==starttime, - %initialize images and frame - frame=getframe(gcf) - [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') - end - - count = count+1 - - end - - filename='transawtooth3d.gif' - imwrite(images,map,filename,'DelayTime',1.0,'LoopCount',inf) - """ - + pass + """ + + starttime = 360 + endtime = 2000 + res = 40 + ts = [starttime:res:endtime] + + index = md.mesh.elements + 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))) + + thickness = [] + volume = [] + massbal = [] + velocity = [] + for t = starttime:endtime + thickness = [thickness (md.results.TransientSolution(t).Thickness)] + 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)] + end + + figure('Position', [0 0 1060 1060]) + + options = plotoptions('data', 'transient_movie', 'unit', 'km') + options = options.list{1} + options = checkplotoptions(md, options) + + %loop over the time steps + results = md.results.TransientSolution + count = 1 + for i = ts + + 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'] + 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]) + 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'] + 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) + + subplot(5, 4, 1:4) + cla + set(gca, 'pos', get(gca, 'pos')+[-0.07 0.03 0.12 0.015]) + plot(starttime:endtime, mean(massbal), 'k', 'LineWidth', 4) + hold on + ya = ylim + plot([i i], ya, 'r', 'LineWidth', 6) + ylim(ya) xlim([starttime endtime]) + title('Surface Mass Balance', 'FontSize', 14) + ylabel('m/year', 'FontSize', 14) + + 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) + hold on + ya = ylim + plot([i i], ya, 'r', 'LineWidth', 6) + ylim(ya) xlim([starttime endtime]) + title('Ice Volume', 'FontSize', 14) + ylabel('km^3', 'FontSize', 14) + + 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) + hold on + ya = ylim + plot([i i], ya, 'r', 'LineWidth', 6) + ylim(ya) xlim([starttime endtime]) + title('Mean Velocity', 'FontSize', 14) + ylabel('km/year', 'FontSize', 14) + xlabel('year', 'FontSize', 14) + + set(gcf, 'Renderer', 'zbuffer', 'color', 'white') %fixes a bug on Mac OS X (not needed in future Matlab version) + if i = starttime, + %initialize images and frame + frame = getframe(gcf) + [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') + end + + count = count+1 + + end + + 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 23792) +++ /issm/trunk-jpl/test/NightlyRun/test1601.py (revision 23793) @@ -11,43 +11,43 @@ -md=triangle(model(),'../Exp/Square.exp',150000.) -md=setmask(md,'all','') -md=parameterize(md,'../Par/SquareShelf.py') -md=setflowequation(md,'SSA','all') -md.stressbalance.spcvx[np.where(md.mesh.y>0.)]=np.nan -md.initialization.vx[:]=0. -md.initialization.vy[:]=0. -md.initialization.vel=np.zeros((md.mesh.numberofvertices)) +md = triangle(model(), '../Exp/Square.exp', 150000.) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelf.py') +md = setflowequation(md, 'SSA', 'all') +md.stressbalance.spcvx[np.where(md.mesh.y > 0.)] = np.nan +md.initialization.vx[:] = 0. +md.initialization.vy[:] = 0. +md.initialization.vel = np.zeros((md.mesh.numberofvertices)) -md.cluster=generic('name',gethostname(),'np',2) -md=solve(md,'Stressbalance') -vel0=md.results.StressbalanceSolution.Vel -theta=30.*np.pi/180. -x=md.mesh.x -y=md.mesh.y -md.mesh.x=np.cos(theta)*x-np.sin(theta)*y -md.mesh.y=np.sin(theta)*x+np.cos(theta)*y +md.cluster = generic('name', gethostname(), 'np', 2) +md = solve(md, 'Stressbalance') +vel0 = md.results.StressbalanceSolution.Vel +theta = 30. * np.pi / 180. +x = md.mesh.x +y = md.mesh.y +md.mesh.x = np.cos(theta) * x - np.sin(theta) * y +md.mesh.y = np.sin(theta) * x + np.cos(theta) * y -rotation_array=np.array([np.cos(theta),np.sin(theta),0]) -md.stressbalance.referential[:,0:3]=(np.tile(rotation_array,(md.mesh.numberofvertices,1))) -md.stressbalance.referential[:,3: ]=np.tile([0,0,1],(md.mesh.numberofvertices,1)) -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') -print("Error between Cartesian and rotated CS: %g" % (np.max(np.abs(vel0-vel1))/(np.max(np.abs(vel0))+sys.float_info.epsilon))) +rotation_array = np.array([np.cos(theta), np.sin(theta), 0]) +md.stressbalance.referential[:, 0:3] = (np.tile(rotation_array, (md.mesh.numberofvertices, 1))) +md.stressbalance.referential[:, 3:] = np.tile([0, 0, 1], (md.mesh.numberofvertices, 1)) +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') +print("Error between Cartesian and rotated CS: {}".format(np.max(np.abs(vel0 - vel1)) / (np.max(np.abs(vel0)) + sys.float_info.epsilon))) #Now, put CS back to normal except on the side where the spc are applied -pos=np.where(np.logical_or(x==0.,x==1000000.))[0] -md.stressbalance.referential[:]=np.nan -md.stressbalance.referential[pos,0:3]=np.tile([np.cos(theta),np.sin(theta),0],(len(pos),1)) -md.stressbalance.referential[pos,3: ]=np.tile([0,0,1],(len(pos),1)) -md=solve(md,'Stressbalance') -vel2=md.results.StressbalanceSolution.Vel +pos = np.where(np.logical_or(x == 0., x == 1000000.))[0] +md.stressbalance.referential[:] = np.nan +md.stressbalance.referential[pos, 0:3] = np.tile([np.cos(theta), np.sin(theta), 0], (len(pos), 1)) +md.stressbalance.referential[pos, 3:] = np.tile([0, 0, 1], (len(pos), 1)) +md = solve(md, 'Stressbalance') +vel2 = md.results.StressbalanceSolution.Vel -#plotmodel(md,'data',vel0,'data',vel2,'data',vel2-vel0,'title','Cartesian CS','title','Rotated CS','title','difference') -print("Error between Cartesian and rotated CS: %g" % (np.max(np.abs(vel0-vel2))/(np.max(np.abs(vel0))+sys.float_info.epsilon))) +#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))) #Fields and tolerances to track changes -field_names =['vel1','vel2'] -field_tolerances=[1e-11,1e-11] -field_values=[vel1,vel2] +field_names = ['vel1', 'vel2'] +field_tolerances = [1e-11, 1e-11] +field_values = [vel1, vel2] Index: /issm/trunk-jpl/test/NightlyRun/test1602.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1602.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test1602.py (revision 23793) @@ -11,34 +11,34 @@ -md=triangle(model(),'../Exp/Square.exp',150000.) -md=setmask(md,'../Exp/SquareShelf.exp','') -md=parameterize(md,'../Par/SquareSheetShelf.py') -md.extrude(5,1.) -md=setflowequation(md,'HO','all') -md.stressbalance.spcvx[np.nonzero(md.mesh.y>0.)]=np.nan -md.initialization.vx[:]=0. -md.initialization.vy[:]=0. -md.initialization.vel=np.zeros_like(md.initialization.vx) +md = triangle(model(), '../Exp/Square.exp', 150000.) +md = setmask(md, '../Exp/SquareShelf.exp', '') +md = parameterize(md, '../Par/SquareSheetShelf.py') +md.extrude(5, 1.) +md = setflowequation(md, 'HO', 'all') +md.stressbalance.spcvx[np.nonzero(md.mesh.y > 0.)] = np.nan +md.initialization.vx[:] = 0. +md.initialization.vy[:] = 0. +md.initialization.vel = np.zeros_like(md.initialization.vx) -md.cluster=generic('name',gethostname(),'np',3) -md=solve(md,'Stressbalance') -vel0=md.results.StressbalanceSolution.Vel +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'Stressbalance') +vel0 = md.results.StressbalanceSolution.Vel -theta=30.*np.pi/180. -x=md.mesh.x -y=md.mesh.y -md.mesh.x=np.cos(theta)*x-np.sin(theta)*y -md.mesh.y=np.sin(theta)*x+np.cos(theta)*y +theta = 30. * np.pi / 180. +x = md.mesh.x +y = md.mesh.y +md.mesh.x = np.cos(theta) * x - np.sin(theta) * y +md.mesh.y = np.sin(theta) * x + np.cos(theta) * y -md.stressbalance.referential[:,0:3]=np.tile([np.cos(theta),np.sin(theta),0],(md.mesh.numberofvertices,1)) -md.stressbalance.referential[:,3: ]=np.tile([0,0,1],(md.mesh.numberofvertices,1)) -md=solve(md,'Stressbalance') -vel1=md.results.StressbalanceSolution.Vel +md.stressbalance.referential[:, 0:3] = np.tile([np.cos(theta), np.sin(theta), 0], (md.mesh.numberofvertices, 1)) +md.stressbalance.referential[:, 3:] = np.tile([0, 0, 1], (md.mesh.numberofvertices, 1)) +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','view#all',2) -print("Error between Cartesian and rotated CS: %g" % (np.max(np.abs(vel0-vel1))/(np.max(np.abs(vel0))+sys.float_info.epsilon))) +#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))) #Fields and tolerances to track changes -field_names =['vel1'] -field_tolerances=[1e-9] -field_values=[vel1] +field_names = ['vel1'] +field_tolerances = [1e-9] +field_values = [vel1] Index: /issm/trunk-jpl/test/NightlyRun/test2001.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test2001.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test2001.py (revision 23793) @@ -1,5 +1,4 @@ #Test Name: SquareSheetConstrainedGia2d import numpy as np -import copy from model import * from socket import gethostname @@ -11,30 +10,29 @@ -#Define a model -md=model() -md=triangle(md,'../Exp/Square.exp',100000.) -md=setmask(md,'','') -md=parameterize(md,'../Par/SquareSheetConstrained.py') +#Define a model +md = model() +md = triangle(md, '../Exp/Square.exp', 100000.) +md = setmask(md, '', '') +md = parameterize(md, '../Par/SquareSheetConstrained.py') -#Indicate what you want to compute -md.gia.cross_section_shape=1 # for square-edged x-section +#Indicate what you want to compute +md.gia.cross_section_shape = 1 # for square-edged x-section #Define loading history (see test2001.m for the description) -md.timestepping.start_time=2400000 # 2,400 kyr -md.timestepping.final_time=2500000 # 2,500 kyr -md.geometry.thickness=np.vstack((np.hstack((md.geometry.thickness*0.0, 0.0)), - np.hstack((md.geometry.thickness/2.0, 0.1)), - np.hstack((md.geometry.thickness, 0.2)), - np.hstack((md.geometry.thickness, 1.0)), - np.hstack((md.geometry.thickness, md.timestepping.start_time)))).T +md.timestepping.start_time = 2400000 # 2, 400 kyr +md.timestepping.final_time = 2500000 # 2, 500 kyr +md.geometry.thickness = np.vstack((np.hstack((md.geometry.thickness * 0.0, 0.0)), + np.hstack((md.geometry.thickness / 2.0, 0.1)), + np.hstack((md.geometry.thickness, 0.2)), + np.hstack((md.geometry.thickness, 1.0)), + np.hstack((md.geometry.thickness, md.timestepping.start_time)))).T -#Solve for GIA deflection -md.cluster=generic('name',gethostname(),'np',3) -md=solve(md,'Gia') +#Solve for GIA deflection +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'Gia') #Fields and tolerances to track changes -field_names =['GiaW','GiadWdt'] -field_tolerances=[1e-13,1e-13] -field_values =[md.results.GiaSolution.GiaW, - md.results.GiaSolution.GiadWdt] - +field_names = ['GiaW', 'GiadWdt'] +field_tolerances = [1e-13, 1e-13] +field_values = [md.results.GiaSolution.GiaW, + md.results.GiaSolution.GiadWdt] Index: /issm/trunk-jpl/test/NightlyRun/test2002.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test2002.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test2002.py (revision 23793) @@ -1,5 +1,4 @@ #Test Name: EarthSlr from model import * -from socket import gethostname import numpy as np from parameterize import * @@ -12,24 +11,24 @@ #mesh earth: -md=model() -md.mesh=gmshplanet('radius',6.371012*10**3,'resolution',700.) #500 km resolution mesh +md = model() +md.mesh = gmshplanet('radius', 6.371012 * 10**3, 'resolution', 700.) #500 km resolution mesh #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 -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 -#greenland -pos=np.where(np.logical_and.reduce((late > 70,late < 80,longe>-60,longe<-30))) -md.slr.deltathickness[pos]=-100 +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 +#greenland +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: -nlov=101 +nlov = 101 md.slr.love_h = love_numbers('h')[:nlov] md.slr.love_k = love_numbers('k')[:nlov] @@ -37,89 +36,89 @@ #mask: -md.mask=maskpsl() # use maskpsl class (instead of mask) to store the ocean function as a ocean_levelset -mask=gmtmask(md.mesh.lat,md.mesh.long) +md.mask = maskpsl() # use maskpsl class (instead of mask) to store the ocean function as a ocean_levelset +mask = gmtmask(md.mesh.lat, md.mesh.long) -icemask=np.ones((md.mesh.numberofvertices)) -pos=np.where(mask==0)[0] -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 -md.mask.ice_levelset=icemask -md.mask.ocean_levelset=np.zeros((md.mesh.numberofvertices)) -pos=np.where(md.mask.ice_levelset==1) -md.mask.ocean_levelset[pos]=1 +icemask = np.ones((md.mesh.numberofvertices)) +pos = np.where(mask == 0)[0] +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 +md.mask.ice_levelset = icemask +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: -pos=np.nonzero(md.slr.deltathickness)[0] -md.mask.groundedice_levelset[md.mesh.elements[pos,:]-1]=1; +pos = np.nonzero(md.slr.deltathickness)[0] +md.mask.groundedice_levelset[md.mesh.elements[pos, :] - 1] = 1 #make sure wherever there is an ice load, that the mask is set to ice: -icemask[md.mesh.elements[pos,:]-1]=-1 -md.mask.ice_levelset=icemask +icemask[md.mesh.elements[pos, :] - 1] = -1 +md.mask.ice_levelset = icemask -md.slr.ocean_area_scaling=0 +md.slr.ocean_area_scaling = 0 #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.base=md.geometry.surface-md.geometry.thickness -md.geometry.bed=md.geometry.base +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.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.materials.rheology_B=paterson(md.initialization.temperature) -md.materials.rheology_n=3*np.ones((md.mesh.numberofelements)) +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)) #New stuff -md.slr.spcthickness = np.nan*np.ones((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 -md.miscellaneous.name='test2002' +md.miscellaneous.name = 'test2002' #Solution parameters -md.slr.reltol=np.nan -md.slr.abstol=1e-3 -md.slr.geodetic=1 +md.slr.reltol = np.nan +md.slr.abstol = 1e-3 +md.slr.geodetic = 1 #max number of iteration reverted back to 10 (i.e., the original default value) -md.slr.maxiter=10 +md.slr.maxiter = 10 -#eustatic run: -md.slr.rigid=0 -md.slr.elastic=0 -md.slr.rotation=0 -md=solve(md,'Sealevelrise') -Seustatic=md.results.SealevelriseSolution.Sealevel +#eustatic run: +md.slr.rigid = 0 +md.slr.elastic = 0 +md.slr.rotation = 0 +md = solve(md, 'Sealevelrise') +Seustatic = md.results.SealevelriseSolution.Sealevel -#eustatic + rigid run: -md.slr.rigid=1 -md.slr.elastic=0 -md.slr.rotation=0 -md=solve(md,'Sealevelrise') -Srigid=md.results.SealevelriseSolution.Sealevel +#eustatic + rigid run: +md.slr.rigid = 1 +md.slr.elastic = 0 +md.slr.rotation = 0 +md = solve(md, 'Sealevelrise') +Srigid = md.results.SealevelriseSolution.Sealevel -#eustatic + rigid + elastic run: -md.slr.rigid=1 -md.slr.elastic=1 -md.slr.rotation=0 -md=solve(md,'Sealevelrise') -Selastic=md.results.SealevelriseSolution.Sealevel +#eustatic + rigid + elastic run: +md.slr.rigid = 1 +md.slr.elastic = 1 +md.slr.rotation = 0 +md = solve(md, 'Sealevelrise') +Selastic = md.results.SealevelriseSolution.Sealevel -#eustatic + rigid + elastic + rotation run: -md.slr.rigid=1 -md.slr.elastic=1 -md.slr.rotation=1 -md=solve(md,'Sealevelrise') -Srotation=md.results.SealevelriseSolution.Sealevel +#eustatic + rigid + elastic + rotation run: +md.slr.rigid = 1 +md.slr.elastic = 1 +md.slr.rotation = 1 +md = solve(md, 'Sealevelrise') +Srotation = md.results.SealevelriseSolution.Sealevel #Fields and tolerances to track changes -field_names =['Eustatic','Rigid','Elastic','Rotation'] -field_tolerances=[1e-13,1e-13,1e-13,1e-13] -field_values=[Seustatic,Srigid,Selastic,Srotation] +field_names = ['Eustatic', 'Rigid', 'Elastic', 'Rotation'] +field_tolerances = [1e-13, 1e-13, 1e-13, 1e-13] +field_values = [Seustatic, Srigid, Selastic, Srotation] Index: /issm/trunk-jpl/test/NightlyRun/test2003.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test2003.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test2003.py (revision 23793) @@ -12,5 +12,5 @@ #mesh earth: md = model() -md.mesh = gmshplanet('radius',6.371012*1e3,'resolution',1000.) #500 km resolution mesh +md.mesh = gmshplanet('radius', 6.371012 * 1e3, 'resolution', 1000.) #500 km resolution mesh #parameterize slr solution: @@ -23,10 +23,10 @@ #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 -late = sum(md.mesh.lat[md.mesh.elements - 1],1) / 3 -longe = sum(md.mesh.long[md.mesh.elements - 1],1) / 3 +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 -#elastic loading from love numbers: +#elastic loading from love numbers: nlov = 1000 md.slr.love_h = np.array(love_numbers('h')) @@ -39,13 +39,13 @@ #mask: {{{ -md.mask = maskpsl() # use maskpsl class (instead of mask) to store the ocean function as a ocean_levelset -mask = gmtmask(md.mesh.lat,md.mesh.long) +md.mask = maskpsl() # use maskpsl class (instead of mask) to store the ocean function as a ocean_levelset +mask = gmtmask(md.mesh.lat, md.mesh.long) 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 +#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 +pos = np.where(sum(mask[md.mesh.elements - 1], 1) < 3) +icemask[md.mesh.elements[pos, :] - 1] = -1 md.mask.ice_levelset = icemask md.mask.ocean_levelset = np.zeros((md.mesh.numberofvertices,)) @@ -58,13 +58,13 @@ #make sure that the elements that have loads are fully grounded: -pos=np.nonzero(md.slr.deltathickness)[0] -md.mask.groundedice_levelset[md.mesh.elements[pos,:]-1]=1; +pos = np.nonzero(md.slr.deltathickness)[0] +md.mask.groundedice_levelset[md.mesh.elements[pos, :] - 1] = 1 #make sure wherever there is an ice load, that the mask is set to ice: -icemask[md.mesh.elements[pos,:]-1]=-1 -md.mask.ice_levelset=icemask +icemask[md.mesh.elements[pos, :] - 1] = -1 +md.mask.ice_levelset = icemask # }}} -# use model representation of ocea area (not the ture area) +# use model representation of ocea area (not the ture area) md.slr.ocean_area_scaling = 0 @@ -85,5 +85,5 @@ #New stuff -md.slr.spcthickness = np.nan*np.ones((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,)) @@ -92,11 +92,11 @@ md.slr.reltol = float('NaN') md.slr.abstol = 1e-3 -md.slr.geodetic=1 +md.slr.geodetic = 1 -#eustatic + rigid + elastic run: +#eustatic + rigid + elastic run: md.slr.rigid = 1 md.slr.elastic = 1 md.slr.rotation = 0 -md.cluster = generic('name',gethostname(),'np',3) +md.cluster = generic('name', gethostname(), 'np', 3) #md.verbose = verbose('111111111') #print md.calving @@ -105,14 +105,14 @@ #print md.esa #print md.autodiff -md = solve(md,'Sealevelrise') +md = solve(md, 'Sealevelrise') SnoRotation = md.results.SealevelriseSolution.Sealevel -#eustatic + rigid + elastic + rotation run: +#eustatic + rigid + elastic + rotation run: md.slr.rigid = 1 md.slr.elastic = 1 md.slr.rotation = 1 -md.cluster = generic('name',gethostname(),'np',3) +md.cluster = generic('name', gethostname(), 'np', 3) #md.verbose = verbose('111111111') -md = solve(md,'Sealevelrise') +md = solve(md, 'Sealevelrise') SRotation = md.results.SealevelriseSolution.Sealevel @@ -121,3 +121,2 @@ field_tolerances = [1e-13, 1e-13] field_values = [SnoRotation, SRotation] - Index: /issm/trunk-jpl/test/NightlyRun/test201.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test201.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test201.py (revision 23793) @@ -10,16 +10,16 @@ from ContourToMesh import * -md=triangle(model(),'../Exp/Square.exp',150000) -md=setmask(md,'all','') -md=parameterize(md,'../Par/SquareShelf.py') -md=setflowequation(md,'SSA','all') -md.cluster=generic('name',gethostname(),'np',3) -md=solve(md,'Stressbalance') +md = triangle(model(), '../Exp/Square.exp', 150000) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelf.py') +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'Stressbalance') #Fields and tolerances to track changes -field_names =['Vx','Vy','Vel','Pressure'] -field_tolerances=[1e-13,1e-13,1e-13,1e-13] -field_values=[md.results.StressbalanceSolution.Vx, - md.results.StressbalanceSolution.Vy, - md.results.StressbalanceSolution.Vel, - md.results.StressbalanceSolution.Pressure] +field_names = ['Vx', 'Vy', 'Vel', 'Pressure'] +field_tolerances = [1e-13, 1e-13, 1e-13, 1e-13] +field_values = [md.results.StressbalanceSolution.Vx, + md.results.StressbalanceSolution.Vy, + md.results.StressbalanceSolution.Vel, + md.results.StressbalanceSolution.Pressure] Index: /issm/trunk-jpl/test/NightlyRun/test2010.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test2010.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test2010.py (revision 23793) @@ -10,13 +10,13 @@ from gmtmask import * -#mesh earth: +#mesh earth: md = model() -rad_e = 6.371012*1e3 # mean radius of Earth, km -md.mesh = gmshplanet('radius',rad_e,'resolution',1000.0) # km resolution +rad_e = 6.371012 * 1e3 # mean radius of Earth, km +md.mesh = gmshplanet('radius', rad_e, 'resolution', 1000.0) # km resolution #parameterize slr solution: #slr loading: {{{ -late = sum(md.mesh.lat[md.mesh.elements - 1],1) / 3 -longe = sum(md.mesh.long[md.mesh.elements - 1],1) / 3 +late = sum(md.mesh.lat[md.mesh.elements - 1], 1) / 3 +longe = sum(md.mesh.long[md.mesh.elements - 1], 1) / 3 md.slr.deltathickness = np.zeros((md.mesh.numberofelements,)) @@ -29,5 +29,5 @@ md.slr.ocean_area_scaling = 1 -#elastic loading from love numbers: +#elastic loading from love numbers: nlov = 1000 md.slr.love_h = np.array(love_numbers('h')) @@ -40,12 +40,12 @@ #}}} #mask: {{{ -md.mask = maskpsl() # use maskpsl class (instead of mask) to store the ocean function as a ocean_levelset -mask = gmtmask(md.mesh.lat,md.mesh.long) +md.mask = maskpsl() # use maskpsl class (instead of mask) to store the ocean function as a ocean_levelset +mask = gmtmask(md.mesh.lat, md.mesh.long) icemask = np.ones((md.mesh.numberofvertices,)) pos = np.where(mask == 0) icemask[pos[0]] = -1 -pos = np.where(sum(mask[md.mesh.elements - 1],1) < 3) -icemask[md.mesh.elements[pos,:] - 1] = -1 +pos = np.where(sum(mask[md.mesh.elements - 1], 1) < 3) +icemask[md.mesh.elements[pos, :] - 1] = -1 md.mask.ice_levelset = icemask md.mask.ocean_levelset = np.zeros((md.mesh.numberofvertices,)) @@ -58,10 +58,10 @@ #make sure that the elements that have loads are fully grounded: -pos=np.nonzero(md.slr.deltathickness)[0] -md.mask.groundedice_levelset[md.mesh.elements[pos,:]-1]=1; +pos = np.nonzero(md.slr.deltathickness)[0] +md.mask.groundedice_levelset[md.mesh.elements[pos, :] - 1] = 1 #make sure wherever there is an ice load, that the mask is set to ice: -icemask[md.mesh.elements[pos,:]-1]=-1 -md.mask.ice_levelset=icemask +icemask[md.mesh.elements[pos, :] - 1] = -1 +md.mask.ice_levelset = icemask # }}} #geometry {{{ @@ -87,27 +87,27 @@ #New stuff -md.slr.spcthickness = np.nan*np.ones((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: +#eustatic + rigid + elastic run: md.slr.rigid = 1 md.slr.elastic = 1 md.slr.rotation = 1 -md.cluster = generic('name',gethostname(),'np',3) +md.cluster = generic('name', gethostname(), 'np', 3) -# uncomment following 2 lines for -md = solve(md,'Sealevelrise') +# uncomment following 2 lines for +md = solve(md, 'Sealevelrise') eus = md.results.SealevelriseSolution.SealevelRSLEustatic slr = md.results.SealevelriseSolution.Sealevel moixz = md.results.SealevelriseSolution.SealevelInertiaTensorXZ moiyz = md.results.SealevelriseSolution.SealevelInertiaTensorYZ -moizz = md.results.SealevelriseSolution.SealevelInertiaTensorZZ +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 -#areas=GetAreasSphericalTria(md.mesh.elements,md.mesh.lat,md.mesh.long,rad_e) -#lat=late*pi/180 lon=longe*pi/180 +# ...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)) @@ -115,5 +115,5 @@ #Fields and tolerances to track changes -field_names = ['eus','slr','moixz','moiyz','moizz'] -field_tolerances= [1e-13,1e-13,1e-13,1e-13,1e-13] -field_values = [eus,slr,moixz,moiyz,moizz] +field_names = ['eus', 'slr', 'moixz', 'moiyz', 'moizz'] +field_tolerances = [1e-13, 1e-13, 1e-13, 1e-13, 1e-13] +field_values = [eus, slr, moixz, moiyz, moizz] Index: /issm/trunk-jpl/test/NightlyRun/test202.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test202.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test202.py (revision 23793) @@ -3,5 +3,4 @@ from model import * from socket import gethostname -import numpy as np from triangle import * from setmask import * @@ -11,22 +10,20 @@ from generic import generic -md=triangle(model(),'../Exp/Square.exp',180000) -md=setmask(md,'all','') -md=parameterize(md,'../Par/SquareShelf.py') -md.extrude(3,2.) -md=setflowequation(md,'SSA','all') -md.cluster=generic('name',gethostname(),'np',3) -md=solve(md,'Stressbalance') +md = triangle(model(), '../Exp/Square.exp', 180000) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelf.py') +md.extrude(3, 2.) +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'Stressbalance') # Fields and tolerances to track changes -field_names =['Vx','Vy','Vz','Vel','Pressure'] -field_tolerances=[1e-13,1e-13,1e-13,1e-13,1e-13] -field_values=[\ - md.results.StressbalanceSolution.Vx,\ - md.results.StressbalanceSolution.Vy,\ - md.results.StressbalanceSolution.Vz,\ - md.results.StressbalanceSolution.Vel,\ - md.results.StressbalanceSolution.Pressure,\ - ] +field_names = ['Vx', 'Vy', 'Vz', 'Vel', 'Pressure'] +field_tolerances = [1e-13, 1e-13, 1e-13, 1e-13, 1e-13] +field_values = [md.results.StressbalanceSolution.Vx, + md.results.StressbalanceSolution.Vy, + md.results.StressbalanceSolution.Vz, + md.results.StressbalanceSolution.Vel, + md.results.StressbalanceSolution.Pressure] Index: /issm/trunk-jpl/test/NightlyRun/test203.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test203.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test203.py (revision 23793) @@ -3,5 +3,4 @@ from model import * from socket import gethostname -import numpy as np from triangle import * from setmask import * @@ -11,22 +10,20 @@ from generic import generic -md=triangle(model(),'../Exp/Square.exp',180000) -md=setmask(md,'all','') -md=parameterize(md,'../Par/SquareShelf.py') -md.extrude(3,2.) -md=setflowequation(md,'HO','all') -md.cluster=generic('name',gethostname(),'np',3) -md=solve(md,'Stressbalance') +md = triangle(model(), '../Exp/Square.exp', 180000) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelf.py') +md.extrude(3, 2.) +md = setflowequation(md, 'HO', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'Stressbalance') # Fields and tolerances to track changes -field_names =['Vx','Vy','Vz','Vel','Pressure'] -field_tolerances=[2e-09,2e-09,1e-09,2e-09,1e-09] -field_values=[\ - md.results.StressbalanceSolution.Vx,\ - md.results.StressbalanceSolution.Vy,\ - md.results.StressbalanceSolution.Vz,\ - md.results.StressbalanceSolution.Vel,\ - md.results.StressbalanceSolution.Pressure,\ - ] +field_names = ['Vx', 'Vy', 'Vz', 'Vel', 'Pressure'] +field_tolerances = [2e-09, 2e-09, 1e-09, 2e-09, 1e-09] +field_values = [md.results.StressbalanceSolution.Vx, + md.results.StressbalanceSolution.Vy, + md.results.StressbalanceSolution.Vz, + md.results.StressbalanceSolution.Vel, + md.results.StressbalanceSolution.Pressure] Index: /issm/trunk-jpl/test/NightlyRun/test204.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test204.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test204.py (revision 23793) @@ -3,5 +3,4 @@ from model import * from socket import gethostname -import numpy as np from triangle import * from setmask import * @@ -11,26 +10,24 @@ from generic import generic -md=triangle(model(),'../Exp/Square.exp',180000) -md=setmask(md,'all','') -md=parameterize(md,'../Par/SquareShelf.py') -md.extrude(3,2.) -md=setflowequation(md,'FS','all') -md.cluster=generic('name',gethostname(),'np',3) -md.stressbalance.shelf_dampening=1 -md.timestepping.time_step=0 -md1=solve(md,'Stressbalance') -md.stressbalance.shelf_dampening=0 -md=solve(md,'Stressbalance') +md = triangle(model(), '../Exp/Square.exp', 180000) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelf.py') +md.extrude(3, 2.) +md = setflowequation(md, 'FS', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) +md.stressbalance.shelf_dampening = 1 +md.timestepping.time_step = 0 +md1 = solve(md, 'Stressbalance') +md.stressbalance.shelf_dampening = 0 +md = solve(md, 'Stressbalance') # Fields and tolerances to track changes -field_names =['Vx','Vy','Vz','Vel','Pressure'] -field_tolerances=[1e-08,1e-08,4e-06,1e-08,1e-08] -field_values=[\ - md.results.StressbalanceSolution.Vx,\ - md.results.StressbalanceSolution.Vy,\ - md.results.StressbalanceSolution.Vz,\ - md.results.StressbalanceSolution.Vel,\ - md.results.StressbalanceSolution.Pressure,\ - ] +field_names = ['Vx', 'Vy', 'Vz', 'Vel', 'Pressure'] +field_tolerances = [1e-08, 1e-08, 4e-06, 1e-08, 1e-08] +field_values = [md.results.StressbalanceSolution.Vx, + md.results.StressbalanceSolution.Vy, + md.results.StressbalanceSolution.Vz, + md.results.StressbalanceSolution.Vel, + md.results.StressbalanceSolution.Pressure] Index: /issm/trunk-jpl/test/NightlyRun/test205.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test205.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test205.py (revision 23793) @@ -3,5 +3,4 @@ from model import * from socket import gethostname -import numpy as np from triangle import * from setmask import * @@ -11,22 +10,20 @@ from generic import generic -md=triangle(model(),'../Exp/Square.exp',150000) -md=setmask(md,'all','') -md=parameterize(md,'../Par/SquareShelf.py') -md.extrude(3,2.) -md=setflowequation(md,'HO','../Exp/SquareHalfRight.exp','fill','SSA','coupling','penalties') -md.cluster=generic('name',gethostname(),'np',3) -md=solve(md,'Stressbalance') +md = triangle(model(), '../Exp/Square.exp', 150000) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelf.py') +md.extrude(3, 2.) +md = setflowequation(md, 'HO', '../Exp/SquareHalfRight.exp', 'fill', 'SSA', 'coupling', 'penalties') +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'Stressbalance') # Fields and tolerances to track changes -field_names =['Vx','Vy','Vz','Vel','Pressure'] -field_tolerances=[2e-05,2e-05,1e-05,1e-05,1e-05] -field_values=[\ -md.results.StressbalanceSolution.Vx,\ -md.results.StressbalanceSolution.Vy,\ -md.results.StressbalanceSolution.Vz,\ -md.results.StressbalanceSolution.Vel,\ -md.results.StressbalanceSolution.Pressure,\ -] +field_names = ['Vx', 'Vy', 'Vz', 'Vel', 'Pressure'] +field_tolerances = [2e-05, 2e-05, 1e-05, 1e-05, 1e-05] +field_values = [md.results.StressbalanceSolution.Vx, + md.results.StressbalanceSolution.Vy, + md.results.StressbalanceSolution.Vz, + md.results.StressbalanceSolution.Vel, + md.results.StressbalanceSolution.Pressure] Index: /issm/trunk-jpl/test/NightlyRun/test2051.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test2051.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test2051.py (revision 23793) @@ -8,30 +8,28 @@ from parameterize import * -# Benchmark experiments (Figure A2a Ivins and James, 1999, Geophys. J. Int.) -md = triangle(model(),'../Exp/RoundFrontEISMINT.exp',200000.) -md = setmask(md,'','') -md = parameterize(md,'../Par/GiaIvinsBenchmarksAB.py') +# Benchmark experiments (Figure A2a Ivins and James, 1999, Geophys. J. Int.) +md = triangle(model(), '../Exp/RoundFrontEISMINT.exp', 200000.) +md = setmask(md, '', '') +md = parameterize(md, '../Par/GiaIvinsBenchmarksAB.py') -# indicate what you want to compute -md.gia.cross_section_shape = 1 # for square-edged x-section +# indicate what you want to compute +md.gia.cross_section_shape = 1 # for square-edged x-section -# define loading history -md.timestepping.start_time = 2002100 # after 2 kyr of deglaciation -md.timestepping.final_time = 2500000 # 2,500 kyr -md.geometry.thickness = np.array([ - np.append(md.geometry.thickness * 0.0 ,0.0), - np.append(md.geometry.thickness, 1000), - np.append(md.geometry.thickness, 2000000), - np.append(md.geometry.thickness * 0.0, 2000100), - np.append(md.geometry.thickness * 0.0, md.timestepping.start_time) - ]).T +# define loading history +md.timestepping.start_time = 2002100 # after 2 kyr of deglaciation +md.timestepping.final_time = 2500000 # 2, 500 kyr +md.geometry.thickness = np.array([np.append(md.geometry.thickness * 0.0, 0.0), + np.append(md.geometry.thickness, 1000), + np.append(md.geometry.thickness, 2000000), + np.append(md.geometry.thickness * 0.0, 2000100), + np.append(md.geometry.thickness * 0.0, md.timestepping.start_time)]).T -# solve for GIA deflection -md.cluster=generic('name',gethostname(),'np',3) +# solve for GIA deflection +md.cluster = generic('name', gethostname(), 'np', 3) md.verbose = verbose('1111111') -md = solve(md,'Gia') +md = solve(md, 'Gia') #Fields and tolerances to track changes -field_names = ['GiaW','GiadWdt'] -field_tolerances = [1e-13,1e-13] +field_names = ['GiaW', 'GiadWdt'] +field_tolerances = [1e-13, 1e-13] field_values = [md.results.GiaSolution.GiaW, md.results.GiaSolution.GiadWdt] Index: /issm/trunk-jpl/test/NightlyRun/test2052.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test2052.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test2052.py (revision 23793) @@ -8,30 +8,28 @@ from parameterize import * -#Benchmark experiments (Figure A2a Ivins and James, 1999, Geophys. J. Int.) -md = triangle(model(),'../Exp/RoundFrontEISMINT.exp',200000) -md = setmask(md,'','') -md = parameterize(md,'../Par/GiaIvinsBenchmarksAB.py') +#Benchmark experiments (Figure A2a Ivins and James, 1999, Geophys. J. Int.) +md = triangle(model(), '../Exp/RoundFrontEISMINT.exp', 200000) +md = setmask(md, '', '') +md = parameterize(md, '../Par/GiaIvinsBenchmarksAB.py') -#indicate what you want to compute -md.gia.cross_section_shape = 1 # for square-edged x-section +#indicate what you want to compute +md.gia.cross_section_shape = 1 # for square-edged x-section -#define loading history -md.timestepping.start_time = 2005100 # after 5 kyr of deglaciation -md.timestepping.final_time = 2500000 # 2,500 kyr -md.geometry.thickness = np.array([ - np.append(md.geometry.thickness * 0.0 ,0.0), - np.append(md.geometry.thickness, 1000), - np.append(md.geometry.thickness, 2000000), - np.append(md.geometry.thickness * 0.0, 2000100), - np.append(md.geometry.thickness * 0.0, md.timestepping.start_time) - ]).T +#define loading history +md.timestepping.start_time = 2005100 # after 5 kyr of deglaciation +md.timestepping.final_time = 2500000 # 2, 500 kyr +md.geometry.thickness = np.array([np.append(md.geometry.thickness * 0.0, 0.0), + np.append(md.geometry.thickness, 1000), + np.append(md.geometry.thickness, 2000000), + np.append(md.geometry.thickness * 0.0, 2000100), + np.append(md.geometry.thickness * 0.0, md.timestepping.start_time)]).T -#solve for GIA deflection -md.cluster = generic('name',gethostname(),'np',3) +#solve for GIA deflection +md.cluster = generic('name', gethostname(), 'np', 3) md.verbose = verbose('1111111') -md = solve(md,'Gia') +md = solve(md, 'Gia') #Fields and tolerances to track changes -field_names = ['GiaW','GiadWdt'] -field_tolerances = [1e-13,1e-13] -field_values = [md.results.GiaSolution.GiaW,md.results.GiaSolution.GiadWdt] +field_names = ['GiaW', 'GiadWdt'] +field_tolerances = [1e-13, 1e-13] +field_values = [md.results.GiaSolution.GiaW, md.results.GiaSolution.GiadWdt] Index: /issm/trunk-jpl/test/NightlyRun/test2053.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test2053.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test2053.py (revision 23793) @@ -8,30 +8,28 @@ from parameterize import * -#Benchmark experiments (Figure A2a Ivins and James, 1999, Geophys. J. Int.) -md = triangle(model(),'../Exp/RoundFrontEISMINT.exp',200000) -md = setmask(md,'','') -md = parameterize(md,'../Par/GiaIvinsBenchmarksAB.py') +#Benchmark experiments (Figure A2a Ivins and James, 1999, Geophys. J. Int.) +md = triangle(model(), '../Exp/RoundFrontEISMINT.exp', 200000) +md = setmask(md, '', '') +md = parameterize(md, '../Par/GiaIvinsBenchmarksAB.py') -#indicate what you want to compute -md.gia.cross_section_shape = 1 # for square-edged x-section +#indicate what you want to compute +md.gia.cross_section_shape = 1 # for square-edged x-section -#define loading history -md.timestepping.start_time = 2010100 # after 10 kyr of deglaciation -md.timestepping.final_time = 2500000 # 2,500 kyr -md.geometry.thickness = np.array([ - np.append(md.geometry.thickness * 0.0 ,0.0), - np.append(md.geometry.thickness, 1000), - np.append(md.geometry.thickness, 2000000), - np.append(md.geometry.thickness * 0.0, 2000100), - np.append(md.geometry.thickness * 0.0, md.timestepping.start_time) - ]).T +#define loading history +md.timestepping.start_time = 2010100 # after 10 kyr of deglaciation +md.timestepping.final_time = 2500000 # 2, 500 kyr +md.geometry.thickness = np.array([np.append(md.geometry.thickness * 0.0, 0.0), + np.append(md.geometry.thickness, 1000), + np.append(md.geometry.thickness, 2000000), + np.append(md.geometry.thickness * 0.0, 2000100), + np.append(md.geometry.thickness * 0.0, md.timestepping.start_time)]).T -#solve for GIA deflection -md.cluster = generic('name',gethostname(),'np',3) +#solve for GIA deflection +md.cluster = generic('name', gethostname(), 'np', 3) md.verbose = verbose('1111111') -md = solve(md,'Gia') +md = solve(md, 'Gia') #Fields and tolerances to track changes -field_names = ['GiaW','GiadWdt'] -field_tolerances = [1e-13,1e-13] -field_values = [md.results.GiaSolution.GiaW,md.results.GiaSolution.GiadWdt] +field_names = ['GiaW', 'GiadWdt'] +field_tolerances = [1e-13, 1e-13] +field_values = [md.results.GiaSolution.GiaW, md.results.GiaSolution.GiadWdt] Index: /issm/trunk-jpl/test/NightlyRun/test206.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test206.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test206.py (revision 23793) @@ -3,5 +3,4 @@ from model import * from socket import gethostname -import numpy as np from triangle import * from setmask import * @@ -11,18 +10,17 @@ from generic import generic -md=triangle(model(),'../Exp/Square.exp',180000) -md=setmask(md,'all','') -md=parameterize(md,'../Par/SquareShelf.py') -md.extrude(3,1.) -md=setflowequation(md,'SSA','all') -md.timestepping.time_step=0 -md.cluster=generic('name',gethostname(),'np',3) -md=solve(md,'Thermal') +md = triangle(model(), '../Exp/Square.exp', 180000) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelf.py') +md.extrude(3, 1.) +md = setflowequation(md, 'SSA', 'all') +md.timestepping.time_step = 0 +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'Thermal') # Fields and tolerances to track changes -field_names =['Temperature','BasalforcingsGroundediceMeltingRate'] -field_tolerances=[1e-13,5e-6] -field_values=[md.results.ThermalSolution.Temperature, - md.results.ThermalSolution.BasalforcingsGroundediceMeltingRate] +field_names = ['Temperature', 'BasalforcingsGroundediceMeltingRate'] +field_tolerances = [1e-13, 5e-6] +field_values = [md.results.ThermalSolution.Temperature, md.results.ThermalSolution.BasalforcingsGroundediceMeltingRate] Index: /issm/trunk-jpl/test/NightlyRun/test207.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test207.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test207.py (revision 23793) @@ -3,5 +3,4 @@ from model import * from socket import gethostname -import numpy as np from triangle import * from setmask import * @@ -11,26 +10,24 @@ from generic import generic -md=triangle(model(),'../Exp/Square.exp',180000) -md=setmask(md,'all','') -md=parameterize(md,'../Par/SquareShelf.py') -md.extrude(3,1.) -md=setflowequation(md,'SSA','all') -md.cluster=generic('name',gethostname(),'np',3) -md.transient.isstressbalance=False -md.transient.ismasstransport=False -md.transient.issmb=True -md.transient.isthermal=True -md.transient.isgroundingline=False -md=solve(md,'Transient') +md = triangle(model(), '../Exp/Square.exp', 180000) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelf.py') +md.extrude(3, 1.) +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) +md.transient.isstressbalance = False +md.transient.ismasstransport = False +md.transient.issmb = True +md.transient.isthermal = True +md.transient.isgroundingline = False +md = solve(md, 'Transient') # Fields and tolerances to track changes -field_names =['Temperature1','BasalforcingsGroundediceMeltingRate1','Temperature2','BasalforcingsGroundediceMeltingRate2','Temperature3','BasalforcingsGroundediceMeltingRate3'] -field_tolerances=[1e-13,1e-6,1e-13,1e-6,1e-13,1e-6] -field_values=[\ - md.results.TransientSolution[0].Temperature,\ - md.results.TransientSolution[0].BasalforcingsGroundediceMeltingRate,\ - md.results.TransientSolution[1].Temperature,\ - md.results.TransientSolution[1].BasalforcingsGroundediceMeltingRate,\ - md.results.TransientSolution[2].Temperature,\ - md.results.TransientSolution[2].BasalforcingsGroundediceMeltingRate,\ - ] +field_names = ['Temperature1', 'BasalforcingsGroundediceMeltingRate1', 'Temperature2', 'BasalforcingsGroundediceMeltingRate2', 'Temperature3', 'BasalforcingsGroundediceMeltingRate3'] +field_tolerances = [1e-13, 1e-6, 1e-13, 1e-6, 1e-13, 1e-6] +field_values = [md.results.TransientSolution[0].Temperature, + md.results.TransientSolution[0].BasalforcingsGroundediceMeltingRate, + md.results.TransientSolution[1].Temperature, + md.results.TransientSolution[1].BasalforcingsGroundediceMeltingRate, + md.results.TransientSolution[2].Temperature, + md.results.TransientSolution[2].BasalforcingsGroundediceMeltingRate] Index: /issm/trunk-jpl/test/NightlyRun/test2071.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test2071.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test2071.py (revision 23793) @@ -8,29 +8,27 @@ from parameterize import * -#Benchmark experiments (Figure A2c Ivins and James, 1999, Geophys. J. Int.) -md = triangle(model(),'../Exp/RoundFrontEISMINT.exp',200000) -md = setmask(md,'','') -md = parameterize(md,'../Par/GiaIvinsBenchmarksCD.py') +#Benchmark experiments (Figure A2c Ivins and James, 1999, Geophys. J. Int.) +md = triangle(model(), '../Exp/RoundFrontEISMINT.exp', 200000) +md = setmask(md, '', '') +md = parameterize(md, '../Par/GiaIvinsBenchmarksCD.py') -#indicate what you want to compute -md.gia.cross_section_shape = 1 # for square-edged x-section +#indicate what you want to compute +md.gia.cross_section_shape = 1 # for square-edged x-section -#define loading history -md.timestepping.start_time = 0.3 # for t \approx 0 kyr : to get eleastic response! -md.timestepping.final_time = 2500000 # 2,500 kyr -md.geometry.thickness = np.array([ - np.append(md.geometry.thickness * 0.0, 0.0), - np.append(md.geometry.thickness / 2.0, 0.1), - np.append(md.geometry.thickness, 0.2), - np.append(md.geometry.thickness, md.timestepping.start_time) - ]).T +#define loading history +md.timestepping.start_time = 0.3 # for t \approx 0 kyr : to get eleastic response! +md.timestepping.final_time = 2500000 # 2, 500 kyr +md.geometry.thickness = np.array([np.append(md.geometry.thickness * 0.0, 0.0), + np.append(md.geometry.thickness / 2.0, 0.1), + np.append(md.geometry.thickness, 0.2), + np.append(md.geometry.thickness, md.timestepping.start_time)]).T -#solve for GIA deflection -md.cluster = generic('name',gethostname(),'np',3) +#solve for GIA deflection +md.cluster = generic('name', gethostname(), 'np', 3) md.verbose = verbose('1111111') -md = solve(md,'Gia') +md = solve(md, 'Gia') #Fields and tolerances to track changes -field_names = ['GiaW','GiadWdt'] -field_tolerances = [1e-13,1e-13] +field_names = ['GiaW', 'GiadWdt'] +field_tolerances = [1e-13, 1e-13] field_values = [md.results.GiaSolution.GiaW, md.results.GiaSolution.GiadWdt] Index: /issm/trunk-jpl/test/NightlyRun/test2072.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test2072.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test2072.py (revision 23793) @@ -8,29 +8,27 @@ from parameterize import * -#Benchmark experiments (Figure A2c Ivins and James, 1999, Geophys. J. Int.) -md = triangle(model(),'../Exp/RoundFrontEISMINT.exp',200000) -md = setmask(md,'','') -md = parameterize(md,'../Par/GiaIvinsBenchmarksCD.py') +#Benchmark experiments (Figure A2c Ivins and James, 1999, Geophys. J. Int.) +md = triangle(model(), '../Exp/RoundFrontEISMINT.exp', 200000) +md = setmask(md, '', '') +md = parameterize(md, '../Par/GiaIvinsBenchmarksCD.py') -#indicate what you want to compute -md.gia.cross_section_shape = 1 # for square-edged x-section +#indicate what you want to compute +md.gia.cross_section_shape = 1 # for square-edged x-section -#define loading history -md.timestepping.start_time = 1000.3 # for t \approx 1 kyr -md.timestepping.final_time = 2500000 # 2,500 kyr -md.geometry.thickness = np.array([ - np.append(md.geometry.thickness * 0.0, 0.0), - np.append(md.geometry.thickness / 2.0, 0.1), - np.append(md.geometry.thickness, 0.2), - np.append(md.geometry.thickness, md.timestepping.start_time) - ]).T +#define loading history +md.timestepping.start_time = 1000.3 # for t \approx 1 kyr +md.timestepping.final_time = 2500000 # 2, 500 kyr +md.geometry.thickness = np.array([np.append(md.geometry.thickness * 0.0, 0.0), + np.append(md.geometry.thickness / 2.0, 0.1), + np.append(md.geometry.thickness, 0.2), + np.append(md.geometry.thickness, md.timestepping.start_time)]).T -#solve for GIA deflection -md.cluster = generic('name',gethostname(),'np',3) +#solve for GIA deflection +md.cluster = generic('name', gethostname(), 'np', 3) md.verbose = verbose('1111111') -md = solve(md,'Gia') +md = solve(md, 'Gia') #Fields and tolerances to track changes -field_names = ['GiaW','GiadWdt'] -field_tolerances = [1e-13,1e-13] +field_names = ['GiaW', 'GiadWdt'] +field_tolerances = [1e-13, 1e-13] field_values = [md.results.GiaSolution.GiaW, md.results.GiaSolution.GiadWdt] Index: /issm/trunk-jpl/test/NightlyRun/test2073.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test2073.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test2073.py (revision 23793) @@ -8,29 +8,27 @@ from parameterize import * -#Benchmark experiments (Figure A2c Ivins and James, 1999, Geophys. J. Int.) -md = triangle(model(),'../Exp/RoundFrontEISMINT.exp',200000) -md = setmask(md,'','') -md = parameterize(md,'../Par/GiaIvinsBenchmarksCD.py') +#Benchmark experiments (Figure A2c Ivins and James, 1999, Geophys. J. Int.) +md = triangle(model(), '../Exp/RoundFrontEISMINT.exp', 200000) +md = setmask(md, '', '') +md = parameterize(md, '../Par/GiaIvinsBenchmarksCD.py') -#indicate what you want to compute -md.gia.cross_section_shape = 1 # for square-edged x-section +#indicate what you want to compute +md.gia.cross_section_shape = 1 # for square-edged x-section -#define loading history -md.timestepping.start_time = 2400000 # for t \approx \infty -md.timestepping.final_time = 2500000 # 2,500 kyr -md.geometry.thickness = np.array([ - np.append(md.geometry.thickness * 0.0, 0.0), - np.append(md.geometry.thickness / 2.0, 0.1), - np.append(md.geometry.thickness, 0.2), - np.append(md.geometry.thickness, md.timestepping.start_time) - ]).T +#define loading history +md.timestepping.start_time = 2400000 # for t \approx \infty +md.timestepping.final_time = 2500000 # 2, 500 kyr +md.geometry.thickness = np.array([np.append(md.geometry.thickness * 0.0, 0.0), + np.append(md.geometry.thickness / 2.0, 0.1), + np.append(md.geometry.thickness, 0.2), + np.append(md.geometry.thickness, md.timestepping.start_time)]).T -#solve for GIA deflection -md.cluster = generic('name',gethostname(),'np',3) +#solve for GIA deflection +md.cluster = generic('name', gethostname(), 'np', 3) md.verbose = verbose('1111111') -md = solve(md,'Gia') +md = solve(md, 'Gia') #Fields and tolerances to track changes -field_names = ['GiaW','GiadWdt'] -field_tolerances = [1e-13,1e-13] +field_names = ['GiaW', 'GiadWdt'] +field_tolerances = [1e-13, 1e-13] field_values = [md.results.GiaSolution.GiaW, md.results.GiaSolution.GiadWdt] Index: /issm/trunk-jpl/test/NightlyRun/test208.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test208.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test208.py (revision 23793) @@ -3,5 +3,4 @@ from model import * from socket import gethostname -import numpy as np from triangle import * from setmask import * @@ -11,45 +10,53 @@ from generic import generic -md=triangle(model(),'../Exp/Square.exp',150000) -md=setmask(md,'all','') -md=parameterize(md,'../Par/SquareShelf.py') -md.basalforcings.floatingice_melting_rate[:]=1. -md=setflowequation(md,'SSA','all') -md.cluster=generic('name',gethostname(),'np',3) -md.transient.requested_outputs=['default','FloatingArea','GroundedArea','TotalFloatingBmb','TotalGroundedBmb'] -md=solve(md,'Transient') +md = triangle(model(), '../Exp/Square.exp', 150000) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelf.py') +md.basalforcings.floatingice_melting_rate[:] = 1. +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) +md.transient.requested_outputs = ['default', 'FloatingArea', 'GroundedArea', 'TotalFloatingBmb', 'TotalGroundedBmb'] +md = solve(md, 'Transient') # Fields and tolerances to track changes -field_names =['Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','TotalGroundedBmb1','TotalFloatingBmb1','Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2','TotalGroundedBmb2','TotalFloatingBmb2','Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3','TotalGroundedBmb3','TotalFloatingBmb3'] -field_tolerances=[1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13] -field_values=[\ - md.results.TransientSolution[0].Vx,\ - md.results.TransientSolution[0].Vy,\ - md.results.TransientSolution[0].Vel,\ - md.results.TransientSolution[0].Pressure,\ - md.results.TransientSolution[0].Base,\ - md.results.TransientSolution[0].Surface,\ - md.results.TransientSolution[0].Thickness,\ - md.results.TransientSolution[0].TotalGroundedBmb,\ - md.results.TransientSolution[0].TotalFloatingBmb,\ - md.results.TransientSolution[1].Vx,\ - md.results.TransientSolution[1].Vy,\ - md.results.TransientSolution[1].Vel,\ - md.results.TransientSolution[1].Pressure,\ - md.results.TransientSolution[1].Base,\ - md.results.TransientSolution[1].Surface,\ - md.results.TransientSolution[1].Thickness,\ - md.results.TransientSolution[1].TotalGroundedBmb,\ - md.results.TransientSolution[1].TotalFloatingBmb,\ - md.results.TransientSolution[2].Vx,\ - md.results.TransientSolution[2].Vy,\ - md.results.TransientSolution[2].Vel,\ - md.results.TransientSolution[2].Pressure,\ - md.results.TransientSolution[2].Base,\ - md.results.TransientSolution[2].Surface,\ - md.results.TransientSolution[2].Thickness,\ - md.results.TransientSolution[2].TotalGroundedBmb,\ - md.results.TransientSolution[2].TotalFloatingBmb,\ - ] +field_names = ['Vx1', 'Vy1', 'Vel1', 'Pressure1', + 'Bed1', 'Surface1', 'Thickness1', 'TotalGroundedBmb1', 'TotalFloatingBmb1', + 'Vx2', 'Vy2', 'Vel2', 'Pressure2', + 'Bed2', 'Surface2', 'Thickness2', 'TotalGroundedBmb2', 'TotalFloatingBmb2', + 'Vx3', 'Vy3', 'Vel3', 'Pressure3', + 'Bed3', 'Surface3', 'Thickness3', 'TotalGroundedBmb3', 'TotalFloatingBmb3'] +field_tolerances = [1e-13, 1e-13, 1e-13, 1e-13, + 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, + 1e-13, 1e-13, 1e-13, 1e-13, + 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, + 1e-13, 1e-13, 1e-13, 1e-13, + 1e-13, 1e-13, 1e-13, 1e-13, 1e-13] +field_values = [md.results.TransientSolution[0].Vx, + md.results.TransientSolution[0].Vy, + md.results.TransientSolution[0].Vel, + md.results.TransientSolution[0].Pressure, + md.results.TransientSolution[0].Base, + md.results.TransientSolution[0].Surface, + md.results.TransientSolution[0].Thickness, + md.results.TransientSolution[0].TotalGroundedBmb, + md.results.TransientSolution[0].TotalFloatingBmb, + md.results.TransientSolution[1].Vx, + md.results.TransientSolution[1].Vy, + md.results.TransientSolution[1].Vel, + md.results.TransientSolution[1].Pressure, + md.results.TransientSolution[1].Base, + md.results.TransientSolution[1].Surface, + md.results.TransientSolution[1].Thickness, + md.results.TransientSolution[1].TotalGroundedBmb, + md.results.TransientSolution[1].TotalFloatingBmb, + md.results.TransientSolution[2].Vx, + md.results.TransientSolution[2].Vy, + md.results.TransientSolution[2].Vel, + md.results.TransientSolution[2].Pressure, + md.results.TransientSolution[2].Base, + md.results.TransientSolution[2].Surface, + md.results.TransientSolution[2].Thickness, + md.results.TransientSolution[2].TotalGroundedBmb, + md.results.TransientSolution[2].TotalFloatingBmb] Index: /issm/trunk-jpl/test/NightlyRun/test2081.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test2081.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test2081.py (revision 23793) @@ -8,29 +8,27 @@ from parameterize import * -#Benchmark experiments (Figure A2c Ivins and James, 1999, Geophys. J. Int.) -md = triangle(model(),'../Exp/RoundFrontEISMINT.exp',200000) -md = setmask(md,'','') -md = parameterize(md,'../Par/GiaIvinsBenchmarksCD.py') +#Benchmark experiments (Figure A2c Ivins and James, 1999, Geophys. J. Int.) +md = triangle(model(), '../Exp/RoundFrontEISMINT.exp', 200000) +md = setmask(md, '', '') +md = parameterize(md, '../Par/GiaIvinsBenchmarksCD.py') -#indicate what you want to compute -md.gia.cross_section_shape = 2 # for square-edged x-section +#indicate what you want to compute +md.gia.cross_section_shape = 2 # for square-edged x-section -#define loading history -md.timestepping.start_time = 0.3 # for t \approx 0 kyr : to get eleastic response! -md.timestepping.final_time = 2500000 # 2,500 kyr -md.geometry.thickness = np.array([ - np.append(md.geometry.thickness * 0.0, 0.0), - np.append(md.geometry.thickness / 2.0, 0.1), - np.append(md.geometry.thickness, 0.2), - np.append(md.geometry.thickness, md.timestepping.start_time) - ]).T +#define loading history +md.timestepping.start_time = 0.3 # for t \approx 0 kyr : to get eleastic response! +md.timestepping.final_time = 2500000 # 2, 500 kyr +md.geometry.thickness = np.array([np.append(md.geometry.thickness * 0.0, 0.0), + np.append(md.geometry.thickness / 2.0, 0.1), + np.append(md.geometry.thickness, 0.2), + np.append(md.geometry.thickness, md.timestepping.start_time)]).T -#solve for GIA deflection -md.cluster = generic('name',gethostname(),'np',3) +#solve for GIA deflection +md.cluster = generic('name', gethostname(), 'np', 3) md.verbose = verbose('1111111') -md = solve(md,'Gia') +md = solve(md, 'Gia') #Fields and tolerances to track changes -field_names = ['GiaW','GiadWdt'] -field_tolerances = [1e-13,1e-13] +field_names = ['GiaW', 'GiadWdt'] +field_tolerances = [1e-13, 1e-13] field_values = [md.results.GiaSolution.GiaW, md.results.GiaSolution.GiadWdt] Index: /issm/trunk-jpl/test/NightlyRun/test2082.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test2082.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test2082.py (revision 23793) @@ -8,29 +8,27 @@ from parameterize import * -#Benchmark experiments (Figure A2c Ivins and James, 1999, Geophys. J. Int.) -md = triangle(model(),'../Exp/RoundFrontEISMINT.exp',200000) -md = setmask(md,'','') -md = parameterize(md,'../Par/GiaIvinsBenchmarksCD.py') +#Benchmark experiments (Figure A2c Ivins and James, 1999, Geophys. J. Int.) +md = triangle(model(), '../Exp/RoundFrontEISMINT.exp', 200000) +md = setmask(md, '', '') +md = parameterize(md, '../Par/GiaIvinsBenchmarksCD.py') -#indicate what you want to compute -md.gia.cross_section_shape = 2 # for square-edged x-section +#indicate what you want to compute +md.gia.cross_section_shape = 2 # for square-edged x-section -#define loading history -md.timestepping.start_time = 1000.3 # for t \approx 1 kyr -md.timestepping.final_time = 2500000 # 2,500 kyr -md.geometry.thickness = np.array([ - np.append(md.geometry.thickness * 0.0, 0.0), - np.append(md.geometry.thickness / 2.0, 0.1), - np.append(md.geometry.thickness, 0.2), - np.append(md.geometry.thickness, md.timestepping.start_time) - ]).T +#define loading history +md.timestepping.start_time = 1000.3 # for t \approx 1 kyr +md.timestepping.final_time = 2500000 # 2, 500 kyr +md.geometry.thickness = np.array([np.append(md.geometry.thickness * 0.0, 0.0), + np.append(md.geometry.thickness / 2.0, 0.1), + np.append(md.geometry.thickness, 0.2), + np.append(md.geometry.thickness, md.timestepping.start_time)]).T -#solve for GIA deflection -md.cluster = generic('name',gethostname(),'np',3) +#solve for GIA deflection +md.cluster = generic('name', gethostname(), 'np', 3) md.verbose = verbose('1111111') -md = solve(md,'Gia') +md = solve(md, 'Gia') #Fields and tolerances to track changes -field_names = ['GiaW','GiadWdt'] -field_tolerances = [1e-13,1e-13] +field_names = ['GiaW', 'GiadWdt'] +field_tolerances = [1e-13, 1e-13] field_values = [md.results.GiaSolution.GiaW, md.results.GiaSolution.GiadWdt] Index: /issm/trunk-jpl/test/NightlyRun/test2083.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test2083.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test2083.py (revision 23793) @@ -8,29 +8,27 @@ from parameterize import * -#Benchmark experiments (Figure A2c Ivins and James, 1999, Geophys. J. Int.) -md = triangle(model(),'../Exp/RoundFrontEISMINT.exp',200000) -md = setmask(md,'','') -md = parameterize(md,'../Par/GiaIvinsBenchmarksCD.py') +#Benchmark experiments (Figure A2c Ivins and James, 1999, Geophys. J. Int.) +md = triangle(model(), '../Exp/RoundFrontEISMINT.exp', 200000) +md = setmask(md, '', '') +md = parameterize(md, '../Par/GiaIvinsBenchmarksCD.py') -#indicate what you want to compute -md.gia.cross_section_shape = 2 # for square-edged x-section +#indicate what you want to compute +md.gia.cross_section_shape = 2 # for square-edged x-section -#define loading history -md.timestepping.start_time = 2400000 # for t \approx \infty -md.timestepping.final_time = 2500000 # 2,500 kyr -md.geometry.thickness = np.array([ - np.append(md.geometry.thickness * 0.0, 0.0), - np.append(md.geometry.thickness / 2.0, 0.1), - np.append(md.geometry.thickness, 0.2), - np.append(md.geometry.thickness, md.timestepping.start_time) - ]).T +#define loading history +md.timestepping.start_time = 2400000 # for t \approx \infty +md.timestepping.final_time = 2500000 # 2, 500 kyr +md.geometry.thickness = np.array([np.append(md.geometry.thickness * 0.0, 0.0), + np.append(md.geometry.thickness / 2.0, 0.1), + np.append(md.geometry.thickness, 0.2), + np.append(md.geometry.thickness, md.timestepping.start_time)]).T -#solve for GIA deflection -md.cluster = generic('name',gethostname(),'np',3) +#solve for GIA deflection +md.cluster = generic('name', gethostname(), 'np', 3) md.verbose = verbose('1111111') -md = solve(md,'Gia') +md = solve(md, 'Gia') #Fields and tolerances to track changes -field_names = ['GiaW','GiadWdt'] -field_tolerances = [1e-13,1e-13] +field_names = ['GiaW', 'GiadWdt'] +field_tolerances = [1e-13, 1e-13] field_values = [md.results.GiaSolution.GiaW, md.results.GiaSolution.GiadWdt] Index: /issm/trunk-jpl/test/NightlyRun/test2084.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test2084.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test2084.py (revision 23793) @@ -14,101 +14,95 @@ from materials import * -md=model() -md.cluster=generic('name',gethostname(),'np',1) +md = model() +md.cluster = generic('name', gethostname(), 'np', 1) -md.materials=materials('litho') -md.miscellaneous.name='FourierLoveTest' -md.groundingline.migration='None' +md.materials = materials('litho') +md.miscellaneous.name = 'FourierLoveTest' +md.groundingline.migration = 'None' -md.verbose=verbose('all') -cst=365.25*24*3600*1000 +md.verbose = verbose('all') +cst = 365.25 * 24 * 3600 * 1000 -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.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,1)) +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.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, 1)) -md.love.allow_layer_deletion=1 -md.love.frequencies=(np.array([0])*2*pi).reshape(-1,1)/cst -md.love.nfreq=len(md.love.frequencies) -md.love.sh_nmax=256 +md.love.allow_layer_deletion = 1 +md.love.frequencies = (np.array([0]) * 2 * pi).reshape(-1, 1) / cst +md.love.nfreq = len(md.love.frequencies) +md.love.sh_nmax = 256 -md.materials.burgers_mu=md.materials.lame_mu -md.materials.burgers_viscosity=md.materials.viscosity +md.materials.burgers_mu = md.materials.lame_mu +md.materials.burgers_viscosity = md.materials.viscosity -md=solve(md,'lv') +md = solve(md, 'lv') #Fields and tolerances to track changes #loading love numbers -field_names=['LoveH_loading_elastic','LoveK_loading_elastic','LoveL_loading_elastic'] -field_tolerances=[4.3e-9,4.3e-9,4.3e-9] -field_values=[ -np.array(md.results.LoveSolution.LoveHr)[:,0], -np.array(md.results.LoveSolution.LoveKr)[:,0], -np.array(md.results.LoveSolution.LoveLr)[:,0] -] +field_names = ['LoveH_loading_elastic', 'LoveK_loading_elastic', 'LoveL_loading_elastic'] +field_tolerances = [4.3e-9, 4.3e-9, 4.3e-9] +field_values = [np.array(md.results.LoveSolution.LoveHr)[:, 0], + np.array(md.results.LoveSolution.LoveKr)[:, 0], + 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.nfreq=len(md.love.frequencies) -md.love.sh_nmax=256 -md.materials.burgers_mu=md.materials.lame_mu -md.materials.burgers_viscosity=md.materials.viscosity +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 +md.materials.burgers_mu = md.materials.lame_mu +md.materials.burgers_viscosity = md.materials.viscosity -md=solve(md,'lv') +md = solve(md, 'lv') #Fields and tolerances to track changes #loading love numbers -field_names+=['LoveH_loading_realpart','LoveK_loading_realpart','LoveL_loading_realpart','LoveH_loading_imagpart','LoveK_loading_imagpart','LoveL_loading_imagpart'] -field_tolerances+=[5e-7,5e-7,5e-7,5e-7,5e-7,5e-7] -field_values+=[ -np.array(md.results.LoveSolution.LoveHr), -np.array(md.results.LoveSolution.LoveKr), -np.array(md.results.LoveSolution.LoveLr), -np.array(md.results.LoveSolution.LoveHi), -np.array(md.results.LoveSolution.LoveKi), -np.array(md.results.LoveSolution.LoveLi) -] +field_names += ['LoveH_loading_realpart', 'LoveK_loading_realpart', 'LoveL_loading_realpart', 'LoveH_loading_imagpart', 'LoveK_loading_imagpart', 'LoveL_loading_imagpart'] +field_tolerances += [5e-7, 5e-7, 5e-7, 5e-7, 5e-7, 5e-7] +field_values += [np.array(md.results.LoveSolution.LoveHr), + np.array(md.results.LoveSolution.LoveKr), + np.array(md.results.LoveSolution.LoveLr), + np.array(md.results.LoveSolution.LoveHi), + np.array(md.results.LoveSolution.LoveKi), + np.array(md.results.LoveSolution.LoveLi)] -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.nfreq=len(md.love.frequencies) +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.nfreq = len(md.love.frequencies) -md=solve(md,'lv') +md = solve(md, 'lv') #tidal love numbers, check -field_names+=['LoveH_tidal_elastic','LoveK_tidal_elastic','LoveL_tidal_elastic','LoveH_tidal_realpart','LoveK_tidal_realpart','LoveL_tidal_realpart','LoveH_tidal_imagpart','LoveK_tidal_imagpart','LoveL_tidal_imagpart'] -field_tolerances+=[8e-6,8e-6,8e-6,8e-6,8e-6,8e-6,8e-6,8e-6,8e-6] -field_values+=[ -np.array(md.results.LoveSolution.LoveHr)[:,0], -np.array(md.results.LoveSolution.LoveKr)[:,0], -np.array(md.results.LoveSolution.LoveLr)[:,0], -np.array(md.results.LoveSolution.LoveHr)[:,1:], -np.array(md.results.LoveSolution.LoveKr)[:,1:], -np.array(md.results.LoveSolution.LoveLr)[:,1:], -np.array(md.results.LoveSolution.LoveHi)[:,1:], -np.array(md.results.LoveSolution.LoveKi)[:,1:], -np.array(md.results.LoveSolution.LoveLi)[:,1:] -] +field_names += ['LoveH_tidal_elastic', 'LoveK_tidal_elastic', 'LoveL_tidal_elastic', 'LoveH_tidal_realpart', 'LoveK_tidal_realpart', 'LoveL_tidal_realpart', 'LoveH_tidal_imagpart', 'LoveK_tidal_imagpart', 'LoveL_tidal_imagpart'] +field_tolerances += [8e-6, 8e-6, 8e-6, 8e-6, 8e-6, 8e-6, 8e-6, 8e-6, 8e-6] +field_values += [np.array(md.results.LoveSolution.LoveHr)[:, 0], + np.array(md.results.LoveSolution.LoveKr)[:, 0], + np.array(md.results.LoveSolution.LoveLr)[:, 0], + np.array(md.results.LoveSolution.LoveHr)[:, 1:], + np.array(md.results.LoveSolution.LoveKr)[:, 1:], + np.array(md.results.LoveSolution.LoveLr)[:, 1:], + np.array(md.results.LoveSolution.LoveHi)[:, 1:], + np.array(md.results.LoveSolution.LoveKi)[:, 1:], + np.array(md.results.LoveSolution.LoveLi)[:, 1:]] #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 -#ind=find(md.materials.issolid==0) +#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 +#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) @@ -119,83 +113,81 @@ #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.burgers_mu=md.materials.lame_mu -#md.materials.burgers_viscosity=md.materials.viscosity -#md.materials.isburgers=md.materials.issolid*0 -#md.love.forcing_type=11 -#md.materials.numlayers=len(md.materials.viscosity) -#md=solve(md,'lv') +#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.burgers_mu = md.materials.lame_mu +#md.materials.burgers_viscosity = md.materials.viscosity +#md.materials.isburgers = md.materials.issolid*0 +#md.love.forcing_type = 11 +#md.materials.numlayers = len(md.materials.viscosity) +#md = solve(md, 'lv') # -#field_names=[field_names,'LoveH_loadingVSS96_elastic','LoveK_loadingVSS96_elastic','LoveL_loadingVSS96_elastic','LoveH_loadingVSS96_realpart','LoveK_loadingVSS96_realpart','LoveL_loadingVSS96_realpart','LoveH_loadingVSS96_imagpart','LoveK_loadingVSS96_imagpart','LoveL_loadingVSS96_imagpart'] -#field_tolerances=[field_tolerances,4.3e-9,4.3e-9,4.3e-9,4.3e-9,4.3e-9,4.3e-9,4.3e-9,4.3e-9,4.3e-9] -#field_values=[field_values,\ -# (md.results.LoveSolution.LoveHr[:][0]),\ -# (md.results.LoveSolution.LoveKr[:][0]),\ -# (md.results.LoveSolution.LoveLr[:][0]),\ -# (md.results.LoveSolution.LoveHr[:][1:]),\ -# (md.results.LoveSolution.LoveKr[:][1:]),\ -# (md.results.LoveSolution.LoveLr[:][1:]),\ -# (md.results.LoveSolution.LoveHi[:][1:]),\ -# (md.results.LoveSolution.LoveKi[:][1:]),\ -# (md.results.LoveSolution.LoveLi[:][1:]),\ -# ] +#field_names = [field_names, 'LoveH_loadingVSS96_elastic', 'LoveK_loadingVSS96_elastic', 'LoveL_loadingVSS96_elastic', 'LoveH_loadingVSS96_realpart', 'LoveK_loadingVSS96_realpart', 'LoveL_loadingVSS96_realpart', 'LoveH_loadingVSS96_imagpart', 'LoveK_loadingVSS96_imagpart', 'LoveL_loadingVSS96_imagpart'] +#field_tolerances = [field_tolerances, 4.3e-9, 4.3e-9, 4.3e-9, 4.3e-9, 4.3e-9, 4.3e-9, 4.3e-9, 4.3e-9, 4.3e-9] +#field_values = [field_values, +# (md.results.LoveSolution.LoveHr[:][0]), +# (md.results.LoveSolution.LoveKr[:][0]), +# (md.results.LoveSolution.LoveLr[:][0]), +# (md.results.LoveSolution.LoveHr[:][1:]), +# (md.results.LoveSolution.LoveKr[:][1:]), +# (md.results.LoveSolution.LoveLr[:][1:]), +# (md.results.LoveSolution.LoveHi[:][1:]), +# (md.results.LoveSolution.LoveKi[:][1:]), +# (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. -md.materials.radius=np.array([10,1222.5,3480.,3600.,3630.5,3700.,3900.,4000., - 4200.,4300.,4500.,4600.,4800.,4900.,5100.,5200., - 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 -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 -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, - 4844.22,4734.6,4678.44,4563.07,4503.72,4443.16, - 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) -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[1]=0 -md.materials.numlayers=len(md.materials.lame_mu) -md.materials.burgers_mu=md.materials.lame_mu -md.materials.burgers_viscosity=md.materials.viscosity -md.materials.isburgers=md.materials.issolid*0 -md.love.forcing_type=11 -md.love.sh_nmin=1 -md.love.sh_nmax=100 +md.materials.radius = np.array([10, 1222.5, 3480., 3600., 3630.5, 3700., 3900., 4000., + 4200., 4300., 4500., 4600., 4800., 4900., 5100., 5200., + 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 +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 +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, + 4844.22, 4734.6, 4678.44, 4563.07, 4503.72, 4443.16, + 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) +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[1] = 0 +md.materials.numlayers = len(md.materials.lame_mu) +md.materials.burgers_mu = md.materials.lame_mu +md.materials.burgers_viscosity = md.materials.viscosity +md.materials.isburgers = md.materials.issolid * 0 +md.love.forcing_type = 11 +md.love.sh_nmin = 1 +md.love.sh_nmax = 100 -md=solve(md,'lv') +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.nfreq=len(md.love.frequencies) +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) -field_names+=['LoveH_loadingVSS96_elastic','LoveK_loadingVSS96_elastic','LoveL_loadingVSS96_elastic','LoveH_loadingVSS96_realpart','LoveK_loadingVSS96_realpart','LoveL_loadingVSS96_realpart','LoveH_loadingVSS96_imagpart','LoveK_loadingVSS96_imagpart','LoveL_loadingVSS96_imagpart'] -field_tolerances+=[2e-6,2e-6,2e-6,2e-6,2e-6,2e-6,2e-6,2e-6,2e-6] -field_values+=[ -np.array(md.results.LoveSolution.LoveHr)[:,0], -np.array(md.results.LoveSolution.LoveKr)[:,0], -np.array(md.results.LoveSolution.LoveLr)[:,0], -np.array(md.results.LoveSolution.LoveHr)[:,1:], -np.array(md.results.LoveSolution.LoveKr)[:,1:], -np.array(md.results.LoveSolution.LoveLr)[:,1:], -np.array(md.results.LoveSolution.LoveHi)[:,1:], -np.array(md.results.LoveSolution.LoveKi)[:,1:], -np.array(md.results.LoveSolution.LoveLi)[:,1:] -] +field_names += ['LoveH_loadingVSS96_elastic', 'LoveK_loadingVSS96_elastic', 'LoveL_loadingVSS96_elastic', 'LoveH_loadingVSS96_realpart', 'LoveK_loadingVSS96_realpart', 'LoveL_loadingVSS96_realpart', 'LoveH_loadingVSS96_imagpart', 'LoveK_loadingVSS96_imagpart', 'LoveL_loadingVSS96_imagpart'] +field_tolerances += [2e-6, 2e-6, 2e-6, 2e-6, 2e-6, 2e-6, 2e-6, 2e-6, 2e-6] +field_values += [np.array(md.results.LoveSolution.LoveHr)[:, 0], + np.array(md.results.LoveSolution.LoveKr)[:, 0], + np.array(md.results.LoveSolution.LoveLr)[:, 0], + np.array(md.results.LoveSolution.LoveHr)[:, 1:], + np.array(md.results.LoveSolution.LoveKr)[:, 1:], + np.array(md.results.LoveSolution.LoveLr)[:, 1:], + np.array(md.results.LoveSolution.LoveHi)[:, 1:], + np.array(md.results.LoveSolution.LoveKi)[:, 1:], + np.array(md.results.LoveSolution.LoveLi)[:, 1:]] Index: /issm/trunk-jpl/test/NightlyRun/test2085.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test2085.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test2085.py (revision 23793) @@ -1,4 +1,4 @@ #Test Name: LovenumberstAtDepth. -#Same as test #1 of test2084.m +#Same as test #1 of test2084.m from model import * @@ -10,25 +10,25 @@ md = model() -md.cluster = generic('name',gethostname(),'np',1) +md.cluster = generic('name', gethostname(), 'np', 1) md.materials = materials('litho') md.miscellaneous.name = 'FourierLoveTest' -md.groundingline.migration='None' +md.groundingline.migration = 'None' md.verbose = verbose('111111101') -cst = 365.25*24*3600*1000 +cst = 365.25 * 24 * 3600 * 1000 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.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.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.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.love.love_kernels = 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 @@ -37,14 +37,13 @@ md.materials.burgers_viscosity = md.materials.viscosity -md = solve(md,'lv') +md = solve(md, 'lv') #Fields and tolerances to track changes #loading love numbers -field_names = ['LoveH_loading_elastic','LoveK_loading_elastic','LoveL_loading_elastic','LoveKernels_degree1','LoveKernels_degree2'] -field_tolerances = [1e-10,1e-10,1e-10,1e-10,1e-10] -field_values = [ - md.results.LoveSolution.LoveHr[:,0], - md.results.LoveSolution.LoveKr[:,0], - md.results.LoveSolution.LoveLr[:,0], - md.results.LoveSolution.LoveKernelsReal[1,0,:,:], - md.results.LoveSolution.LoveKernelsReal[2,0,:,:]] +field_names = ['LoveH_loading_elastic', 'LoveK_loading_elastic', 'LoveL_loading_elastic', 'LoveKernels_degree1', 'LoveKernels_degree2'] +field_tolerances = [1e-10, 1e-10, 1e-10, 1e-10, 1e-10] +field_values = [md.results.LoveSolution.LoveHr[:, 0], + md.results.LoveSolution.LoveKr[:, 0], + md.results.LoveSolution.LoveLr[:, 0], + md.results.LoveSolution.LoveKernelsReal[1, 0, :, :], + md.results.LoveSolution.LoveKernelsReal[2, 0, :, :]] Index: /issm/trunk-jpl/test/NightlyRun/test209.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test209.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test209.py (revision 23793) @@ -3,5 +3,4 @@ from model import * from socket import gethostname -import numpy as np from triangle import * from setmask import * @@ -11,53 +10,50 @@ from generic import generic -md=triangle(model(),'../Exp/Square.exp',180000) -md=setmask(md,'all','') -md=parameterize(md,'../Par/SquareShelf.py') -md.extrude(3,1.) -md=setflowequation(md,'SSA','all') -md.cluster=generic('name',gethostname(),'np',3) -md=solve(md,'Transient') +md = triangle(model(), '../Exp/Square.exp', 180000) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelf.py') +md.extrude(3, 1.) +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'Transient') # Fields and tolerances to track changes -field_names =['Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsGroundediceMeltingRate1', \ - 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsGroundediceMeltingRate2', \ - 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsGroundediceMeltingRate3'] -field_tolerances=[\ - 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-8,\ - 1e-13,1e-13,3e-9,1e-13,3.8e-11,3.85e-11,3.85e-11,3.85e-11,1e-13,3e-8,\ - 5e-11,6e-12,1e-08,6e-12,3.9e-11,1e-10,1e-10,1e-10,9e-12,5e-8] +field_names = ['Vx1', 'Vy1', 'Vz1', 'Vel1', 'Pressure1', 'Bed1', 'Surface1', 'Thickness1', 'Temperature1', 'BasalforcingsGroundediceMeltingRate1', + 'Vx2', 'Vy2', 'Vz2', 'Vel2', 'Pressure2', 'Bed2', 'Surface2', 'Thickness2', 'Temperature2', 'BasalforcingsGroundediceMeltingRate2', + 'Vx3', 'Vy3', 'Vz3', 'Vel3', 'Pressure3', 'Bed3', 'Surface3', 'Thickness3', 'Temperature3', 'BasalforcingsGroundediceMeltingRate3'] +field_tolerances = [1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-8, + 1e-13, 1e-13, 3e-9, 1e-13, 3.8e-11, 3.85e-11, 3.85e-11, 3.85e-11, 1e-13, 3e-8, + 5e-11, 6e-12, 1e-08, 6e-12, 3.9e-11, 1e-10, 1e-10, 1e-10, 9e-12, 5e-8] -field_values=[\ - md.results.TransientSolution[0].Vx,\ - md.results.TransientSolution[0].Vy,\ - md.results.TransientSolution[0].Vz,\ - md.results.TransientSolution[0].Vel,\ - md.results.TransientSolution[0].Pressure,\ - md.results.TransientSolution[0].Base,\ - md.results.TransientSolution[0].Surface,\ - md.results.TransientSolution[0].Thickness,\ - md.results.TransientSolution[0].Temperature,\ - md.results.TransientSolution[0].BasalforcingsGroundediceMeltingRate,\ - md.results.TransientSolution[1].Vx,\ - md.results.TransientSolution[1].Vy,\ - md.results.TransientSolution[1].Vz,\ - md.results.TransientSolution[1].Vel,\ - md.results.TransientSolution[1].Pressure,\ - md.results.TransientSolution[1].Base,\ - md.results.TransientSolution[1].Surface,\ - md.results.TransientSolution[1].Thickness,\ - md.results.TransientSolution[1].Temperature,\ - md.results.TransientSolution[1].BasalforcingsGroundediceMeltingRate,\ - md.results.TransientSolution[2].Vx,\ - md.results.TransientSolution[2].Vy,\ - md.results.TransientSolution[2].Vz,\ - md.results.TransientSolution[2].Vel,\ - md.results.TransientSolution[2].Pressure,\ - md.results.TransientSolution[2].Base,\ - md.results.TransientSolution[2].Surface,\ - md.results.TransientSolution[2].Thickness,\ - md.results.TransientSolution[2].Temperature,\ - md.results.TransientSolution[2].BasalforcingsGroundediceMeltingRate,\ - ] +field_values = [md.results.TransientSolution[0].Vx, + md.results.TransientSolution[0].Vy, + md.results.TransientSolution[0].Vz, + md.results.TransientSolution[0].Vel, + md.results.TransientSolution[0].Pressure, + md.results.TransientSolution[0].Base, + md.results.TransientSolution[0].Surface, + md.results.TransientSolution[0].Thickness, + md.results.TransientSolution[0].Temperature, + md.results.TransientSolution[0].BasalforcingsGroundediceMeltingRate, + md.results.TransientSolution[1].Vx, + md.results.TransientSolution[1].Vy, + md.results.TransientSolution[1].Vz, + md.results.TransientSolution[1].Vel, + md.results.TransientSolution[1].Pressure, + md.results.TransientSolution[1].Base, + md.results.TransientSolution[1].Surface, + md.results.TransientSolution[1].Thickness, + md.results.TransientSolution[1].Temperature, + md.results.TransientSolution[1].BasalforcingsGroundediceMeltingRate, + md.results.TransientSolution[2].Vx, + md.results.TransientSolution[2].Vy, + md.results.TransientSolution[2].Vz, + md.results.TransientSolution[2].Vel, + md.results.TransientSolution[2].Pressure, + md.results.TransientSolution[2].Base, + md.results.TransientSolution[2].Surface, + md.results.TransientSolution[2].Thickness, + md.results.TransientSolution[2].Temperature, + md.results.TransientSolution[2].BasalforcingsGroundediceMeltingRate] Index: /issm/trunk-jpl/test/NightlyRun/test210.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test210.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test210.py (revision 23793) @@ -3,5 +3,4 @@ from model import * from socket import gethostname -import numpy as np from triangle import * from setmask import * @@ -11,52 +10,49 @@ from generic import generic -md=triangle(model(),'../Exp/Square.exp',200000) -md=setmask(md,'all','') -md=parameterize(md,'../Par/SquareShelf.py') -md.extrude(3,1.) -md=setflowequation(md,'HO','all') -md.cluster=generic('name',gethostname(),'np',3) -md=solve(md,'Transient') +md = triangle(model(), '../Exp/Square.exp', 200000) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelf.py') +md.extrude(3, 1.) +md = setflowequation(md, 'HO', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'Transient') # Fields and tolerances to track changes -field_names =['Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsGroundediceMeltingRate1', \ - 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsGroundediceMeltingRate2', \ - 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsGroundediceMeltingRate3'] -field_tolerances=[\ - 1e-08,1e-08,1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,\ - 1e-08,1e-08,1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-06,\ - 1e-08,1e-08,1e-08,1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-05] -field_values=[\ - md.results.TransientSolution[0].Vx,\ - md.results.TransientSolution[0].Vy,\ - md.results.TransientSolution[0].Vz,\ - md.results.TransientSolution[0].Vel,\ - md.results.TransientSolution[0].Pressure,\ - md.results.TransientSolution[0].Base,\ - md.results.TransientSolution[0].Surface,\ - md.results.TransientSolution[0].Thickness,\ - md.results.TransientSolution[0].Temperature,\ - md.results.TransientSolution[0].BasalforcingsGroundediceMeltingRate,\ - md.results.TransientSolution[1].Vx,\ - md.results.TransientSolution[1].Vy,\ - md.results.TransientSolution[1].Vz,\ - md.results.TransientSolution[1].Vel,\ - md.results.TransientSolution[1].Pressure,\ - md.results.TransientSolution[1].Base,\ - md.results.TransientSolution[1].Surface,\ - md.results.TransientSolution[1].Thickness,\ - md.results.TransientSolution[1].Temperature,\ - md.results.TransientSolution[1].BasalforcingsGroundediceMeltingRate,\ - md.results.TransientSolution[2].Vx,\ - md.results.TransientSolution[2].Vy,\ - md.results.TransientSolution[2].Vz,\ - md.results.TransientSolution[2].Vel,\ - md.results.TransientSolution[2].Pressure,\ - md.results.TransientSolution[2].Base,\ - md.results.TransientSolution[2].Surface,\ - md.results.TransientSolution[2].Thickness,\ - md.results.TransientSolution[2].Temperature,\ - md.results.TransientSolution[2].BasalforcingsGroundediceMeltingRate,\ - ] +field_names = ['Vx1', 'Vy1', 'Vz1', 'Vel1', 'Pressure1', 'Bed1', 'Surface1', 'Thickness1', 'Temperature1', 'BasalforcingsGroundediceMeltingRate1', + 'Vx2', 'Vy2', 'Vz2', 'Vel2', 'Pressure2', 'Bed2', 'Surface2', 'Thickness2', 'Temperature2', 'BasalforcingsGroundediceMeltingRate2', + 'Vx3', 'Vy3', 'Vz3', 'Vel3', 'Pressure3', 'Bed3', 'Surface3', 'Thickness3', 'Temperature3', 'BasalforcingsGroundediceMeltingRate3'] +field_tolerances = [1e-08, 1e-08, 1e-08, 1e-09, 1e-09, 1e-09, 1e-09, 1e-09, 1e-09, 1e-09, + 1e-08, 1e-08, 1e-08, 1e-09, 1e-09, 1e-09, 1e-09, 1e-09, 1e-09, 1e-06, + 1e-08, 1e-08, 1e-08, 1e-08, 1e-09, 1e-09, 1e-09, 1e-09, 1e-09, 1e-05] +field_values = [md.results.TransientSolution[0].Vx, + md.results.TransientSolution[0].Vy, + md.results.TransientSolution[0].Vz, + md.results.TransientSolution[0].Vel, + md.results.TransientSolution[0].Pressure, + md.results.TransientSolution[0].Base, + md.results.TransientSolution[0].Surface, + md.results.TransientSolution[0].Thickness, + md.results.TransientSolution[0].Temperature, + md.results.TransientSolution[0].BasalforcingsGroundediceMeltingRate, + md.results.TransientSolution[1].Vx, + md.results.TransientSolution[1].Vy, + md.results.TransientSolution[1].Vz, + md.results.TransientSolution[1].Vel, + md.results.TransientSolution[1].Pressure, + md.results.TransientSolution[1].Base, + md.results.TransientSolution[1].Surface, + md.results.TransientSolution[1].Thickness, + md.results.TransientSolution[1].Temperature, + md.results.TransientSolution[1].BasalforcingsGroundediceMeltingRate, + md.results.TransientSolution[2].Vx, + md.results.TransientSolution[2].Vy, + md.results.TransientSolution[2].Vz, + md.results.TransientSolution[2].Vel, + md.results.TransientSolution[2].Pressure, + md.results.TransientSolution[2].Base, + md.results.TransientSolution[2].Surface, + md.results.TransientSolution[2].Thickness, + md.results.TransientSolution[2].Temperature, + md.results.TransientSolution[2].BasalforcingsGroundediceMeltingRate] Index: /issm/trunk-jpl/test/NightlyRun/test2101.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test2101.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test2101.py (revision 23793) @@ -12,9 +12,9 @@ from gmtmask import * -#mesh earth: +#mesh earth: md = model() -md.mesh = gmshplanet('radius',6.371012*1e3,'resolution',1000) +md.mesh = gmshplanet('radius', 6.371012 * 1e3, 'resolution', 1000) -#define load +#define load md.esa.deltathickness = np.zeros((md.mesh.numberofelements,)) pos = 449 @@ -23,28 +23,28 @@ #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) #mask: {{{ -md.mask = maskpsl() # use maskpsl class (instead of mask) to store the ocean function as a ocean_levelset -md.mask.ocean_levelset = gmtmask(md.mesh.lat,md.mesh.long) +md.mask = maskpsl() # use maskpsl class (instead of mask) to store the ocean function as a ocean_levelset +md.mask.ocean_levelset = gmtmask(md.mesh.lat, md.mesh.long) -#make sure wherever there is an ice load, that the mask is set to ice: +#make sure wherever there is an ice load, that the mask is set to ice: 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? +#is ice grounded? md.mask.groundedice_levelset = -np.ones((md.mesh.numberofvertices,)) pos = np.where(md.mask.ice_levelset <= 0) md.mask.groundedice_levelset[pos] = 1 -#make sure ice domain is on the continent: +#make sure ice domain is on the continent: #pos = np.where(md.mask.ice_levelset <= 0) #md.mask.ocean_levelset[pos] = 0 -#land mask +#land mask md.mask.land_levelset = 1 - md.mask.ocean_levelset @@ -66,17 +66,14 @@ # }}} -#solve esa -md.esa.requested_outputs = ['EsaUmotion','EsaNmotion','EsaEmotion'] -md.cluster = generic('name',gethostname(),'np',3) +#solve esa +md.esa.requested_outputs = ['EsaUmotion', 'EsaNmotion', 'EsaEmotion'] +md.cluster = generic('name', gethostname(), 'np', 3) md.verbose = verbose('111111111') -md = solve(md,'Esa') +md = solve(md, 'Esa') #Fields and tolerances to track changes -field_names = ['EsaUmotion','EsaNmotion','EsaEmotion'] -field_tolerances= [1e-13,1e-13,1e-13] -field_values = [ - md.results.EsaSolution.EsaUmotion, - md.results.EsaSolution.EsaNmotion, - md.results.EsaSolution.EsaEmotion, - ] - +field_names = ['EsaUmotion', 'EsaNmotion', 'EsaEmotion'] +field_tolerances = [1e-13, 1e-13, 1e-13] +field_values = [md.results.EsaSolution.EsaUmotion, + md.results.EsaSolution.EsaNmotion, + md.results.EsaSolution.EsaEmotion] Index: /issm/trunk-jpl/test/NightlyRun/test211.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test211.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test211.py (revision 23793) @@ -10,50 +10,50 @@ from generic import generic -md=triangle(model(),'../Exp/Square.exp',200000) -md=setmask(md,'all','') -md=parameterize(md,'../Par/SquareShelf.py') -md.extrude(3,1.) -md=setflowequation(md,'FS','all') -md.stressbalance.reltol=np.NaN -md.cluster=generic('name',gethostname(),'np',3) -md=solve(md,'Transient') +md = triangle(model(), '../Exp/Square.exp', 200000) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelf.py') +md.extrude(3, 1.) +md = setflowequation(md, 'FS', 'all') +md.stressbalance.reltol = np.NaN +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'Transient') # Fields and tolerances to track changes -field_names=['Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsGroundediceMeltingRate1', - 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsGroundediceMeltingRate2', - 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsGroundediceMeltingRate3'] -field_tolerances=[2e-08,2e-08,5e-05,2e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08, - 5e-06,5e-06,8e-05,5e-06,5e-07,5e-07,5e-07,5e-07,3e-06,5e-05, - 8e-06,8e-06,8e-05,8e-06,8e-07,8e-07,8e-07,8e-07,5e-06,8e-05] -field_values=[md.results.TransientSolution[0].Vx, - md.results.TransientSolution[0].Vy, - md.results.TransientSolution[0].Vz, - md.results.TransientSolution[0].Vel, - md.results.TransientSolution[0].Pressure, - md.results.TransientSolution[0].Base, - md.results.TransientSolution[0].Surface, - md.results.TransientSolution[0].Thickness, - md.results.TransientSolution[0].Temperature, - md.results.TransientSolution[0].BasalforcingsGroundediceMeltingRate, - md.results.TransientSolution[1].Vx, - md.results.TransientSolution[1].Vy, - md.results.TransientSolution[1].Vz, - md.results.TransientSolution[1].Vel, - md.results.TransientSolution[1].Pressure, - md.results.TransientSolution[1].Base, - md.results.TransientSolution[1].Surface, - md.results.TransientSolution[1].Thickness, - md.results.TransientSolution[1].Temperature, - md.results.TransientSolution[1].BasalforcingsGroundediceMeltingRate, - md.results.TransientSolution[2].Vx, - md.results.TransientSolution[2].Vy, - md.results.TransientSolution[2].Vz, - md.results.TransientSolution[2].Vel, - md.results.TransientSolution[2].Pressure, - md.results.TransientSolution[2].Base, - md.results.TransientSolution[2].Surface, - md.results.TransientSolution[2].Thickness, - md.results.TransientSolution[2].Temperature, - md.results.TransientSolution[2].BasalforcingsGroundediceMeltingRate] +field_names = ['Vx1', 'Vy1', 'Vz1', 'Vel1', 'Pressure1', 'Bed1', 'Surface1', 'Thickness1', 'Temperature1', 'BasalforcingsGroundediceMeltingRate1', + 'Vx2', 'Vy2', 'Vz2', 'Vel2', 'Pressure2', 'Bed2', 'Surface2', 'Thickness2', 'Temperature2', 'BasalforcingsGroundediceMeltingRate2', + 'Vx3', 'Vy3', 'Vz3', 'Vel3', 'Pressure3', 'Bed3', 'Surface3', 'Thickness3', 'Temperature3', 'BasalforcingsGroundediceMeltingRate3'] +field_tolerances = [2e-08, 2e-08, 5e-05, 2e-08, 1e-08, 1e-08, 1e-08, 1e-08, 1e-08, 1e-08, + 5e-06, 5e-06, 8e-05, 5e-06, 5e-07, 5e-07, 5e-07, 5e-07, 3e-06, 5e-05, + 8e-06, 8e-06, 8e-05, 8e-06, 8e-07, 8e-07, 8e-07, 8e-07, 5e-06, 8e-05] +field_values = [md.results.TransientSolution[0].Vx, + md.results.TransientSolution[0].Vy, + md.results.TransientSolution[0].Vz, + md.results.TransientSolution[0].Vel, + md.results.TransientSolution[0].Pressure, + md.results.TransientSolution[0].Base, + md.results.TransientSolution[0].Surface, + md.results.TransientSolution[0].Thickness, + md.results.TransientSolution[0].Temperature, + md.results.TransientSolution[0].BasalforcingsGroundediceMeltingRate, + md.results.TransientSolution[1].Vx, + md.results.TransientSolution[1].Vy, + md.results.TransientSolution[1].Vz, + md.results.TransientSolution[1].Vel, + md.results.TransientSolution[1].Pressure, + md.results.TransientSolution[1].Base, + md.results.TransientSolution[1].Surface, + md.results.TransientSolution[1].Thickness, + md.results.TransientSolution[1].Temperature, + md.results.TransientSolution[1].BasalforcingsGroundediceMeltingRate, + md.results.TransientSolution[2].Vx, + md.results.TransientSolution[2].Vy, + md.results.TransientSolution[2].Vz, + md.results.TransientSolution[2].Vel, + md.results.TransientSolution[2].Pressure, + md.results.TransientSolution[2].Base, + md.results.TransientSolution[2].Surface, + md.results.TransientSolution[2].Thickness, + md.results.TransientSolution[2].Temperature, + md.results.TransientSolution[2].BasalforcingsGroundediceMeltingRate] Index: /issm/trunk-jpl/test/NightlyRun/test2110.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test2110.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test2110.py (revision 23793) @@ -10,11 +10,11 @@ from paterson import * -#mesh earth: +#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 +#define load md.esa.deltathickness = np.zeros((md.mesh.numberofelements,)) -disc_radius = 20 # km +disc_radius = 20 # km index = md.mesh.elements x_element = np.mean(md.mesh.x[index - 1], 1) @@ -24,5 +24,5 @@ #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) @@ -31,10 +31,10 @@ #mask: {{{ -#make sure wherever there is an ice load, that the mask is set to ice: +#make sure wherever there is an ice load, that the mask is set to ice: 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? +#is ice grounded? md.mask.groundedice_levelset = -np.ones((md.mesh.numberofvertices,)) pos = np.where(md.mask.ice_levelset <= 0) @@ -60,23 +60,20 @@ md.esa.degacc = 0.01 -#solve esa -md.esa.requested_outputs = ['EsaUmotion','EsaXmotion','EsaYmotion', - 'EsaStrainratexx','EsaStrainratexy','EsaStrainrateyy','EsaRotationrate'] -md.cluster = generic('name',gethostname(),'np',3) +#solve esa +md.esa.requested_outputs = ['EsaUmotion', 'EsaXmotion', 'EsaYmotion', + 'EsaStrainratexx', 'EsaStrainratexy', 'EsaStrainrateyy', 'EsaRotationrate'] +md.cluster = generic('name', gethostname(), 'np', 3) md.verbose = verbose('111111111') -md = solve(md,'Esa') +md = solve(md, 'Esa') #Fields and tolerances to track changes -field_names = ['EsaUmotion','EsaXmotion','EsaYmotion', - 'EsaStrainratexx','EsaStrainratexy','EsaStrainrateyy','EsaRotationrate'] -field_tolerances = [1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13] -field_values = [ - md.results.EsaSolution.EsaUmotion, - md.results.EsaSolution.EsaXmotion, - md.results.EsaSolution.EsaYmotion, - md.results.EsaSolution.EsaStrainratexx, - md.results.EsaSolution.EsaStrainratexy, - md.results.EsaSolution.EsaStrainrateyy, - md.results.EsaSolution.EsaRotationrate, - ] - +field_names = ['EsaUmotion', 'EsaXmotion', 'EsaYmotion', + 'EsaStrainratexx', 'EsaStrainratexy', 'EsaStrainrateyy', 'EsaRotationrate'] +field_tolerances = [1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13] +field_values = [md.results.EsaSolution.EsaUmotion, + md.results.EsaSolution.EsaXmotion, + md.results.EsaSolution.EsaYmotion, + md.results.EsaSolution.EsaStrainratexx, + md.results.EsaSolution.EsaStrainratexy, + md.results.EsaSolution.EsaStrainrateyy, + md.results.EsaSolution.EsaRotationrate] Index: /issm/trunk-jpl/test/NightlyRun/test2111.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test2111.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test2111.py (revision 23793) @@ -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 @@ -12,9 +12,9 @@ #mesh ais: {{{ md = model() -md = triangle(md,'../Exp/Ais.exp',200000); # max element size +md = triangle(md, '../Exp/Ais.exp', 200000) # max element size # }}} #define load: {{{ md.esa.deltathickness = np.zeros((md.mesh.numberofelements,)) -disc_radius = 500 # km +disc_radius = 500 # km index = md.mesh.elements x_element = np.mean(md.mesh.x[index - 1], 1) - 1.0e6 @@ -24,17 +24,17 @@ # }}} #love numbers: {{{ -nlov = 10000 # horizontal displacements do not work for low degree truncation, e.g., 101 -md.esa.love_h = np.array(love_numbers('h','CF')) +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) -md.esa.love_l = np.array(love_numbers('l','CF')) +md.esa.love_l = np.array(love_numbers('l', 'CF')) md.esa.love_l = np.resize(md.esa.love_l, nlov + 1) # }}} #mask: {{{ -#make sure wherever there is an ice load, that the mask is set to ice: +#make sure wherever there is an ice load, that the mask is set to ice: 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? +#is ice grounded? md.mask.groundedice_levelset = -np.ones((md.mesh.numberofvertices,)) pos = np.where(md.mask.ice_levelset <= 0) @@ -54,25 +54,22 @@ # }}} #additional parameters, miscellaneous: {{{ -md.miscellaneous.name='test2111'; -md.esa.degacc=0.01; -md.esa.hemisphere = -1; +md.miscellaneous.name = 'test2111' +md.esa.degacc = 0.01 +md.esa.hemisphere = -1 # }}} #solve esa: {{{ -md.esa.requested_outputs = ['EsaUmotion','EsaNmotion','EsaEmotion','EsaXmotion','EsaYmotion'] -md.cluster = generic('name',gethostname(),'np',3) +md.esa.requested_outputs = ['EsaUmotion', 'EsaNmotion', 'EsaEmotion', 'EsaXmotion', 'EsaYmotion'] +md.cluster = generic('name', gethostname(), 'np', 3) md.verbose = verbose('111111111') -md = solve(md,'Esa') +md = solve(md, 'Esa') # }}} #Fields and tolerances to track changes: {{{ -field_names = ['EsaUmotion','EsaNmotion','EsaEmotion','EsaXmotion','EsaYmotion'] -field_tolerances = [1e-13,1e-13,1e-13,1e-13,1e-13] -field_values = [ - md.results.EsaSolution.EsaUmotion, - md.results.EsaSolution.EsaNmotion, - md.results.EsaSolution.EsaEmotion, - md.results.EsaSolution.EsaXmotion, - md.results.EsaSolution.EsaYmotion, - ] +field_names = ['EsaUmotion', 'EsaNmotion', 'EsaEmotion', 'EsaXmotion', 'EsaYmotion'] +field_tolerances = [1e-13, 1e-13, 1e-13, 1e-13, 1e-13] +field_values = [md.results.EsaSolution.EsaUmotion, + md.results.EsaSolution.EsaNmotion, + md.results.EsaSolution.EsaEmotion, + md.results.EsaSolution.EsaXmotion, + md.results.EsaSolution.EsaYmotion] # }}} - Index: /issm/trunk-jpl/test/NightlyRun/test2112.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test2112.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test2112.py (revision 23793) @@ -1,5 +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 * @@ -12,9 +11,9 @@ #mesh ais: {{{ md = model() -md = triangle(md,'../Exp/Ais.exp',100000); # max element size +md = triangle(md, '../Exp/Ais.exp', 100000) # max element size # }}} #define load: {{{ md.esa.deltathickness = np.zeros((md.mesh.numberofelements,)) -disc_radius = 500 # km +disc_radius = 500 # km index = md.mesh.elements x_element = np.mean(md.mesh.x[index - 1], 1) @@ -24,17 +23,17 @@ # }}} #love numbers: {{{ -nlov = 10000 # horizontal displacements do not work for low degree truncation, e.g., 101 -md.esa.love_h = np.array(love_numbers('h','CF')) +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) -md.esa.love_l = np.array(love_numbers('l','CF')) +md.esa.love_l = np.array(love_numbers('l', 'CF')) md.esa.love_l = np.resize(md.esa.love_l, nlov + 1) # }}} #mask: {{{ -#make sure wherever there is an ice load, that the mask is set to ice: +#make sure wherever there is an ice load, that the mask is set to ice: 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? +#is ice grounded? md.mask.groundedice_levelset = -np.ones((md.mesh.numberofvertices,)) pos = np.where(md.mask.ice_levelset <= 0) @@ -54,25 +53,22 @@ # }}} #additional parameters, miscellaneous: {{{ -md.miscellaneous.name='test2112'; -md.esa.degacc=0.01; -md.esa.hemisphere = -1; +md.miscellaneous.name = 'test2112' +md.esa.degacc = 0.01 +md.esa.hemisphere = -1 # }}} #solve esa: {{{ -md.esa.requested_outputs = ['EsaUmotion','EsaNmotion','EsaEmotion','EsaXmotion','EsaYmotion'] -md.cluster = generic('name',gethostname(),'np',3) +md.esa.requested_outputs = ['EsaUmotion', 'EsaNmotion', 'EsaEmotion', 'EsaXmotion', 'EsaYmotion'] +md.cluster = generic('name', gethostname(), 'np', 3) md.verbose = verbose('111111111') -md = solve(md,'Esa') +md = solve(md, 'Esa') # }}} #Fields and tolerances to track changes: {{{ -field_names = ['EsaUmotion','EsaNmotion','EsaEmotion','EsaXmotion','EsaYmotion'] -field_tolerances = [1e-13,1e-13,1e-13,1e-13,1e-13] -field_values = [ - md.results.EsaSolution.EsaUmotion, - md.results.EsaSolution.EsaNmotion, - md.results.EsaSolution.EsaEmotion, - md.results.EsaSolution.EsaXmotion, - md.results.EsaSolution.EsaYmotion, - ] +field_names = ['EsaUmotion', 'EsaNmotion', 'EsaEmotion', 'EsaXmotion', 'EsaYmotion'] +field_tolerances = [1e-13, 1e-13, 1e-13, 1e-13, 1e-13] +field_values = [md.results.EsaSolution.EsaUmotion, + md.results.EsaSolution.EsaNmotion, + md.results.EsaSolution.EsaEmotion, + md.results.EsaSolution.EsaXmotion, + md.results.EsaSolution.EsaYmotion] # }}} - Index: /issm/trunk-jpl/test/NightlyRun/test2113.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test2113.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test2113.py (revision 23793) @@ -1,5 +1,5 @@ #Test Name: Esa2Dsurface -#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 +#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 import numpy as np @@ -13,9 +13,9 @@ #mesh ais: {{{ md = model() -md = triangle(md,'../Exp/Ais.exp',200000); # max element size +md = triangle(md, '../Exp/Ais.exp', 200000) # max element size # }}} #define load: {{{ md.esa.deltathickness = np.zeros((md.mesh.numberofelements,)) -disc_radius = 500 # km +disc_radius = 500 # km index = md.mesh.elements x_element = np.mean(md.mesh.x[index - 1], 1) - 1.0e6 @@ -25,17 +25,17 @@ # }}} #love numbers: {{{ -nlov = 10000 # horizontal displacements do not work for low degree truncation, e.g., 101 -md.esa.love_h = np.array(love_numbers('h','CF')) +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) -md.esa.love_l = np.array(love_numbers('l','CF')) +md.esa.love_l = np.array(love_numbers('l', 'CF')) md.esa.love_l = np.resize(md.esa.love_l, nlov + 1) # }}} #mask: {{{ -#make sure wherever there is an ice load, that the mask is set to ice: +#make sure wherever there is an ice load, that the mask is set to ice: 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? +#is ice grounded? md.mask.groundedice_levelset = -np.ones((md.mesh.numberofvertices,)) pos = np.where(md.mask.ice_levelset <= 0) @@ -55,23 +55,20 @@ # }}} #additional parameters, miscellaneous: {{{ -md.miscellaneous.name='test2113'; -md.esa.degacc=0.01; -md.esa.hemisphere = 1; # AIS is placed in Northern Hemisphere +md.miscellaneous.name = 'test2113' +md.esa.degacc = 0.01 +md.esa.hemisphere = 1 # AIS is placed in Northern Hemisphere # }}} #solve esa: {{{ -md.esa.requested_outputs = ['EsaUmotion','EsaNmotion','EsaEmotion'] -md.cluster = generic('name',gethostname(),'np',3) +md.esa.requested_outputs = ['EsaUmotion', 'EsaNmotion', 'EsaEmotion'] +md.cluster = generic('name', gethostname(), 'np', 3) md.verbose = verbose('111111111') -md = solve(md,'Esa') +md = solve(md, 'Esa') # }}} #Fields and tolerances to track changes: {{{ -field_names = ['EsaUmotion','EsaNmotion','EsaEmotion'] -field_tolerances = [1e-13,1e-13,1e-13] -field_values = [ - md.results.EsaSolution.EsaUmotion, - md.results.EsaSolution.EsaNmotion, - md.results.EsaSolution.EsaEmotion, - ] +field_names = ['EsaUmotion', 'EsaNmotion', 'EsaEmotion'] +field_tolerances = [1e-13, 1e-13, 1e-13] +field_values = [md.results.EsaSolution.EsaUmotion, + md.results.EsaSolution.EsaNmotion, + md.results.EsaSolution.EsaEmotion] # }}} - Index: /issm/trunk-jpl/test/NightlyRun/test212.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test212.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test212.py (revision 23793) @@ -10,38 +10,38 @@ from generic import generic -md=triangle(model(),'../Exp/Square.exp',200000) -md=setmask(md,'all','') -md=parameterize(md,'../Par/SquareShelf.py') -md=setflowequation(md,'SSA','all') +md = triangle(model(), '../Exp/Square.exp', 200000) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelf.py') +md = setflowequation(md, 'SSA', 'all') # control parameters -md.inversion.iscontrol=1 -md.inversion.control_parameters=['MaterialsRheologyBbar'] -md.inversion.min_parameters=1.0e6*np.ones((md.mesh.numberofvertices,len(md.inversion.control_parameters))) -md.inversion.max_parameters=2.0e9*np.ones((md.mesh.numberofvertices,len(md.inversion.control_parameters))) -md.inversion.nsteps=2 -md.inversion.cost_functions=[101] -md.inversion.cost_functions_coefficients=np.ones((md.mesh.numberofvertices,len(md.inversion.cost_functions))) -md.inversion.gradient_scaling=1.0e7*np.ones((md.inversion.nsteps,len(md.inversion.control_parameters))) -md.inversion.maxiter_per_step=2.*np.ones((md.inversion.nsteps)) -md.inversion.step_threshold=0.3*np.ones((md.inversion.nsteps)) -md.inversion.vx_obs=md.initialization.vx -md.inversion.vy_obs=md.initialization.vy +md.inversion.iscontrol = 1 +md.inversion.control_parameters = ['MaterialsRheologyBbar'] +md.inversion.min_parameters = 1.0e6 * np.ones((md.mesh.numberofvertices, len(md.inversion.control_parameters))) +md.inversion.max_parameters = 2.0e9 * np.ones((md.mesh.numberofvertices, len(md.inversion.control_parameters))) +md.inversion.nsteps = 2 +md.inversion.cost_functions = [101] +md.inversion.cost_functions_coefficients = np.ones((md.mesh.numberofvertices, len(md.inversion.cost_functions))) +md.inversion.gradient_scaling = 1.0e7 * np.ones((md.inversion.nsteps, len(md.inversion.control_parameters))) +md.inversion.maxiter_per_step = 2. * np.ones((md.inversion.nsteps)) +md.inversion.step_threshold = 0.3 * np.ones((md.inversion.nsteps)) +md.inversion.vx_obs = md.initialization.vx +md.inversion.vy_obs = md.initialization.vy -md.cluster=generic('name',gethostname(),'np',3) -md=solve(md,'Stressbalance') +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'Stressbalance') # Fields and tolerances to track changes -field_names =['Gradient','Misfits','MaterialsRheologyBbar','Pressure','Vel','Vx','Vy'] -field_tolerances=[1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13] -field_values=[md.results.StressbalanceSolution.Gradient1, - md.results.StressbalanceSolution.J, - md.results.StressbalanceSolution.MaterialsRheologyBbar, - md.results.StressbalanceSolution.Pressure, - md.results.StressbalanceSolution.Vel, - md.results.StressbalanceSolution.Vx, - md.results.StressbalanceSolution.Vy] +field_names = ['Gradient', 'Misfits', 'MaterialsRheologyBbar', 'Pressure', 'Vel', 'Vx', 'Vy'] +field_tolerances = [1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13] +field_values = [md.results.StressbalanceSolution.Gradient1, + md.results.StressbalanceSolution.J, + md.results.StressbalanceSolution.MaterialsRheologyBbar, + md.results.StressbalanceSolution.Pressure, + md.results.StressbalanceSolution.Vel, + md.results.StressbalanceSolution.Vx, + md.results.StressbalanceSolution.Vy] Index: /issm/trunk-jpl/test/NightlyRun/test213.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test213.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test213.py (revision 23793) @@ -1,4 +1,3 @@ #Test Name: SquareShelfCMBSSA3d - from model import * from socket import gethostname @@ -11,41 +10,37 @@ from generic import generic -md=triangle(model(),'../Exp/Square.exp',200000) -md=setmask(md,'all','') -md=parameterize(md,'../Par/SquareShelf.py') -md.extrude(3,1.) -md=setflowequation(md,'SSA','all') +md = triangle(model(), '../Exp/Square.exp', 200000) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelf.py') +md.extrude(3, 1.) +md = setflowequation(md, 'SSA', 'all') # control parameters +md.inversion.iscontrol = 1 +md.inversion.control_parameters = ['MaterialsRheologyBbar'] +md.inversion.min_parameters = 10**6 * np.ones((md.mesh.numberofvertices, len(md.inversion.control_parameters))) +md.inversion.max_parameters = 2. * 10**9 * np.ones((md.mesh.numberofvertices, len(md.inversion.control_parameters))) +md.inversion.nsteps = 2 +md.inversion.cost_functions = [101] +md.inversion.cost_functions_coefficients = np.ones((md.mesh.numberofvertices, len(md.inversion.cost_functions))) +md.inversion.gradient_scaling = 10**7 * np.ones((md.inversion.nsteps, len(md.inversion.control_parameters))) +md.inversion.maxiter_per_step = 2. * np.ones((md.inversion.nsteps)) +md.inversion.step_threshold = 0.3 * np.ones((md.inversion.nsteps)) +md.inversion.vx_obs = md.initialization.vx +md.inversion.vy_obs = md.initialization.vy -md.inversion.iscontrol=1 -md.inversion.control_parameters=['MaterialsRheologyBbar'] -md.inversion.min_parameters=10**6*np.ones((md.mesh.numberofvertices,len(md.inversion.control_parameters))) -md.inversion.max_parameters=2.*10**9*np.ones((md.mesh.numberofvertices,len(md.inversion.control_parameters))) -md.inversion.nsteps=2 -md.inversion.cost_functions=[101] -md.inversion.cost_functions_coefficients=np.ones((md.mesh.numberofvertices,len(md.inversion.cost_functions))) -md.inversion.gradient_scaling=10**7*np.ones((md.inversion.nsteps,len(md.inversion.control_parameters))) -md.inversion.maxiter_per_step=2.*np.ones((md.inversion.nsteps)) -md.inversion.step_threshold=0.3*np.ones((md.inversion.nsteps)) -md.inversion.vx_obs=md.initialization.vx -md.inversion.vy_obs=md.initialization.vy - - -md.cluster=generic('name',gethostname(),'np',3) -md=solve(md,'Stressbalance') - +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'Stressbalance') # Fields and tolerances to track changes -field_names =['Gradient','Misfits','MaterialsRheologyBbar','Pressure','Vel','Vx','Vy'] -field_tolerances=[1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13] -#field_tolerances=[1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13] -field_values=[md.results.StressbalanceSolution.Gradient1, - md.results.StressbalanceSolution.J, - md.results.StressbalanceSolution.MaterialsRheologyBbar, - md.results.StressbalanceSolution.Pressure, - md.results.StressbalanceSolution.Vel, - md.results.StressbalanceSolution.Vx, - md.results.StressbalanceSolution.Vy] +field_names = ['Gradient', 'Misfits', 'MaterialsRheologyBbar', 'Pressure', 'Vel', 'Vx', 'Vy'] +field_tolerances = [1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13] +field_values = [md.results.StressbalanceSolution.Gradient1, + md.results.StressbalanceSolution.J, + md.results.StressbalanceSolution.MaterialsRheologyBbar, + md.results.StressbalanceSolution.Pressure, + md.results.StressbalanceSolution.Vel, + md.results.StressbalanceSolution.Vx, + md.results.StressbalanceSolution.Vy] Index: /issm/trunk-jpl/test/NightlyRun/test214.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test214.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test214.py (revision 23793) @@ -11,40 +11,38 @@ from generic import generic -md=triangle(model(),'../Exp/Square.exp',200000) -md=setmask(md,'all','') -md=parameterize(md,'../Par/SquareShelf.py') -md.extrude(3,1.) -md=setflowequation(md,'HO','all') +md = triangle(model(), '../Exp/Square.exp', 200000) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelf.py') +md.extrude(3, 1.) +md = setflowequation(md, 'HO', 'all') # control parameters +md.inversion.iscontrol = 1 +md.inversion.control_parameters = ['MaterialsRheologyBbar'] +md.inversion.min_parameters = 1e6 * np.ones((md.mesh.numberofvertices, len(md.inversion.control_parameters))) +md.inversion.max_parameters = 2. * 1e9 * np.ones((md.mesh.numberofvertices, len(md.inversion.control_parameters))) +md.inversion.nsteps = 2 +md.inversion.cost_functions = [101] +md.inversion.cost_functions_coefficients = np.ones((md.mesh.numberofvertices, len(md.inversion.cost_functions))) +md.inversion.gradient_scaling = 1e7 * np.ones((md.inversion.nsteps, len(md.inversion.control_parameters))) +md.inversion.maxiter_per_step = 2. * np.ones((md.inversion.nsteps)) +md.inversion.step_threshold = 0.3 * np.ones((md.inversion.nsteps)) +md.inversion.vx_obs = md.initialization.vx +md.inversion.vy_obs = md.initialization.vy -md.inversion.iscontrol=1 -md.inversion.control_parameters=['MaterialsRheologyBbar'] -md.inversion.min_parameters=1e6*np.ones((md.mesh.numberofvertices,len(md.inversion.control_parameters))) -md.inversion.max_parameters=2.*1e9*np.ones((md.mesh.numberofvertices,len(md.inversion.control_parameters))) -md.inversion.nsteps=2 -md.inversion.cost_functions=[101] -md.inversion.cost_functions_coefficients=np.ones((md.mesh.numberofvertices,len(md.inversion.cost_functions))) -md.inversion.gradient_scaling=1e7*np.ones((md.inversion.nsteps,len(md.inversion.control_parameters))) -md.inversion.maxiter_per_step=2.*np.ones((md.inversion.nsteps)) -md.inversion.step_threshold=0.3*np.ones((md.inversion.nsteps)) -md.inversion.vx_obs=md.initialization.vx -md.inversion.vy_obs=md.initialization.vy - - -md.cluster=generic('name',gethostname(),'np',3) -md=solve(md,'Stressbalance') +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'Stressbalance') # Fields and tolerances to track changes -field_names =['Gradient','Misfits','MaterialsRheologyBbar','Pressure','Vel','Vx','Vy'] -field_tolerances=[1e-07,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08] -field_values=[md.results.StressbalanceSolution.Gradient1, - md.results.StressbalanceSolution.J, - md.results.StressbalanceSolution.MaterialsRheologyBbar, - md.results.StressbalanceSolution.Pressure, - md.results.StressbalanceSolution.Vel, - md.results.StressbalanceSolution.Vx, - md.results.StressbalanceSolution.Vy] +field_names = ['Gradient', 'Misfits', 'MaterialsRheologyBbar', 'Pressure', 'Vel', 'Vx', 'Vy'] +field_tolerances = [1e-07, 1e-08, 1e-08, 1e-08, 1e-08, 1e-08, 1e-08, 1e-08, 1e-08, 1e-08] +field_values = [md.results.StressbalanceSolution.Gradient1, + md.results.StressbalanceSolution.J, + md.results.StressbalanceSolution.MaterialsRheologyBbar, + md.results.StressbalanceSolution.Pressure, + md.results.StressbalanceSolution.Vel, + md.results.StressbalanceSolution.Vx, + md.results.StressbalanceSolution.Vy] Index: /issm/trunk-jpl/test/NightlyRun/test215.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test215.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test215.py (revision 23793) @@ -10,37 +10,37 @@ from generic import generic -md=triangle(model(),'../Exp/Square.exp',200000) -md=setmask(md,'all','') -md=parameterize(md,'../Par/SquareShelf.py') -md.extrude(3,1.) -md=setflowequation(md,'FS','all') +md = triangle(model(), '../Exp/Square.exp', 200000) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelf.py') +md.extrude(3, 1.) +md = setflowequation(md, 'FS', 'all') # control parameters -md.inversion.iscontrol=1 -md.inversion.control_parameters=['MaterialsRheologyBbar'] -md.inversion.min_parameters=1e6*np.ones((md.mesh.numberofvertices,len(md.inversion.control_parameters))) -md.inversion.max_parameters=2e9*np.ones((md.mesh.numberofvertices,len(md.inversion.control_parameters))) -md.inversion.nsteps=2 -md.inversion.cost_functions=[101] -md.inversion.cost_functions_coefficients=np.ones((md.mesh.numberofvertices,len(md.inversion.cost_functions))) -md.inversion.gradient_scaling=1e7*np.ones((md.inversion.nsteps,len(md.inversion.control_parameters))) -md.inversion.maxiter_per_step=2.*np.ones((md.inversion.nsteps)) -md.inversion.step_threshold=0.3*np.ones((md.inversion.nsteps)) -md.inversion.vx_obs=md.initialization.vx -md.inversion.vy_obs=md.initialization.vy +md.inversion.iscontrol = 1 +md.inversion.control_parameters = ['MaterialsRheologyBbar'] +md.inversion.min_parameters = 1e6 * np.ones((md.mesh.numberofvertices, len(md.inversion.control_parameters))) +md.inversion.max_parameters = 2e9 * np.ones((md.mesh.numberofvertices, len(md.inversion.control_parameters))) +md.inversion.nsteps = 2 +md.inversion.cost_functions = [101] +md.inversion.cost_functions_coefficients = np.ones((md.mesh.numberofvertices, len(md.inversion.cost_functions))) +md.inversion.gradient_scaling = 1e7 * np.ones((md.inversion.nsteps, len(md.inversion.control_parameters))) +md.inversion.maxiter_per_step = 2. * np.ones((md.inversion.nsteps)) +md.inversion.step_threshold = 0.3 * np.ones((md.inversion.nsteps)) +md.inversion.vx_obs = md.initialization.vx +md.inversion.vy_obs = md.initialization.vy -md.cluster=generic('name',gethostname(),'np',3) -md=solve(md,'Stressbalance') +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'Stressbalance') # Fields and tolerances to track changes -field_names =['Gradient','Misfits','MaterialsRheologyBbar','Pressure','Vel','Vx','Vy'] -field_tolerances=[4.6e-08,1e-08,2e-08,2e-09,3e-09,2e-08,2e-08] -field_values=[md.results.StressbalanceSolution.Gradient1, - md.results.StressbalanceSolution.J, - md.results.StressbalanceSolution.MaterialsRheologyBbar, - md.results.StressbalanceSolution.Pressure, - md.results.StressbalanceSolution.Vel, - md.results.StressbalanceSolution.Vx, - md.results.StressbalanceSolution.Vy] +field_names = ['Gradient', 'Misfits', 'MaterialsRheologyBbar', 'Pressure', 'Vel', 'Vx', 'Vy'] +field_tolerances = [4.6e-08, 1e-08, 2e-08, 2e-09, 3e-09, 2e-08, 2e-08] +field_values = [md.results.StressbalanceSolution.Gradient1, + md.results.StressbalanceSolution.J, + md.results.StressbalanceSolution.MaterialsRheologyBbar, + md.results.StressbalanceSolution.Pressure, + md.results.StressbalanceSolution.Vel, + md.results.StressbalanceSolution.Vx, + md.results.StressbalanceSolution.Vy] Index: /issm/trunk-jpl/test/NightlyRun/test216.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test216.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test216.py (revision 23793) @@ -3,5 +3,4 @@ from model import * from socket import gethostname -import numpy as np from triangle import * from meshprocessrifts import * @@ -12,28 +11,26 @@ from generic import generic -md=triangle(model(),'../Exp/SquareHole.exp','../Exp/Rifts.exp',50000.) -md=meshprocessrifts(md,'../Exp/Square.exp') -md=setmask(md,'all','') -md=parameterize(md,'../Par/SquareShelf2.py') -md=setflowequation(md,'SSA','all') -md.cluster=generic('name',gethostname(),'np',3) +md = triangle(model(), '../Exp/SquareHole.exp', '../Exp/Rifts.exp', 50000.) +md = meshprocessrifts(md, '../Exp/Square.exp') +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelf2.py') +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) # rift settings -md.rifts.riftstruct[0]['fill']='Melange' -md.rifts.riftstruct[0]['fraction']=0 -md.stressbalance.rift_penalty_lock=2 -md.stressbalance.rift_penalty_threshold=0 -md.rifts.riftstruct[0]['fractionincrement']=0.1 -md=solve(md,'Stressbalance') +md.rifts.riftstruct[0]['fill'] = 'Melange' +md.rifts.riftstruct[0]['fraction'] = 0 +md.stressbalance.rift_penalty_lock = 2 +md.stressbalance.rift_penalty_threshold = 0 +md.rifts.riftstruct[0]['fractionincrement'] = 0.1 +md = solve(md, 'Stressbalance') # Fields and tolerances to track changes -field_names =['Vx','Vy','Vel','Pressure'] -field_tolerances=[9e-7,7e-8,9e-8,2e-11] -field_values=[\ - md.results.StressbalanceSolution.Vx,\ - md.results.StressbalanceSolution.Vy,\ - md.results.StressbalanceSolution.Vel,\ - md.results.StressbalanceSolution.Pressure,\ - ] +field_names = ['Vx', 'Vy', 'Vel', 'Pressure'] +field_tolerances = [9e-7, 7e-8, 9e-8, 2e-11] +field_values = [md.results.StressbalanceSolution.Vx, + md.results.StressbalanceSolution.Vy, + md.results.StressbalanceSolution.Vel, + md.results.StressbalanceSolution.Pressure] Index: /issm/trunk-jpl/test/NightlyRun/test217.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test217.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test217.py (revision 23793) @@ -11,70 +11,70 @@ from generic import generic -md=triangle(model(),'../Exp/Square.exp',150000) -md=setmask(md,'all','') -md=parameterize(md,'../Par/SquareShelf.py') -md=setflowequation(md,'SSA','all') -md.cluster=generic('name',gethostname(),'np',3) +md = triangle(model(), '../Exp/Square.exp', 150000) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelf.py') +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) -# redo the parameter file for this special shelf. -# constant thickness, constrained (vy=0) flow into an icefront, +# 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. # tighten -md.stressbalance.restol=1e-4 +md.stressbalance.restol = 1e-4 # needed later -ymin=min(md.mesh.y) -ymax=max(md.mesh.y) -xmin=min(md.mesh.x) -xmax=max(md.mesh.x) +ymin = min(md.mesh.y) +ymax = max(md.mesh.y) +xmin = min(md.mesh.x) +xmax = max(md.mesh.x) -di=md.materials.rho_ice/md.materials.rho_water +di = md.materials.rho_ice / md.materials.rho_water -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.surface=md.geometry.base+md.geometry.thickness +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.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.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)) # Boundary conditions: -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)) # constrain flanks to 0 normal velocity -pos=np.where(np.logical_or(md.mesh.x==xmin,md.mesh.x==xmax)) -md.stressbalance.spcvx[pos]=0 -md.stressbalance.spcvz[pos]=np.nan +pos = np.where(np.logical_or(md.mesh.x == xmin, md.mesh.x == xmax)) +md.stressbalance.spcvx[pos] = 0 +md.stressbalance.spcvz[pos] = np.nan # constrain grounding line to 0 velocity -pos=np.where(md.mesh.y==ymin) -md.stressbalance.spcvx[pos]=0 -md.stressbalance.spcvy[pos]=0 +pos = np.where(md.mesh.y == ymin) +md.stressbalance.spcvx[pos] = 0 +md.stressbalance.spcvy[pos] = 0 # icefront -nodeonicefront=np.zeros(md.mesh.numberofvertices) -pos=np.where(md.mesh.y==ymax) -nodeonicefront[pos]=1 -md.mask.ice_levelset=-1+nodeonicefront +nodeonicefront = np.zeros(md.mesh.numberofvertices) +pos = np.where(md.mesh.y == ymax) +nodeonicefront[pos] = 1 +md.mask.ice_levelset = -1 + nodeonicefront -md=solve(md,'Stressbalance') +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 +# vy_c = ey_c.*md.mesh.y*md.constants.yts # Fields and tolerances to track changes -field_names =['Vy'] -field_tolerances=[1e-13] -field_values=[md.results.StressbalanceSolution.Vy] +field_names = ['Vy'] +field_tolerances = [1e-13] +field_values = [md.results.StressbalanceSolution.Vy] Index: /issm/trunk-jpl/test/NightlyRun/test218.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test218.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test218.py (revision 23793) @@ -22,12 +22,12 @@ from verbose import * -md = squaremesh(model(),1000000,1000000,5,5) -md = setmask(md,'all','') -md = parameterize(md,'../Par/SquareShelf2.py') -md = setflowequation(md,'SSA','all') -md.cluster = generic('name',gethostname(),'np',3) +md = squaremesh(model(), 1000000, 1000000, 5, 5) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelf2.py') +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) -#redo the parameter file for this special shelf. -#constant thickness, constrained (vy=0) flow into an icefront, +#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. @@ -67,5 +67,5 @@ #constrain grounding line to 0 velocity -pos = np.where(md.mesh.y ==ymin) +pos = np.where(md.mesh.y == ymin) md.stressbalance.spcvx[pos] = 0. md.stressbalance.spcvy[pos] = 0. @@ -73,6 +73,6 @@ #partitioning md.qmu.numberofpartitions = md.mesh.numberofvertices -md = partitioner(md,'package','linear','npart',md.qmu.numberofpartitions) -md.qmu.partition = (md.qmu.partition - 1.).reshape(-1,1).T +md = partitioner(md, 'package', 'linear', 'npart', md.qmu.numberofpartitions) +md.qmu.partition = (md.qmu.partition - 1.).reshape(-1, 1).T #Dakota options @@ -81,11 +81,11 @@ version = IssmConfig('_DAKOTA_VERSION_') # returns tuple "(u'6.2',)" -> unicode string '6.2', convert to float -version=float(version[0]) +version = float(version[0]) #variables -md.qmu.variables.rheology_B = normal_uncertain.normal_uncertain('scaled_MaterialsRheologyB',1,.05) +md.qmu.variables.rheology_B = normal_uncertain.normal_uncertain('scaled_MaterialsRheologyB', 1, .05) #responses -md.qmu.responses.MaxVel = response_function.response_function('MaxVel',[],[0.0001,0.001,0.01,0.25,0.5,0.75,0.99,0.999,0.9999]) +md.qmu.responses.MaxVel = response_function.response_function('MaxVel', [], [0.0001, 0.001, 0.01, 0.25, 0.5, 0.75, 0.99, 0.999, 0.9999]) #method @@ -97,24 +97,24 @@ if version >= 6: - md.qmu.params.analysis_driver = 'matlab' - md.qmu.params.evaluation_scheduling = 'master' - md.qmu.params.processors_per_evaluation = 2 + md.qmu.params.analysis_driver = 'matlab' + md.qmu.params.evaluation_scheduling = 'master' + md.qmu.params.processors_per_evaluation = 2 else: - md.qmu.params.analysis_driver = 'stressbalance' - md.qmu.params.evaluation_concurrency = 1 + md.qmu.params.analysis_driver = 'stressbalance' + md.qmu.params.evaluation_concurrency = 1 -#imperative! -md.stressbalance.reltol = 10**-10 #tighten for qmu analysis +#imperative! +md.stressbalance.reltol = 10**-10 #tighten for qmu analysis md.qmu.isdakota = 1 #solve -md.verbose = verbose('000000000') # this line is recommended -md = solve(md,'Stressbalance','overwrite','y') +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] -field_values=[md.results.dakota.importancefactors] +field_values = [md.results.dakota.importancefactors] Index: /issm/trunk-jpl/test/NightlyRun/test219.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test219.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test219.py (revision 23793) @@ -3,5 +3,4 @@ from model import * from socket import gethostname -import numpy as np from triangle import * from setmask import * @@ -11,21 +10,19 @@ from generic import generic -md=triangle(model(),'../Exp/Square.exp',150000.) -md=setmask(md,'all','') -md=parameterize(md,'../Par/SquareShelf.py') -md.extrude(3,2.) -md=setflowequation(md,'HO','../Exp/SquareHalfRight.exp','fill','SSA') -md.cluster=generic('name',gethostname(),'np',3) -md=solve(md,'Stressbalance') +md = triangle(model(), '../Exp/Square.exp', 150000.) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelf.py') +md.extrude(3, 2.) +md = setflowequation(md, 'HO', '../Exp/SquareHalfRight.exp', 'fill', 'SSA') +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'Stressbalance') # Fields and tolerances to track changes -field_names =['Vx','Vy','Vz','Vel','Pressure'] -field_tolerances=[5e-09,5e-09,5e-09,5e-09,1e-13] -field_values=[\ - md.results.StressbalanceSolution.Vx,\ - md.results.StressbalanceSolution.Vy,\ - md.results.StressbalanceSolution.Vz,\ - md.results.StressbalanceSolution.Vel,\ - md.results.StressbalanceSolution.Pressure,\ - ] +field_names = ['Vx', 'Vy', 'Vz', 'Vel', 'Pressure'] +field_tolerances = [5e-09, 5e-09, 5e-09, 5e-09, 1e-13] +field_values = [md.results.StressbalanceSolution.Vx, + md.results.StressbalanceSolution.Vy, + md.results.StressbalanceSolution.Vz, + md.results.StressbalanceSolution.Vel, + md.results.StressbalanceSolution.Pressure] Index: /issm/trunk-jpl/test/NightlyRun/test220.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test220.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test220.py (revision 23793) @@ -3,5 +3,4 @@ from model import * from socket import gethostname -import numpy as np from triangle import * from setmask import * @@ -11,21 +10,19 @@ from generic import generic -md=triangle(model(),'../Exp/Square.exp',120000.) -md=setmask(md,'all','') -md=parameterize(md,'../Par/SquareShelf2.py') -md.extrude(2,1.) -md=setflowequation(md,'FS','../Exp/SquareHalfRight.exp','fill','HO') -md.cluster=generic('name',gethostname(),'np',3) -md=solve(md,'Stressbalance') +md = triangle(model(), '../Exp/Square.exp', 120000.) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelf2.py') +md.extrude(2, 1.) +md = setflowequation(md, 'FS', '../Exp/SquareHalfRight.exp', 'fill', 'HO') +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'Stressbalance') # Fields and tolerances to track changes -field_names =['Vx','Vy','Vz','Vel','Pressure'] -field_tolerances=[1e-09,1e-09,5e-06,1e-09,1e-09] -field_values=[\ - md.results.StressbalanceSolution.Vx,\ - md.results.StressbalanceSolution.Vy,\ - md.results.StressbalanceSolution.Vz,\ - md.results.StressbalanceSolution.Vel,\ - md.results.StressbalanceSolution.Pressure,\ - ] +field_names = ['Vx', 'Vy', 'Vz', 'Vel', 'Pressure'] +field_tolerances = [1e-09, 1e-09, 5e-06, 1e-09, 1e-09] +field_values = [md.results.StressbalanceSolution.Vx, + md.results.StressbalanceSolution.Vy, + md.results.StressbalanceSolution.Vz, + md.results.StressbalanceSolution.Vel, + md.results.StressbalanceSolution.Pressure] Index: /issm/trunk-jpl/test/NightlyRun/test221.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test221.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test221.py (revision 23793) @@ -9,20 +9,18 @@ -md=triangle(model(),'../Exp/Square.exp',120000.) -md=setmask(md,'all','') -md=parameterize(md,'../Par/SquareShelf2.py') -md.extrude(2,1.) -md=setflowequation(md,'FS','../Exp/SquareHalfRight.exp','fill','SSA') -md.cluster=generic('name',gethostname(),'np',3) -md=solve(md,'Stressbalance') +md = triangle(model(), '../Exp/Square.exp', 120000.) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelf2.py') +md.extrude(2, 1.) +md = setflowequation(md, 'FS', '../Exp/SquareHalfRight.exp', 'fill', 'SSA') +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'Stressbalance') #Fields and tolerances to track changes -field_names =['Vx','Vy','Vz','Vel','Pressure'] -field_tolerances=[1e-09,1e-09,5e-06,1e-09,1e-09] -field_values=[\ - md.results.StressbalanceSolution.Vx,\ - md.results.StressbalanceSolution.Vy,\ - md.results.StressbalanceSolution.Vz,\ - md.results.StressbalanceSolution.Vel,\ - md.results.StressbalanceSolution.Pressure,\ - ] +field_names = ['Vx', 'Vy', 'Vz', 'Vel', 'Pressure'] +field_tolerances = [1e-09, 1e-09, 5e-06, 1e-09, 1e-09] +field_values = [md.results.StressbalanceSolution.Vx, + md.results.StressbalanceSolution.Vy, + md.results.StressbalanceSolution.Vz, + md.results.StressbalanceSolution.Vel, + md.results.StressbalanceSolution.Pressure] Index: /issm/trunk-jpl/test/NightlyRun/test222.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test222.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test222.py (revision 23793) @@ -9,36 +9,44 @@ -md=triangle(model(),'../Exp/Square.exp',150000.) -md=setmask(md,'all','') -md=parameterize(md,'../Par/SquareShelf.py') -md=setflowequation(md,'SSA','all') -md.cluster=generic('name',gethostname(),'np',3) -md.masstransport.hydrostatic_adjustment='Incremental' -md=solve(md,'Transient') +md = triangle(model(), '../Exp/Square.exp', 150000.) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelf.py') +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) +md.masstransport.hydrostatic_adjustment = 'Incremental' +md = solve(md, 'Transient') #Fields and tolerances to track changes -field_names =['Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3'] -field_tolerances=[1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13] -field_values=[\ - md.results.TransientSolution[0].Vx,\ - md.results.TransientSolution[0].Vy,\ - md.results.TransientSolution[0].Vel,\ - md.results.TransientSolution[0].Pressure,\ - md.results.TransientSolution[0].Base,\ - md.results.TransientSolution[0].Surface,\ - md.results.TransientSolution[0].Thickness,\ - md.results.TransientSolution[1].Vx,\ - md.results.TransientSolution[1].Vy,\ - md.results.TransientSolution[1].Vel,\ - md.results.TransientSolution[1].Pressure,\ - md.results.TransientSolution[1].Base,\ - md.results.TransientSolution[1].Surface,\ - md.results.TransientSolution[1].Thickness,\ - md.results.TransientSolution[2].Vx,\ - md.results.TransientSolution[2].Vy,\ - md.results.TransientSolution[2].Vel,\ - md.results.TransientSolution[2].Pressure,\ - md.results.TransientSolution[2].Base,\ - md.results.TransientSolution[2].Surface,\ - md.results.TransientSolution[2].Thickness,\ - ] +field_names = ['Vx1', 'Vy1', 'Vel1', 'Pressure1', + 'Bed1', 'Surface1', 'Thickness1', + 'Vx2', 'Vy2', 'Vel2', 'Pressure2', + 'Bed2', 'Surface2', 'Thickness2', + 'Vx3', 'Vy3', 'Vel3', 'Pressure3', + 'Bed3', 'Surface3', 'Thickness3'] +field_tolerances = [1e-13, 1e-13, 1e-13, 1e-13, + 1e-13, 1e-13, 1e-13, + 1e-13, 1e-13, 1e-13, 1e-13, + 1e-13, 1e-13, 1e-13, + 1e-13, 1e-13, 1e-13, 1e-13, + 1e-13, 1e-13, 1e-13] +field_values = [md.results.TransientSolution[0].Vx, + md.results.TransientSolution[0].Vy, + md.results.TransientSolution[0].Vel, + md.results.TransientSolution[0].Pressure, + md.results.TransientSolution[0].Base, + md.results.TransientSolution[0].Surface, + md.results.TransientSolution[0].Thickness, + md.results.TransientSolution[1].Vx, + md.results.TransientSolution[1].Vy, + md.results.TransientSolution[1].Vel, + md.results.TransientSolution[1].Pressure, + md.results.TransientSolution[1].Base, + md.results.TransientSolution[1].Surface, + md.results.TransientSolution[1].Thickness, + md.results.TransientSolution[2].Vx, + md.results.TransientSolution[2].Vy, + md.results.TransientSolution[2].Vel, + md.results.TransientSolution[2].Pressure, + md.results.TransientSolution[2].Base, + md.results.TransientSolution[2].Surface, + md.results.TransientSolution[2].Thickness] Index: /issm/trunk-jpl/test/NightlyRun/test223.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test223.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test223.py (revision 23793) @@ -9,38 +9,46 @@ -md=triangle(model(),'../Exp/Square.exp',150000.) -md=setmask(md,'all','') -md=parameterize(md,'../Par/SquareShelf.py') -md=setflowequation(md,'SSA','all') -md.geometry.base=md.geometry.base+50. -md.geometry.surface=md.geometry.surface+50. -md.cluster=generic('name',gethostname(),'np',1) -md.masstransport.hydrostatic_adjustment='Incremental' -md=solve(md,'Transient') +md = triangle(model(), '../Exp/Square.exp', 150000.) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelf.py') +md = setflowequation(md, 'SSA', 'all') +md.geometry.base = md.geometry.base + 50. +md.geometry.surface = md.geometry.surface + 50. +md.cluster = generic('name', gethostname(), 'np', 1) +md.masstransport.hydrostatic_adjustment = 'Incremental' +md = solve(md, 'Transient') #Fields and tolerances to track changes -field_names =['Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3'] -field_tolerances=[1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13] -field_values=[\ - md.results.TransientSolution[0].Vx,\ - md.results.TransientSolution[0].Vy,\ - md.results.TransientSolution[0].Vel,\ - md.results.TransientSolution[0].Pressure,\ - md.results.TransientSolution[0].Base,\ - md.results.TransientSolution[0].Surface,\ - md.results.TransientSolution[0].Thickness,\ - md.results.TransientSolution[1].Vx,\ - md.results.TransientSolution[1].Vy,\ - md.results.TransientSolution[1].Vel,\ - md.results.TransientSolution[1].Pressure,\ - md.results.TransientSolution[1].Base,\ - md.results.TransientSolution[1].Surface,\ - md.results.TransientSolution[1].Thickness,\ - md.results.TransientSolution[2].Vx,\ - md.results.TransientSolution[2].Vy,\ - md.results.TransientSolution[2].Vel,\ - md.results.TransientSolution[2].Pressure,\ - md.results.TransientSolution[2].Base,\ - md.results.TransientSolution[2].Surface,\ - md.results.TransientSolution[2].Thickness,\ - ] +field_names = ['Vx1', 'Vy1', 'Vel1', 'Pressure1', + 'Bed1', 'Surface1', 'Thickness1', + 'Vx2', 'Vy2', 'Vel2', 'Pressure2', + 'Bed2', 'Surface2', 'Thickness2', + 'Vx3', 'Vy3', 'Vel3', 'Pressure3', + 'Bed3', 'Surface3', 'Thickness3'] +field_tolerances = [1e-13, 1e-13, 1e-13, 1e-13, + 1e-13, 1e-13, 1e-13, + 1e-13, 1e-13, 1e-13, 1e-13, + 1e-13, 1e-13, 1e-13, + 1e-13, 1e-13, 1e-13, 1e-13, + 1e-13, 1e-13, 1e-13] +field_values = [md.results.TransientSolution[0].Vx, + md.results.TransientSolution[0].Vy, + md.results.TransientSolution[0].Vel, + md.results.TransientSolution[0].Pressure, + md.results.TransientSolution[0].Base, + md.results.TransientSolution[0].Surface, + md.results.TransientSolution[0].Thickness, + md.results.TransientSolution[1].Vx, + md.results.TransientSolution[1].Vy, + md.results.TransientSolution[1].Vel, + md.results.TransientSolution[1].Pressure, + md.results.TransientSolution[1].Base, + md.results.TransientSolution[1].Surface, + md.results.TransientSolution[1].Thickness, + md.results.TransientSolution[2].Vx, + md.results.TransientSolution[2].Vy, + md.results.TransientSolution[2].Vel, + md.results.TransientSolution[2].Pressure, + md.results.TransientSolution[2].Base, + md.results.TransientSolution[2].Surface, + md.results.TransientSolution[2].Thickness] Index: /issm/trunk-jpl/test/NightlyRun/test224.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test224.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test224.py (revision 23793) @@ -9,51 +9,48 @@ -md=triangle(model(),'../Exp/Square.exp',200000.) -md=setmask(md,'all','') -md=parameterize(md,'../Par/SquareShelf.py') -md.extrude(3,1.) -md=setflowequation(md,'HO','all') -md.cluster=generic('name',gethostname(),'np',3) -md.masstransport.hydrostatic_adjustment='Incremental' -md=solve(md,'Transient') +md = triangle(model(), '../Exp/Square.exp', 200000.) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelf.py') +md.extrude(3, 1.) +md = setflowequation(md, 'HO', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) +md.masstransport.hydrostatic_adjustment = 'Incremental' +md = solve(md, 'Transient') #Fields and tolerances to track changes -field_names =['Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsGroundediceMeltingRate1', \ - 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsGroundediceMeltingRate2', \ - 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsGroundediceMeltingRate3'] -field_tolerances=[\ - 2e-09,2e-09,2e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,\ - 2e-09,5e-09,1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-06,\ - 2e-09,5e-09,1e-08,1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-05] -field_values=[\ - md.results.TransientSolution[0].Vx,\ - md.results.TransientSolution[0].Vy,\ - md.results.TransientSolution[0].Vz,\ - md.results.TransientSolution[0].Vel,\ - md.results.TransientSolution[0].Pressure,\ - md.results.TransientSolution[0].Base,\ - md.results.TransientSolution[0].Surface,\ - md.results.TransientSolution[0].Thickness,\ - md.results.TransientSolution[0].Temperature,\ - md.results.TransientSolution[0].BasalforcingsGroundediceMeltingRate,\ - md.results.TransientSolution[1].Vx,\ - md.results.TransientSolution[1].Vy,\ - md.results.TransientSolution[1].Vz,\ - md.results.TransientSolution[1].Vel,\ - md.results.TransientSolution[1].Pressure,\ - md.results.TransientSolution[1].Base,\ - md.results.TransientSolution[1].Surface,\ - md.results.TransientSolution[1].Thickness,\ - md.results.TransientSolution[1].Temperature,\ - md.results.TransientSolution[1].BasalforcingsGroundediceMeltingRate,\ - md.results.TransientSolution[2].Vx,\ - md.results.TransientSolution[2].Vy,\ - md.results.TransientSolution[2].Vz,\ - md.results.TransientSolution[2].Vel,\ - md.results.TransientSolution[2].Pressure,\ - md.results.TransientSolution[2].Base,\ - md.results.TransientSolution[2].Surface,\ - md.results.TransientSolution[2].Thickness,\ - md.results.TransientSolution[2].Temperature,\ - md.results.TransientSolution[2].BasalforcingsGroundediceMeltingRate,\ - ] +field_names = ['Vx1', 'Vy1', 'Vz1', 'Vel1', 'Pressure1', 'Bed1', 'Surface1', 'Thickness1', 'Temperature1', 'BasalforcingsGroundediceMeltingRate1', + 'Vx2', 'Vy2', 'Vz2', 'Vel2', 'Pressure2', 'Bed2', 'Surface2', 'Thickness2', 'Temperature2', 'BasalforcingsGroundediceMeltingRate2', + 'Vx3', 'Vy3', 'Vz3', 'Vel3', 'Pressure3', 'Bed3', 'Surface3', 'Thickness3', 'Temperature3', 'BasalforcingsGroundediceMeltingRate3'] +field_tolerances = [2e-09, 2e-09, 2e-09, 1e-09, 1e-09, 1e-09, 1e-09, 1e-09, 1e-09, 1e-09, + 2e-09, 5e-09, 1e-08, 1e-09, 1e-09, 1e-09, 1e-09, 1e-09, 1e-09, 1e-06, + 2e-09, 5e-09, 1e-08, 1e-08, 1e-09, 1e-09, 1e-09, 1e-09, 1e-09, 1e-05] +field_values = [md.results.TransientSolution[0].Vx, + md.results.TransientSolution[0].Vy, + md.results.TransientSolution[0].Vz, + md.results.TransientSolution[0].Vel, + md.results.TransientSolution[0].Pressure, + md.results.TransientSolution[0].Base, + md.results.TransientSolution[0].Surface, + md.results.TransientSolution[0].Thickness, + md.results.TransientSolution[0].Temperature, + md.results.TransientSolution[0].BasalforcingsGroundediceMeltingRate, + md.results.TransientSolution[1].Vx, + md.results.TransientSolution[1].Vy, + md.results.TransientSolution[1].Vz, + md.results.TransientSolution[1].Vel, + md.results.TransientSolution[1].Pressure, + md.results.TransientSolution[1].Base, + md.results.TransientSolution[1].Surface, + md.results.TransientSolution[1].Thickness, + md.results.TransientSolution[1].Temperature, + md.results.TransientSolution[1].BasalforcingsGroundediceMeltingRate, + md.results.TransientSolution[2].Vx, + md.results.TransientSolution[2].Vy, + md.results.TransientSolution[2].Vz, + md.results.TransientSolution[2].Vel, + md.results.TransientSolution[2].Pressure, + md.results.TransientSolution[2].Base, + md.results.TransientSolution[2].Surface, + md.results.TransientSolution[2].Thickness, + md.results.TransientSolution[2].Temperature, + md.results.TransientSolution[2].BasalforcingsGroundediceMeltingRate] Index: /issm/trunk-jpl/test/NightlyRun/test225.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test225.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test225.py (revision 23793) @@ -9,53 +9,50 @@ -md=triangle(model(),'../Exp/Square.exp',200000.) -md=setmask(md,'all','') -md=parameterize(md,'../Par/SquareShelf.py') -md.geometry.base=md.geometry.base+50. -md.geometry.surface=md.geometry.surface+50. -md.extrude(3,1.) -md=setflowequation(md,'HO','all') -md.cluster=generic('name',gethostname(),'np',3) -md.masstransport.hydrostatic_adjustment='Incremental' -md=solve(md,'Transient') +md = triangle(model(), '../Exp/Square.exp', 200000.) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelf.py') +md.geometry.base = md.geometry.base + 50. +md.geometry.surface = md.geometry.surface + 50. +md.extrude(3, 1.) +md = setflowequation(md, 'HO', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) +md.masstransport.hydrostatic_adjustment = 'Incremental' +md = solve(md, 'Transient') #Fields and tolerances to track changes -field_names =['Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsGroundediceMeltingRate1', \ - 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsGroundediceMeltingRate2', \ - 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsGroundediceMeltingRate3'] -field_tolerances=[\ - 1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-05,\ - 2e-09,1e-09,1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-05,\ - 1e-08,1e-08,1e-08,1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-05] -field_values=[\ - md.results.TransientSolution[0].Vx,\ - md.results.TransientSolution[0].Vy,\ - md.results.TransientSolution[0].Vz,\ - md.results.TransientSolution[0].Vel,\ - md.results.TransientSolution[0].Pressure,\ - md.results.TransientSolution[0].Base,\ - md.results.TransientSolution[0].Surface,\ - md.results.TransientSolution[0].Thickness,\ - md.results.TransientSolution[0].Temperature,\ - md.results.TransientSolution[0].BasalforcingsGroundediceMeltingRate,\ - md.results.TransientSolution[1].Vx,\ - md.results.TransientSolution[1].Vy,\ - md.results.TransientSolution[1].Vz,\ - md.results.TransientSolution[1].Vel,\ - md.results.TransientSolution[1].Pressure,\ - md.results.TransientSolution[1].Base,\ - md.results.TransientSolution[1].Surface,\ - md.results.TransientSolution[1].Thickness,\ - md.results.TransientSolution[1].Temperature,\ - md.results.TransientSolution[1].BasalforcingsGroundediceMeltingRate,\ - md.results.TransientSolution[2].Vx,\ - md.results.TransientSolution[2].Vy,\ - md.results.TransientSolution[2].Vz,\ - md.results.TransientSolution[2].Vel,\ - md.results.TransientSolution[2].Pressure,\ - md.results.TransientSolution[2].Base,\ - md.results.TransientSolution[2].Surface,\ - md.results.TransientSolution[2].Thickness,\ - md.results.TransientSolution[2].Temperature,\ - md.results.TransientSolution[2].BasalforcingsGroundediceMeltingRate,\ - ] +field_names = ['Vx1', 'Vy1', 'Vz1', 'Vel1', 'Pressure1', 'Bed1', 'Surface1', 'Thickness1', 'Temperature1', 'BasalforcingsGroundediceMeltingRate1', + 'Vx2', 'Vy2', 'Vz2', 'Vel2', 'Pressure2', 'Bed2', 'Surface2', 'Thickness2', 'Temperature2', 'BasalforcingsGroundediceMeltingRate2', + 'Vx3', 'Vy3', 'Vz3', 'Vel3', 'Pressure3', 'Bed3', 'Surface3', 'Thickness3', 'Temperature3', 'BasalforcingsGroundediceMeltingRate3'] +field_tolerances = [1e-09, 1e-09, 1e-09, 1e-09, 1e-09, 1e-09, 1e-09, 1e-09, 1e-09, 1e-05, + 2e-09, 1e-09, 1e-08, 1e-09, 1e-09, 1e-09, 1e-09, 1e-09, 1e-09, 1e-05, + 1e-08, 1e-08, 1e-08, 1e-08, 1e-09, 1e-09, 1e-09, 1e-09, 1e-09, 1e-05] +field_values = [md.results.TransientSolution[0].Vx, + md.results.TransientSolution[0].Vy, + md.results.TransientSolution[0].Vz, + md.results.TransientSolution[0].Vel, + md.results.TransientSolution[0].Pressure, + md.results.TransientSolution[0].Base, + md.results.TransientSolution[0].Surface, + md.results.TransientSolution[0].Thickness, + md.results.TransientSolution[0].Temperature, + md.results.TransientSolution[0].BasalforcingsGroundediceMeltingRate, + md.results.TransientSolution[1].Vx, + md.results.TransientSolution[1].Vy, + md.results.TransientSolution[1].Vz, + md.results.TransientSolution[1].Vel, + md.results.TransientSolution[1].Pressure, + md.results.TransientSolution[1].Base, + md.results.TransientSolution[1].Surface, + md.results.TransientSolution[1].Thickness, + md.results.TransientSolution[1].Temperature, + md.results.TransientSolution[1].BasalforcingsGroundediceMeltingRate, + md.results.TransientSolution[2].Vx, + md.results.TransientSolution[2].Vy, + md.results.TransientSolution[2].Vz, + md.results.TransientSolution[2].Vel, + md.results.TransientSolution[2].Pressure, + md.results.TransientSolution[2].Base, + md.results.TransientSolution[2].Surface, + md.results.TransientSolution[2].Thickness, + md.results.TransientSolution[2].Temperature, + md.results.TransientSolution[2].BasalforcingsGroundediceMeltingRate] Index: /issm/trunk-jpl/test/NightlyRun/test226.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test226.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test226.py (revision 23793) @@ -9,37 +9,45 @@ -md=triangle(model(),'../Exp/Square.exp',150000.) -md=setmask(md,'all','') -md=parameterize(md,'../Par/SquareShelf.py') -md=setflowequation(md,'SSA','all') -md.cluster=generic('name',gethostname(),'np',3) -md.timestepping = timesteppingadaptive(md.timestepping); -md.timestepping.final_time=15. -md=solve(md,'Transient') +md = triangle(model(), '../Exp/Square.exp', 150000.) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelf.py') +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) +md.timestepping = timesteppingadaptive(md.timestepping) +md.timestepping.final_time = 15. +md = solve(md, 'Transient') #Fields and tolerances to track changes -field_names =['Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3'] -field_tolerances=[1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13] -field_values=[\ - md.results.TransientSolution[0].Vx,\ - md.results.TransientSolution[0].Vy,\ - md.results.TransientSolution[0].Vel,\ - md.results.TransientSolution[0].Pressure,\ - md.results.TransientSolution[0].Base,\ - md.results.TransientSolution[0].Surface,\ - md.results.TransientSolution[0].Thickness,\ - md.results.TransientSolution[1].Vx,\ - md.results.TransientSolution[1].Vy,\ - md.results.TransientSolution[1].Vel,\ - md.results.TransientSolution[1].Pressure,\ - md.results.TransientSolution[1].Base,\ - md.results.TransientSolution[1].Surface,\ - md.results.TransientSolution[1].Thickness,\ - md.results.TransientSolution[2].Vx,\ - md.results.TransientSolution[2].Vy,\ - md.results.TransientSolution[2].Vel,\ - md.results.TransientSolution[2].Pressure,\ - md.results.TransientSolution[2].Base,\ - md.results.TransientSolution[2].Surface,\ - md.results.TransientSolution[2].Thickness,\ - ] +field_names = ['Vx1', 'Vy1', 'Vel1', 'Pressure1', + 'Bed1', 'Surface1', 'Thickness1', + 'Vx2', 'Vy2', 'Vel2', 'Pressure2', + 'Bed2', 'Surface2', 'Thickness2', + 'Vx3', 'Vy3', 'Vel3', 'Pressure3', + 'Bed3', 'Surface3', 'Thickness3'] +field_tolerances = [1e-13, 1e-13, 1e-13, 1e-13, + 1e-13, 1e-13, 1e-13, + 1e-13, 1e-13, 1e-13, 1e-13, + 1e-13, 1e-13, 1e-13, + 1e-13, 1e-13, 1e-13, 1e-13, + 1e-13, 1e-13, 1e-13] +field_values = [md.results.TransientSolution[0].Vx, + md.results.TransientSolution[0].Vy, + md.results.TransientSolution[0].Vel, + md.results.TransientSolution[0].Pressure, + md.results.TransientSolution[0].Base, + md.results.TransientSolution[0].Surface, + md.results.TransientSolution[0].Thickness, + md.results.TransientSolution[1].Vx, + md.results.TransientSolution[1].Vy, + md.results.TransientSolution[1].Vel, + md.results.TransientSolution[1].Pressure, + md.results.TransientSolution[1].Base, + md.results.TransientSolution[1].Surface, + md.results.TransientSolution[1].Thickness, + md.results.TransientSolution[2].Vx, + md.results.TransientSolution[2].Vy, + md.results.TransientSolution[2].Vel, + md.results.TransientSolution[2].Pressure, + md.results.TransientSolution[2].Base, + md.results.TransientSolution[2].Surface, + md.results.TransientSolution[2].Thickness] Index: /issm/trunk-jpl/test/NightlyRun/test227.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test227.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test227.py (revision 23793) @@ -9,52 +9,49 @@ -md=triangle(model(),'../Exp/Square.exp',200000.) -md=setmask(md,'all','') -md=parameterize(md,'../Par/SquareShelf.py') -md.extrude(3,1.) -md=setflowequation(md,'HO','all') -md.cluster=generic('name',gethostname(),'np',3) +md = triangle(model(), '../Exp/Square.exp', 200000.) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelf.py') +md.extrude(3, 1.) +md = setflowequation(md, 'HO', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) md.timestepping = timesteppingadaptive(md.timestepping) -md.timestepping.final_time=20. -md=solve(md,'Transient') +md.timestepping.final_time = 20. +md = solve(md, 'Transient') #Fields and tolerances to track changes -field_names =['Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsGroundediceMeltingRate1', \ - 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsGroundediceMeltingRate2', \ - 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsGroundediceMeltingRate3'] -field_tolerances=[\ - 1e-08,5e-09,1e-09,5e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,\ - 2e-09,5e-09,1e-08,5e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-06,\ - 1e-08,1e-08,1e-08,1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-05] -field_values=[\ - md.results.TransientSolution[0].Vx,\ - md.results.TransientSolution[0].Vy,\ - md.results.TransientSolution[0].Vz,\ - md.results.TransientSolution[0].Vel,\ - md.results.TransientSolution[0].Pressure,\ - md.results.TransientSolution[0].Base,\ - md.results.TransientSolution[0].Surface,\ - md.results.TransientSolution[0].Thickness,\ - md.results.TransientSolution[0].Temperature,\ - md.results.TransientSolution[0].BasalforcingsGroundediceMeltingRate,\ - md.results.TransientSolution[1].Vx,\ - md.results.TransientSolution[1].Vy,\ - md.results.TransientSolution[1].Vz,\ - md.results.TransientSolution[1].Vel,\ - md.results.TransientSolution[1].Pressure,\ - md.results.TransientSolution[1].Base,\ - md.results.TransientSolution[1].Surface,\ - md.results.TransientSolution[1].Thickness,\ - md.results.TransientSolution[1].Temperature,\ - md.results.TransientSolution[1].BasalforcingsGroundediceMeltingRate,\ - md.results.TransientSolution[2].Vx,\ - md.results.TransientSolution[2].Vy,\ - md.results.TransientSolution[2].Vz,\ - md.results.TransientSolution[2].Vel,\ - md.results.TransientSolution[2].Pressure,\ - md.results.TransientSolution[2].Base,\ - md.results.TransientSolution[2].Surface,\ - md.results.TransientSolution[2].Thickness,\ - md.results.TransientSolution[2].Temperature,\ - md.results.TransientSolution[2].BasalforcingsGroundediceMeltingRate,\ - ] +field_names = ['Vx1', 'Vy1', 'Vz1', 'Vel1', 'Pressure1', 'Bed1', 'Surface1', 'Thickness1', 'Temperature1', 'BasalforcingsGroundediceMeltingRate1', + 'Vx2', 'Vy2', 'Vz2', 'Vel2', 'Pressure2', 'Bed2', 'Surface2', 'Thickness2', 'Temperature2', 'BasalforcingsGroundediceMeltingRate2', + 'Vx3', 'Vy3', 'Vz3', 'Vel3', 'Pressure3', 'Bed3', 'Surface3', 'Thickness3', 'Temperature3', 'BasalforcingsGroundediceMeltingRate3'] +field_tolerances = [1e-08, 5e-09, 1e-09, 5e-09, 1e-09, 1e-09, 1e-09, 1e-09, 1e-09, 1e-09, + 2e-09, 5e-09, 1e-08, 5e-09, 1e-09, 1e-09, 1e-09, 1e-09, 1e-09, 1e-06, + 1e-08, 1e-08, 1e-08, 1e-08, 1e-09, 1e-09, 1e-09, 1e-09, 1e-09, 1e-05] +field_values = [md.results.TransientSolution[0].Vx, + md.results.TransientSolution[0].Vy, + md.results.TransientSolution[0].Vz, + md.results.TransientSolution[0].Vel, + md.results.TransientSolution[0].Pressure, + md.results.TransientSolution[0].Base, + md.results.TransientSolution[0].Surface, + md.results.TransientSolution[0].Thickness, + md.results.TransientSolution[0].Temperature, + md.results.TransientSolution[0].BasalforcingsGroundediceMeltingRate, + md.results.TransientSolution[1].Vx, + md.results.TransientSolution[1].Vy, + md.results.TransientSolution[1].Vz, + md.results.TransientSolution[1].Vel, + md.results.TransientSolution[1].Pressure, + md.results.TransientSolution[1].Base, + md.results.TransientSolution[1].Surface, + md.results.TransientSolution[1].Thickness, + md.results.TransientSolution[1].Temperature, + md.results.TransientSolution[1].BasalforcingsGroundediceMeltingRate, + md.results.TransientSolution[2].Vx, + md.results.TransientSolution[2].Vy, + md.results.TransientSolution[2].Vz, + md.results.TransientSolution[2].Vel, + md.results.TransientSolution[2].Pressure, + md.results.TransientSolution[2].Base, + md.results.TransientSolution[2].Surface, + md.results.TransientSolution[2].Thickness, + md.results.TransientSolution[2].Temperature, + md.results.TransientSolution[2].BasalforcingsGroundediceMeltingRate] Index: /issm/trunk-jpl/test/NightlyRun/test228.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test228.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test228.py (revision 23793) @@ -10,62 +10,62 @@ -md=triangle(model(),'../Exp/Square.exp',150000.) -md=setmask(md,'all','') -md=parameterize(md,'../Par/SquareShelf.py') -md=setflowequation(md,'SSA','all') -md.cluster=generic('name',gethostname(),'np',3) +md = triangle(model(), '../Exp/Square.exp', 150000.) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelf.py') +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) -md.timestepping.time_step=1. -md.settings.output_frequency=1 -md.timestepping.final_time=4. +md.timestepping.time_step = 1. +md.settings.output_frequency = 1 +md.timestepping.final_time = 4. #Set up transient -smb=np.ones((md.mesh.numberofvertices))*3.6 -smb=np.vstack((smb,smb*-1.)).T +smb = np.ones((md.mesh.numberofvertices)) * 3.6 +smb = np.vstack((smb, smb * -1.)).T -md.smb.mass_balance=np.vstack((smb,[1.5,3.])) -md.transient.isthermal=False +md.smb.mass_balance = np.vstack((smb, [1.5, 3.])) +md.transient.isthermal = False -md=solve(md,'Transient') +md = solve(md, 'Transient') #Fields and tolerances to track changes -field_names=['Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','SmbMassBalance1', - 'Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2','SmbMassBalance2', - 'Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3','SmbMassBalance3', - 'Vx4','Vy4','Vel4','Pressure4','Bed4','Surface4','Thickness4','SmbMassBalance4'] -field_tolerances=[1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10, - 1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10, - 1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10, - 1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10] -field_values=[md.results.TransientSolution[0].Vx, - md.results.TransientSolution[0].Vy, - md.results.TransientSolution[0].Vel, - md.results.TransientSolution[0].Pressure, - md.results.TransientSolution[0].Base, - md.results.TransientSolution[0].Surface, - md.results.TransientSolution[0].Thickness, - md.results.TransientSolution[0].SmbMassBalance, - md.results.TransientSolution[1].Vx, - md.results.TransientSolution[1].Vy, - md.results.TransientSolution[1].Vel, - md.results.TransientSolution[1].Pressure, - md.results.TransientSolution[1].Base, - md.results.TransientSolution[1].Surface, - md.results.TransientSolution[1].Thickness, - md.results.TransientSolution[1].SmbMassBalance, - md.results.TransientSolution[2].Vx, - md.results.TransientSolution[2].Vy, - md.results.TransientSolution[2].Vel, - md.results.TransientSolution[2].Pressure, - md.results.TransientSolution[2].Base, - md.results.TransientSolution[2].Surface, - md.results.TransientSolution[2].Thickness, - md.results.TransientSolution[2].SmbMassBalance, - md.results.TransientSolution[3].Vx, - md.results.TransientSolution[3].Vy, - md.results.TransientSolution[3].Vel, - md.results.TransientSolution[3].Pressure, - md.results.TransientSolution[3].Base, - md.results.TransientSolution[3].Surface, - md.results.TransientSolution[3].Thickness, - md.results.TransientSolution[3].SmbMassBalance] +field_names = ['Vx1', 'Vy1', 'Vel1', 'Pressure1', 'Bed1', 'Surface1', 'Thickness1', 'SmbMassBalance1', + 'Vx2', 'Vy2', 'Vel2', 'Pressure2', 'Bed2', 'Surface2', 'Thickness2', 'SmbMassBalance2', + 'Vx3', 'Vy3', 'Vel3', 'Pressure3', 'Bed3', 'Surface3', 'Thickness3', 'SmbMassBalance3', + 'Vx4', 'Vy4', 'Vel4', 'Pressure4', 'Bed4', 'Surface4', 'Thickness4', 'SmbMassBalance4'] +field_tolerances = [1e-09, 1e-09, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10, + 1e-09, 1e-09, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10, + 1e-09, 1e-09, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10, + 1e-09, 1e-09, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10] +field_values = [md.results.TransientSolution[0].Vx, + md.results.TransientSolution[0].Vy, + md.results.TransientSolution[0].Vel, + md.results.TransientSolution[0].Pressure, + md.results.TransientSolution[0].Base, + md.results.TransientSolution[0].Surface, + md.results.TransientSolution[0].Thickness, + md.results.TransientSolution[0].SmbMassBalance, + md.results.TransientSolution[1].Vx, + md.results.TransientSolution[1].Vy, + md.results.TransientSolution[1].Vel, + md.results.TransientSolution[1].Pressure, + md.results.TransientSolution[1].Base, + md.results.TransientSolution[1].Surface, + md.results.TransientSolution[1].Thickness, + md.results.TransientSolution[1].SmbMassBalance, + md.results.TransientSolution[2].Vx, + md.results.TransientSolution[2].Vy, + md.results.TransientSolution[2].Vel, + md.results.TransientSolution[2].Pressure, + md.results.TransientSolution[2].Base, + md.results.TransientSolution[2].Surface, + md.results.TransientSolution[2].Thickness, + md.results.TransientSolution[2].SmbMassBalance, + md.results.TransientSolution[3].Vx, + md.results.TransientSolution[3].Vy, + md.results.TransientSolution[3].Vel, + md.results.TransientSolution[3].Pressure, + md.results.TransientSolution[3].Base, + md.results.TransientSolution[3].Surface, + md.results.TransientSolution[3].Thickness, + md.results.TransientSolution[3].SmbMassBalance] Index: /issm/trunk-jpl/test/NightlyRun/test229.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test229.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test229.py (revision 23793) @@ -10,62 +10,62 @@ -md=triangle(model(),'../Exp/Square.exp',150000.) -md=setmask(md,'all','') -md=parameterize(md,'../Par/SquareShelf.py') -md=setflowequation(md,'SSA','all') -md.cluster=generic('name',gethostname(),'np',3) +md = triangle(model(), '../Exp/Square.exp', 150000.) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelf.py') +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) -md.timestepping.time_step=1. -md.settings.output_frequency=1 -md.timestepping.final_time=4. +md.timestepping.time_step = 1. +md.settings.output_frequency = 1 +md.timestepping.final_time = 4. #Set up transient -smb=np.ones((md.mesh.numberofvertices))*3.6 -smb=np.vstack((smb,smb*2.)).T +smb = np.ones((md.mesh.numberofvertices)) * 3.6 +smb = np.vstack((smb, smb * 2.)).T -md.smb.mass_balance=np.vstack((smb,[1.5,3.])) -md.transient.isthermal=False +md.smb.mass_balance = np.vstack((smb, [1.5, 3.])) +md.transient.isthermal = False -md=solve(md,'Transient') +md = solve(md, 'Transient') #Fields and tolerances to track changes -field_names=['Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','SmbMassBalance1', - 'Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2','SmbMassBalance2', - 'Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3','SmbMassBalance3', - 'Vx4','Vy4','Vel4','Pressure4','Bed4','Surface4','Thickness4','SmbMassBalance4'] -field_tolerances=[1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10, - 1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10, - 1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10, - 1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10] -field_values=[md.results.TransientSolution[0].Vx, - md.results.TransientSolution[0].Vy, - md.results.TransientSolution[0].Vel, - md.results.TransientSolution[0].Pressure, - md.results.TransientSolution[0].Base, - md.results.TransientSolution[0].Surface, - md.results.TransientSolution[0].Thickness, - md.results.TransientSolution[0].SmbMassBalance, - md.results.TransientSolution[1].Vx, - md.results.TransientSolution[1].Vy, - md.results.TransientSolution[1].Vel, - md.results.TransientSolution[1].Pressure, - md.results.TransientSolution[1].Base, - md.results.TransientSolution[1].Surface, - md.results.TransientSolution[1].Thickness, - md.results.TransientSolution[1].SmbMassBalance, - md.results.TransientSolution[2].Vx, - md.results.TransientSolution[2].Vy, - md.results.TransientSolution[2].Vel, - md.results.TransientSolution[2].Pressure, - md.results.TransientSolution[2].Base, - md.results.TransientSolution[2].Surface, - md.results.TransientSolution[2].Thickness, - md.results.TransientSolution[2].SmbMassBalance, - md.results.TransientSolution[3].Vx, - md.results.TransientSolution[3].Vy, - md.results.TransientSolution[3].Vel, - md.results.TransientSolution[3].Pressure, - md.results.TransientSolution[3].Base, - md.results.TransientSolution[3].Surface, - md.results.TransientSolution[3].Thickness, - md.results.TransientSolution[3].SmbMassBalance] +field_names = ['Vx1', 'Vy1', 'Vel1', 'Pressure1', 'Bed1', 'Surface1', 'Thickness1', 'SmbMassBalance1', + 'Vx2', 'Vy2', 'Vel2', 'Pressure2', 'Bed2', 'Surface2', 'Thickness2', 'SmbMassBalance2', + 'Vx3', 'Vy3', 'Vel3', 'Pressure3', 'Bed3', 'Surface3', 'Thickness3', 'SmbMassBalance3', + 'Vx4', 'Vy4', 'Vel4', 'Pressure4', 'Bed4', 'Surface4', 'Thickness4', 'SmbMassBalance4'] +field_tolerances = [1e-09, 1e-09, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10, + 1e-09, 1e-09, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10, + 1e-09, 1e-09, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10, + 1e-09, 1e-09, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10] +field_values = [md.results.TransientSolution[0].Vx, + md.results.TransientSolution[0].Vy, + md.results.TransientSolution[0].Vel, + md.results.TransientSolution[0].Pressure, + md.results.TransientSolution[0].Base, + md.results.TransientSolution[0].Surface, + md.results.TransientSolution[0].Thickness, + md.results.TransientSolution[0].SmbMassBalance, + md.results.TransientSolution[1].Vx, + md.results.TransientSolution[1].Vy, + md.results.TransientSolution[1].Vel, + md.results.TransientSolution[1].Pressure, + md.results.TransientSolution[1].Base, + md.results.TransientSolution[1].Surface, + md.results.TransientSolution[1].Thickness, + md.results.TransientSolution[1].SmbMassBalance, + md.results.TransientSolution[2].Vx, + md.results.TransientSolution[2].Vy, + md.results.TransientSolution[2].Vel, + md.results.TransientSolution[2].Pressure, + md.results.TransientSolution[2].Base, + md.results.TransientSolution[2].Surface, + md.results.TransientSolution[2].Thickness, + md.results.TransientSolution[2].SmbMassBalance, + md.results.TransientSolution[3].Vx, + md.results.TransientSolution[3].Vy, + md.results.TransientSolution[3].Vel, + md.results.TransientSolution[3].Pressure, + md.results.TransientSolution[3].Base, + md.results.TransientSolution[3].Surface, + md.results.TransientSolution[3].Thickness, + md.results.TransientSolution[3].SmbMassBalance] Index: /issm/trunk-jpl/test/NightlyRun/test230.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test230.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test230.py (revision 23793) @@ -10,67 +10,67 @@ -md=triangle(model(),'../Exp/Square.exp',350000.) -md=setmask(md,'all','') -md=parameterize(md,'../Par/SquareShelf.py') -md.extrude(3,1.) -md=setflowequation(md,'SSA','all') -md.cluster=generic('name',gethostname(),'np',3) +md = triangle(model(), '../Exp/Square.exp', 350000.) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelf.py') +md.extrude(3, 1.) +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) -md.timestepping.time_step=1. -md.settings.output_frequency=1 -md.timestepping.final_time=4. +md.timestepping.time_step = 1. +md.settings.output_frequency = 1 +md.timestepping.final_time = 4. #Set up transient -smb=np.ones((md.mesh.numberofvertices))*3.6 -smb=np.vstack((smb,smb*-1.)).T +smb = np.ones((md.mesh.numberofvertices)) * 3.6 +smb = np.vstack((smb, smb * -1.)).T -md.smb.mass_balance=np.vstack((smb,[1.5,3.])) -md.transient.isthermal=False +md.smb.mass_balance = np.vstack((smb, [1.5, 3.])) +md.transient.isthermal = False -md=solve(md,'Transient') +md = solve(md, 'Transient') #Fields and tolerances to track changes -field_names =['Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','SmbMassBalance1', - 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','SmbMassBalance2', - 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','SmbMassBalance3', - 'Vx4','Vy4','Vz4','Vel4','Pressure4','Bed4','Surface4','Thickness4','SmbMassbalance4'] -field_tolerances=[1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13, - 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13, - 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13, - 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13] -field_values=[md.results.TransientSolution[0].Vx, - md.results.TransientSolution[0].Vy, - md.results.TransientSolution[0].Vz, - md.results.TransientSolution[0].Vel, - md.results.TransientSolution[0].Pressure, - md.results.TransientSolution[0].Base, - md.results.TransientSolution[0].Surface, - md.results.TransientSolution[0].Thickness, - md.results.TransientSolution[0].SmbMassBalance, - md.results.TransientSolution[1].Vx, - md.results.TransientSolution[1].Vy, - md.results.TransientSolution[1].Vz, - md.results.TransientSolution[1].Vel, - md.results.TransientSolution[1].Pressure, - md.results.TransientSolution[1].Base, - md.results.TransientSolution[1].Surface, - md.results.TransientSolution[1].Thickness, - md.results.TransientSolution[1].SmbMassBalance, - md.results.TransientSolution[2].Vx, - md.results.TransientSolution[2].Vy, - md.results.TransientSolution[2].Vz, - md.results.TransientSolution[2].Vel, - md.results.TransientSolution[2].Pressure, - md.results.TransientSolution[2].Base, - md.results.TransientSolution[2].Surface, - md.results.TransientSolution[2].Thickness, - md.results.TransientSolution[2].SmbMassBalance, - md.results.TransientSolution[3].Vx, - md.results.TransientSolution[3].Vy, - md.results.TransientSolution[3].Vz, - md.results.TransientSolution[3].Vel, - md.results.TransientSolution[3].Pressure, - md.results.TransientSolution[3].Base, - md.results.TransientSolution[3].Surface, - md.results.TransientSolution[3].Thickness, - md.results.TransientSolution[3].SmbMassBalance] +field_names = ['Vx1', 'Vy1', 'Vz1', 'Vel1', 'Pressure1', 'Bed1', 'Surface1', 'Thickness1', 'SmbMassBalance1', + 'Vx2', 'Vy2', 'Vz2', 'Vel2', 'Pressure2', 'Bed2', 'Surface2', 'Thickness2', 'SmbMassBalance2', + 'Vx3', 'Vy3', 'Vz3', 'Vel3', 'Pressure3', 'Bed3', 'Surface3', 'Thickness3', 'SmbMassBalance3', + 'Vx4', 'Vy4', 'Vz4', 'Vel4', 'Pressure4', 'Bed4', 'Surface4', 'Thickness4', 'SmbMassbalance4'] +field_tolerances = [1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, + 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, + 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, + 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13] +field_values = [md.results.TransientSolution[0].Vx, + md.results.TransientSolution[0].Vy, + md.results.TransientSolution[0].Vz, + md.results.TransientSolution[0].Vel, + md.results.TransientSolution[0].Pressure, + md.results.TransientSolution[0].Base, + md.results.TransientSolution[0].Surface, + md.results.TransientSolution[0].Thickness, + md.results.TransientSolution[0].SmbMassBalance, + md.results.TransientSolution[1].Vx, + md.results.TransientSolution[1].Vy, + md.results.TransientSolution[1].Vz, + md.results.TransientSolution[1].Vel, + md.results.TransientSolution[1].Pressure, + md.results.TransientSolution[1].Base, + md.results.TransientSolution[1].Surface, + md.results.TransientSolution[1].Thickness, + md.results.TransientSolution[1].SmbMassBalance, + md.results.TransientSolution[2].Vx, + md.results.TransientSolution[2].Vy, + md.results.TransientSolution[2].Vz, + md.results.TransientSolution[2].Vel, + md.results.TransientSolution[2].Pressure, + md.results.TransientSolution[2].Base, + md.results.TransientSolution[2].Surface, + md.results.TransientSolution[2].Thickness, + md.results.TransientSolution[2].SmbMassBalance, + md.results.TransientSolution[3].Vx, + md.results.TransientSolution[3].Vy, + md.results.TransientSolution[3].Vz, + md.results.TransientSolution[3].Vel, + md.results.TransientSolution[3].Pressure, + md.results.TransientSolution[3].Base, + md.results.TransientSolution[3].Surface, + md.results.TransientSolution[3].Thickness, + md.results.TransientSolution[3].SmbMassBalance] Index: /issm/trunk-jpl/test/NightlyRun/test231.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test231.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test231.py (revision 23793) @@ -10,67 +10,67 @@ -md=triangle(model(),'../Exp/Square.exp',350000.) -md=setmask(md,'all','') -md=parameterize(md,'../Par/SquareShelf.py') -md.extrude(3,1.) -md=setflowequation(md,'SSA','all') -md.cluster=generic('name',gethostname(),'np',3) +md = triangle(model(), '../Exp/Square.exp', 350000.) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelf.py') +md.extrude(3, 1.) +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) -md.timestepping.time_step=1. -md.settings.output_frequency=1 -md.timestepping.final_time=4. +md.timestepping.time_step = 1. +md.settings.output_frequency = 1 +md.timestepping.final_time = 4. #Set up transient -smb=np.ones((md.mesh.numberofvertices))*3.6 -smb=np.vstack((smb,smb*2.)).T +smb = np.ones((md.mesh.numberofvertices)) * 3.6 +smb = np.vstack((smb, smb * 2.)).T -md.smb.mass_balance=np.vstack((smb,[1.5,3.])) -md.transient.isthermal=False +md.smb.mass_balance = np.vstack((smb, [1.5, 3.])) +md.transient.isthermal = False -md=solve(md,'Transient') +md = solve(md, 'Transient') #Fields and tolerances to track changes -field_names =['Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','SmbMassBalance1', - 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','SmbMassBalance2', - 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','SmbMassBalance3', - 'Vx4','Vy4','Vz4','Vel4','Pressure4','Bed4','Surface4','Thickness4','SmbMassbalance4'] -field_tolerances=[1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13, - 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13, - 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13, - 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13] -field_values=[md.results.TransientSolution[0].Vx, - md.results.TransientSolution[0].Vy, - md.results.TransientSolution[0].Vz, - md.results.TransientSolution[0].Vel, - md.results.TransientSolution[0].Pressure, - md.results.TransientSolution[0].Base, - md.results.TransientSolution[0].Surface, - md.results.TransientSolution[0].Thickness, - md.results.TransientSolution[0].SmbMassBalance, - md.results.TransientSolution[1].Vx, - md.results.TransientSolution[1].Vy, - md.results.TransientSolution[1].Vz, - md.results.TransientSolution[1].Vel, - md.results.TransientSolution[1].Pressure, - md.results.TransientSolution[1].Base, - md.results.TransientSolution[1].Surface, - md.results.TransientSolution[1].Thickness, - md.results.TransientSolution[1].SmbMassBalance, - md.results.TransientSolution[2].Vx, - md.results.TransientSolution[2].Vy, - md.results.TransientSolution[2].Vz, - md.results.TransientSolution[2].Vel, - md.results.TransientSolution[2].Pressure, - md.results.TransientSolution[2].Base, - md.results.TransientSolution[2].Surface, - md.results.TransientSolution[2].Thickness, - md.results.TransientSolution[2].SmbMassBalance, - md.results.TransientSolution[3].Vx, - md.results.TransientSolution[3].Vy, - md.results.TransientSolution[3].Vz, - md.results.TransientSolution[3].Vel, - md.results.TransientSolution[3].Pressure, - md.results.TransientSolution[3].Base, - md.results.TransientSolution[3].Surface, - md.results.TransientSolution[3].Thickness, - md.results.TransientSolution[3].SmbMassBalance] +field_names = ['Vx1', 'Vy1', 'Vz1', 'Vel1', 'Pressure1', 'Bed1', 'Surface1', 'Thickness1', 'SmbMassBalance1', + 'Vx2', 'Vy2', 'Vz2', 'Vel2', 'Pressure2', 'Bed2', 'Surface2', 'Thickness2', 'SmbMassBalance2', + 'Vx3', 'Vy3', 'Vz3', 'Vel3', 'Pressure3', 'Bed3', 'Surface3', 'Thickness3', 'SmbMassBalance3', + 'Vx4', 'Vy4', 'Vz4', 'Vel4', 'Pressure4', 'Bed4', 'Surface4', 'Thickness4', 'SmbMassbalance4'] +field_tolerances = [1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, + 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, + 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, + 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13] +field_values = [md.results.TransientSolution[0].Vx, + md.results.TransientSolution[0].Vy, + md.results.TransientSolution[0].Vz, + md.results.TransientSolution[0].Vel, + md.results.TransientSolution[0].Pressure, + md.results.TransientSolution[0].Base, + md.results.TransientSolution[0].Surface, + md.results.TransientSolution[0].Thickness, + md.results.TransientSolution[0].SmbMassBalance, + md.results.TransientSolution[1].Vx, + md.results.TransientSolution[1].Vy, + md.results.TransientSolution[1].Vz, + md.results.TransientSolution[1].Vel, + md.results.TransientSolution[1].Pressure, + md.results.TransientSolution[1].Base, + md.results.TransientSolution[1].Surface, + md.results.TransientSolution[1].Thickness, + md.results.TransientSolution[1].SmbMassBalance, + md.results.TransientSolution[2].Vx, + md.results.TransientSolution[2].Vy, + md.results.TransientSolution[2].Vz, + md.results.TransientSolution[2].Vel, + md.results.TransientSolution[2].Pressure, + md.results.TransientSolution[2].Base, + md.results.TransientSolution[2].Surface, + md.results.TransientSolution[2].Thickness, + md.results.TransientSolution[2].SmbMassBalance, + md.results.TransientSolution[3].Vx, + md.results.TransientSolution[3].Vy, + md.results.TransientSolution[3].Vz, + md.results.TransientSolution[3].Vel, + md.results.TransientSolution[3].Pressure, + md.results.TransientSolution[3].Base, + md.results.TransientSolution[3].Surface, + md.results.TransientSolution[3].Thickness, + md.results.TransientSolution[3].SmbMassBalance] Index: /issm/trunk-jpl/test/NightlyRun/test232.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test232.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test232.py (revision 23793) @@ -10,32 +10,35 @@ -md=triangle(model(),'../Exp/Square.exp',180000.) -md=setmask(md,'all','') -md=parameterize(md,'../Par/SquareShelf.py') -md.extrude(3,1.) -md=setflowequation(md,'SSA','all') -md.cluster=generic('name',gethostname(),'np',3) -md.thermal.spctemperature=np.vstack((np.vstack((md.thermal.spctemperature, md.thermal.spctemperature+5., md.thermal.spctemperature+10., md.thermal.spctemperature+15.)).T, [1.5,2.5,3.5,4.])) -md.timestepping.time_step=1. -md.timestepping.final_time=4. -md.transient.isstressbalance=False -md.transient.ismasstransport=False -md.transient.issmb=True -md.transient.isthermal=True -md.transient.isgroundingline=False -md=solve(md,'Transient') +md = triangle(model(), '../Exp/Square.exp', 180000.) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelf.py') +md.extrude(3, 1.) +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) +md.thermal.spctemperature = np.vstack((np.vstack((md.thermal.spctemperature, + md.thermal.spctemperature + 5., + md.thermal.spctemperature + 10., + md.thermal.spctemperature + 15.)).T, [1.5, 2.5, 3.5, 4.])) +md.timestepping.time_step = 1. +md.timestepping.final_time = 4. +md.transient.isstressbalance = False +md.transient.ismasstransport = False +md.transient.issmb = True +md.transient.isthermal = True +md.transient.isgroundingline = False +md = solve(md, 'Transient') #Fields and tolerances to track changes -field_names =['Temperature1','BasalforcingsGroundediceMeltingRate1', - 'Temperature2','BasalforcingsGroundediceMeltingRate2', - 'Temperature3','BasalforcingsGroundediceMeltingRate3', - 'Temperature4','BasalforcingsGroundediceMeltingRate4'] -field_tolerances=[1e-13,1e-6,1e-13,1e-6,1e-13,1e-6,1e-13,1e-6] -field_values=[md.results.TransientSolution[0].Temperature, - md.results.TransientSolution[0].BasalforcingsGroundediceMeltingRate, - md.results.TransientSolution[1].Temperature, - md.results.TransientSolution[1].BasalforcingsGroundediceMeltingRate, - md.results.TransientSolution[2].Temperature, - md.results.TransientSolution[2].BasalforcingsGroundediceMeltingRate, - md.results.TransientSolution[3].Temperature, - md.results.TransientSolution[3].BasalforcingsGroundediceMeltingRate] +field_names = ['Temperature1', 'BasalforcingsGroundediceMeltingRate1', + 'Temperature2', 'BasalforcingsGroundediceMeltingRate2', + 'Temperature3', 'BasalforcingsGroundediceMeltingRate3', + 'Temperature4', 'BasalforcingsGroundediceMeltingRate4'] +field_tolerances = [1e-13, 1e-6, 1e-13, 1e-6, 1e-13, 1e-6, 1e-13, 1e-6] +field_values = [md.results.TransientSolution[0].Temperature, + md.results.TransientSolution[0].BasalforcingsGroundediceMeltingRate, + md.results.TransientSolution[1].Temperature, + md.results.TransientSolution[1].BasalforcingsGroundediceMeltingRate, + md.results.TransientSolution[2].Temperature, + md.results.TransientSolution[2].BasalforcingsGroundediceMeltingRate, + md.results.TransientSolution[3].Temperature, + md.results.TransientSolution[3].BasalforcingsGroundediceMeltingRate] Index: /issm/trunk-jpl/test/NightlyRun/test233.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test233.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test233.py (revision 23793) @@ -10,62 +10,62 @@ -md=triangle(model(),'../Exp/Square.exp',200000.) -md=setmask(md,'all','') -md=parameterize(md,'../Par/SquareShelf.py') -md.extrude(3,1.) -md=setflowequation(md,'HO','all') -md.cluster=generic('name',gethostname(),'np',3) -md.thermal.spctemperature=np.vstack((np.vstack((md.thermal.spctemperature, md.thermal.spctemperature+5.)).T, [1.,2.])) -md.timestepping.time_step=0.5 -md.timestepping.final_time=2. -md=solve(md,'Transient') +md = triangle(model(), '../Exp/Square.exp', 200000.) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelf.py') +md.extrude(3, 1.) +md = setflowequation(md, 'HO', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) +md.thermal.spctemperature = np.vstack((np.vstack((md.thermal.spctemperature, md.thermal.spctemperature + 5.)).T, [1., 2.])) +md.timestepping.time_step = 0.5 +md.timestepping.final_time = 2. +md = solve(md, 'Transient') #Fields and tolerances to track changes -field_names =['Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsGroundediceMeltingRate1', - 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsGroundediceMeltingRate2', - 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsGroundediceMeltingRate3', - 'Vx4','Vy4','Vz4','Vel4','Pressure4','Bed4','Surface4','Thickness4','Temperature4','BasalforcingsGroundediceMeltingRate4'] -field_tolerances=[1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09, - 1e-09,1e-09,1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-06, - 1e-08,1e-09,1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-06, - 1e-08,1e-09,1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-06] -field_values=[md.results.TransientSolution[0].Vx, - md.results.TransientSolution[0].Vy, - md.results.TransientSolution[0].Vz, - md.results.TransientSolution[0].Vel, - md.results.TransientSolution[0].Pressure, - md.results.TransientSolution[0].Base, - md.results.TransientSolution[0].Surface, - md.results.TransientSolution[0].Thickness, - md.results.TransientSolution[0].Temperature, - md.results.TransientSolution[0].BasalforcingsGroundediceMeltingRate, - md.results.TransientSolution[1].Vx, - md.results.TransientSolution[1].Vy, - md.results.TransientSolution[1].Vz, - md.results.TransientSolution[1].Vel, - md.results.TransientSolution[1].Pressure, - md.results.TransientSolution[1].Base, - md.results.TransientSolution[1].Surface, - md.results.TransientSolution[1].Thickness, - md.results.TransientSolution[1].Temperature, - md.results.TransientSolution[1].BasalforcingsGroundediceMeltingRate, - md.results.TransientSolution[2].Vx, - md.results.TransientSolution[2].Vy, - md.results.TransientSolution[2].Vz, - md.results.TransientSolution[2].Vel, - md.results.TransientSolution[2].Pressure, - md.results.TransientSolution[2].Base, - md.results.TransientSolution[2].Surface, - md.results.TransientSolution[2].Thickness, - md.results.TransientSolution[2].Temperature, - md.results.TransientSolution[2].BasalforcingsGroundediceMeltingRate, - md.results.TransientSolution[3].Vx, - md.results.TransientSolution[3].Vy, - md.results.TransientSolution[3].Vz, - md.results.TransientSolution[3].Vel, - md.results.TransientSolution[3].Pressure, - md.results.TransientSolution[3].Base, - md.results.TransientSolution[3].Surface, - md.results.TransientSolution[3].Thickness, - md.results.TransientSolution[3].Temperature, - md.results.TransientSolution[3].BasalforcingsGroundediceMeltingRate] +field_names = ['Vx1', 'Vy1', 'Vz1', 'Vel1', 'Pressure1', 'Bed1', 'Surface1', 'Thickness1', 'Temperature1', 'BasalforcingsGroundediceMeltingRate1', + 'Vx2', 'Vy2', 'Vz2', 'Vel2', 'Pressure2', 'Bed2', 'Surface2', 'Thickness2', 'Temperature2', 'BasalforcingsGroundediceMeltingRate2', + 'Vx3', 'Vy3', 'Vz3', 'Vel3', 'Pressure3', 'Bed3', 'Surface3', 'Thickness3', 'Temperature3', 'BasalforcingsGroundediceMeltingRate3', + 'Vx4', 'Vy4', 'Vz4', 'Vel4', 'Pressure4', 'Bed4', 'Surface4', 'Thickness4', 'Temperature4', 'BasalforcingsGroundediceMeltingRate4'] +field_tolerances = [1e-09, 1e-09, 1e-09, 1e-09, 1e-09, 1e-09, 1e-09, 1e-09, 1e-09, 1e-09, + 1e-09, 1e-09, 1e-08, 1e-09, 1e-09, 1e-09, 1e-09, 1e-09, 1e-09, 1e-06, + 1e-08, 1e-09, 1e-08, 1e-09, 1e-09, 1e-09, 1e-09, 1e-09, 1e-09, 1e-06, + 1e-08, 1e-09, 1e-08, 1e-09, 1e-09, 1e-09, 1e-09, 1e-09, 1e-09, 1e-06] +field_values = [md.results.TransientSolution[0].Vx, + md.results.TransientSolution[0].Vy, + md.results.TransientSolution[0].Vz, + md.results.TransientSolution[0].Vel, + md.results.TransientSolution[0].Pressure, + md.results.TransientSolution[0].Base, + md.results.TransientSolution[0].Surface, + md.results.TransientSolution[0].Thickness, + md.results.TransientSolution[0].Temperature, + md.results.TransientSolution[0].BasalforcingsGroundediceMeltingRate, + md.results.TransientSolution[1].Vx, + md.results.TransientSolution[1].Vy, + md.results.TransientSolution[1].Vz, + md.results.TransientSolution[1].Vel, + md.results.TransientSolution[1].Pressure, + md.results.TransientSolution[1].Base, + md.results.TransientSolution[1].Surface, + md.results.TransientSolution[1].Thickness, + md.results.TransientSolution[1].Temperature, + md.results.TransientSolution[1].BasalforcingsGroundediceMeltingRate, + md.results.TransientSolution[2].Vx, + md.results.TransientSolution[2].Vy, + md.results.TransientSolution[2].Vz, + md.results.TransientSolution[2].Vel, + md.results.TransientSolution[2].Pressure, + md.results.TransientSolution[2].Base, + md.results.TransientSolution[2].Surface, + md.results.TransientSolution[2].Thickness, + md.results.TransientSolution[2].Temperature, + md.results.TransientSolution[2].BasalforcingsGroundediceMeltingRate, + md.results.TransientSolution[3].Vx, + md.results.TransientSolution[3].Vy, + md.results.TransientSolution[3].Vz, + md.results.TransientSolution[3].Vel, + md.results.TransientSolution[3].Pressure, + md.results.TransientSolution[3].Base, + md.results.TransientSolution[3].Surface, + md.results.TransientSolution[3].Thickness, + md.results.TransientSolution[3].Temperature, + md.results.TransientSolution[3].BasalforcingsGroundediceMeltingRate] Index: /issm/trunk-jpl/test/NightlyRun/test234.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test234.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test234.py (revision 23793) @@ -1,5 +1,4 @@ #Test Name: SquareShelfTranForceNeg2dDakotaSamp import numpy as np -import scipy.io as spio from os import getcwd from IssmConfig import IssmConfig @@ -15,9 +14,9 @@ from dmeth_params_set import * -md = triangle(model(),'../Exp/Square.exp',180000.) -md = setmask(md,'all','') -md = parameterize(md,'../Par/SquareShelf.py') -md = setflowequation(md,'SSA','all') -md.cluster = generic('name',gethostname(),'np',3) +md = triangle(model(), '../Exp/Square.exp', 180000.) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelf.py') +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) md.timestepping.time_step = 1 @@ -25,9 +24,9 @@ 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 -md.smb.mass_balance = np.concatenate((md.smb.mass_balance,[[1.5,3]])) +md.smb.mass_balance = np.concatenate((md.smb.mass_balance, [[1.5, 3]])) md.transient.isthermal = 0 @@ -40,30 +39,30 @@ #partitioning md.qmu.numberofpartitions = 20 -md = partitioner(md,'package','chaco','npart',md.qmu.numberofpartitions,'weighting','on') +md = partitioner(md, 'package', 'chaco', 'npart', md.qmu.numberofpartitions, 'weighting', 'on') md.qmu.partition = md.qmu.partition - 1 #variables -md.qmu.variables.surface_mass_balance = normal_uncertain.normal_uncertain('scaled_SmbMassBalance',1,0.1) +md.qmu.variables.surface_mass_balance = normal_uncertain.normal_uncertain('scaled_SmbMassBalance', 1, 0.1) #responses -md.qmu.responses.MaxVel = response_function.response_function('MaxVel',[],[0.0001,0.001,0.01,0.25,0.5,0.75,0.99,0.999,0.9999]) -md.qmu.responses.IceVolume = response_function.response_function('IceVolume',[],[0.0001,0.001,0.01,0.25,0.5,0.75,0.99,0.999,0.9999]) -md.qmu.responses.MassFlux1 = response_function.response_function('indexed_MassFlux_1',[],[0.0001,0.001,0.01,0.25,0.5,0.75,0.99,0.999,0.9999]) -md.qmu.responses.MassFlux2 = response_function.response_function('indexed_MassFlux_2',[],[0.0001,0.001,0.01,0.25,0.5,0.75,0.99,0.999,0.9999]) -md.qmu.responses.MassFlux3 = response_function.response_function('indexed_MassFlux_3',[],[0.0001,0.001,0.01,0.25,0.5,0.75,0.99,0.999,0.9999]) -md.qmu.responses.MassFlux4 = response_function.response_function('indexed_MassFlux_4',[],[0.0001,0.001,0.01,0.25,0.5,0.75,0.99,0.999,0.9999]) -md.qmu.responses.MassFlux5 = response_function.response_function('indexed_MassFlux_5',[],[0.0001,0.001,0.01,0.25,0.5,0.75,0.99,0.999,0.9999]) -md.qmu.responses.massFlux6 = response_function.response_function('indexed_MassFlux_6',[],[0.0001,0.001,0.01,0.25,0.5,0.75,0.99,0.999,0.9999]) +md.qmu.responses.MaxVel = response_function.response_function('MaxVel', [], [0.0001, 0.001, 0.01, 0.25, 0.5, 0.75, 0.99, 0.999, 0.9999]) +md.qmu.responses.IceVolume = response_function.response_function('IceVolume', [], [0.0001, 0.001, 0.01, 0.25, 0.5, 0.75, 0.99, 0.999, 0.9999]) +md.qmu.responses.MassFlux1 = response_function.response_function('indexed_MassFlux_1', [], [0.0001, 0.001, 0.01, 0.25, 0.5, 0.75, 0.99, 0.999, 0.9999]) +md.qmu.responses.MassFlux2 = response_function.response_function('indexed_MassFlux_2', [], [0.0001, 0.001, 0.01, 0.25, 0.5, 0.75, 0.99, 0.999, 0.9999]) +md.qmu.responses.MassFlux3 = response_function.response_function('indexed_MassFlux_3', [], [0.0001, 0.001, 0.01, 0.25, 0.5, 0.75, 0.99, 0.999, 0.9999]) +md.qmu.responses.MassFlux4 = response_function.response_function('indexed_MassFlux_4', [], [0.0001, 0.001, 0.01, 0.25, 0.5, 0.75, 0.99, 0.999, 0.9999]) +md.qmu.responses.MassFlux5 = response_function.response_function('indexed_MassFlux_5', [], [0.0001, 0.001, 0.01, 0.25, 0.5, 0.75, 0.99, 0.999, 0.9999]) +md.qmu.responses.massFlux6 = response_function.response_function('indexed_MassFlux_6', [], [0.0001, 0.001, 0.01, 0.25, 0.5, 0.75, 0.99, 0.999, 0.9999]) #mass flux profiles -md.qmu.mass_flux_profiles = ['../Exp/MassFlux1.exp','../Exp/MassFlux2.exp','../Exp/MassFlux3.exp','../Exp/MassFlux4.exp','../Exp/MassFlux5.exp','../Exp/MassFlux6.exp'] +md.qmu.mass_flux_profiles = ['../Exp/MassFlux1.exp', '../Exp/MassFlux2.exp', '../Exp/MassFlux3.exp', '../Exp/MassFlux4.exp', '../Exp/MassFlux5.exp', '../Exp/MassFlux6.exp'] md.qmu.mass_flux_profile_directory = getcwd() -## nond_sampling study +# nond_sampling study md.qmu.method = dakota_method.dakota_method('nond_samp') -md.qmu.method = dmeth_params_set(md.qmu.method,'seed',1234,'samples',20,'sample_type','lhs') +md.qmu.method = dmeth_params_set(md.qmu.method, 'seed', 1234, 'samples', 20, 'sample_type', 'lhs') dver = str(version) -if ((int(dver[0]) == 4 and int(dver[2])>2) or int(dver[0])>4): - md.qmu.method = dmeth_params_set(md.qmu.method,'rng','rnum2') +if ((int(dver[0]) == 4 and int(dver[2]) > 2) or int(dver[0]) > 4): + md.qmu.method = dmeth_params_set(md.qmu.method, 'rng', 'rnum2') #parameters @@ -75,17 +74,17 @@ if version >= 6: - md.qmu.params.analysis_driver = 'matlab' - md.qmu.params.evaluation_scheduling = 'master' - md.qmu.params.processors_per_evaluation = 2 + md.qmu.params.analysis_driver = 'matlab' + md.qmu.params.evaluation_scheduling = 'master' + md.qmu.params.processors_per_evaluation = 2 else: - md.qmu.params.analysis_driver = 'stressbalance' - md.qmu.params.evaluation_concurrency = 1 + md.qmu.params.analysis_driver = 'stressbalance' + 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 = solve(md,'Transient','overwrite','y') +md.verbose = verbose('000000000') # this line is recommended +md = solve(md, 'Transient', 'overwrite', 'y') md.qmu.results = md.results.dakota @@ -93,10 +92,10 @@ md.results.dakota.moments = [] for i in range(8): - md.results.dakota.moments.append(md.results.dakota.dresp_out[i].mean) + md.results.dakota.moments.append(md.results.dakota.dresp_out[i].mean) for i in range(8): - md.results.dakota.moments.append(md.results.dakota.dresp_out[i].stddev) + md.results.dakota.moments.append(md.results.dakota.dresp_out[i].stddev) -field_names = ['moments'] +field_names = ['moments'] field_tolerances = [1e-11] field_values = [md.results.dakota.moments] Index: /issm/trunk-jpl/test/NightlyRun/test235.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test235.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test235.py (revision 23793) @@ -1,5 +1,4 @@ #Test Name: SquareShelfTranForceNeg2dDakotaLocal import numpy as np -import scipy.io as spio from os import getcwd from model import * @@ -15,9 +14,9 @@ from dmeth_params_set import * -md = triangle(model(),'../Exp/Square.exp',180000.) -md = setmask(md,'all','') -md = parameterize(md,'../Par/SquareShelf.py') -md = setflowequation(md,'SSA','all') -md.cluster = generic('name',gethostname(),'np',3) +md = triangle(model(), '../Exp/Square.exp', 180000.) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelf.py') +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) md.timestepping.time_step = 1 @@ -25,9 +24,9 @@ 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 -md.smb.mass_balance = np.concatenate((md.smb.mass_balance,[[1.5,3]])) +md.smb.mass_balance = np.concatenate((md.smb.mass_balance, [[1.5, 3]])) md.transient.isthermal = 0 @@ -40,22 +39,22 @@ #partitioning md.qmu.numberofpartitions = 20 -md = partitioner(md,'package','chaco','npart',md.qmu.numberofpartitions,'weighting','on') +md = partitioner(md, 'package', 'chaco', 'npart', md.qmu.numberofpartitions, 'weighting', 'on') md.qmu.partition = md.qmu.partition - 1 #variables -md.qmu.variables.surface_mass_balance = normal_uncertain.normal_uncertain('scaled_SmbMassBalance',1,100) +md.qmu.variables.surface_mass_balance = normal_uncertain.normal_uncertain('scaled_SmbMassBalance', 1, 100) #responses -md.qmu.responses.MaxVel = response_function.response_function('MaxVel',[],[0.0001,0.001,0.01,0.25,0.5,0.75,0.99,0.999,0.9999]) -md.qmu.responses.IceVolume = response_function.response_function('IceVolume',[],[0.0001,0.001,0.01,0.25,0.5,0.75,0.99,0.999,0.9999]) -md.qmu.responses.MassFlux1 = response_function.response_function('indexed_MassFlux_1',[],[0.0001,0.001,0.01,0.25,0.5,0.75,0.99,0.999,0.9999]) -md.qmu.responses.MassFlux2 = response_function.response_function('indexed_MassFlux_2',[],[0.0001,0.001,0.01,0.25,0.5,0.75,0.99,0.999,0.9999]) -md.qmu.responses.MassFlux3 = response_function.response_function('indexed_MassFlux_3',[],[0.0001,0.001,0.01,0.25,0.5,0.75,0.99,0.999,0.9999]) -md.qmu.responses.MassFlux4 = response_function.response_function('indexed_MassFlux_4',[],[0.0001,0.001,0.01,0.25,0.5,0.75,0.99,0.999,0.9999]) -md.qmu.responses.MassFlux5 = response_function.response_function('indexed_MassFlux_5',[],[0.0001,0.001,0.01,0.25,0.5,0.75,0.99,0.999,0.9999]) -md.qmu.responses.massFlux6 = response_function.response_function('indexed_MassFlux_6',[],[0.0001,0.001,0.01,0.25,0.5,0.75,0.99,0.999,0.9999]) +md.qmu.responses.MaxVel = response_function.response_function('MaxVel', [], [0.0001, 0.001, 0.01, 0.25, 0.5, 0.75, 0.99, 0.999, 0.9999]) +md.qmu.responses.IceVolume = response_function.response_function('IceVolume', [], [0.0001, 0.001, 0.01, 0.25, 0.5, 0.75, 0.99, 0.999, 0.9999]) +md.qmu.responses.MassFlux1 = response_function.response_function('indexed_MassFlux_1', [], [0.0001, 0.001, 0.01, 0.25, 0.5, 0.75, 0.99, 0.999, 0.9999]) +md.qmu.responses.MassFlux2 = response_function.response_function('indexed_MassFlux_2', [], [0.0001, 0.001, 0.01, 0.25, 0.5, 0.75, 0.99, 0.999, 0.9999]) +md.qmu.responses.MassFlux3 = response_function.response_function('indexed_MassFlux_3', [], [0.0001, 0.001, 0.01, 0.25, 0.5, 0.75, 0.99, 0.999, 0.9999]) +md.qmu.responses.MassFlux4 = response_function.response_function('indexed_MassFlux_4', [], [0.0001, 0.001, 0.01, 0.25, 0.5, 0.75, 0.99, 0.999, 0.9999]) +md.qmu.responses.MassFlux5 = response_function.response_function('indexed_MassFlux_5', [], [0.0001, 0.001, 0.01, 0.25, 0.5, 0.75, 0.99, 0.999, 0.9999]) +md.qmu.responses.massFlux6 = response_function.response_function('indexed_MassFlux_6', [], [0.0001, 0.001, 0.01, 0.25, 0.5, 0.75, 0.99, 0.999, 0.9999]) #mass flux profiles -md.qmu.mass_flux_profiles = ['../Exp/MassFlux1.exp','../Exp/MassFlux2.exp','../Exp/MassFlux3.exp','../Exp/MassFlux4.exp','../Exp/MassFlux5.exp','../Exp/MassFlux6.exp'] +md.qmu.mass_flux_profiles = ['../Exp/MassFlux1.exp', '../Exp/MassFlux2.exp', '../Exp/MassFlux3.exp', '../Exp/MassFlux4.exp', '../Exp/MassFlux5.exp', '../Exp/MassFlux6.exp'] md.qmu.mass_flux_profile_directory = getcwd() @@ -71,17 +70,17 @@ if version >= 6: - md.qmu.params.analysis_driver = 'matlab' - md.qmu.params.evaluation_scheduling = 'master' - md.qmu.params.processors_per_evaluation = 2 + md.qmu.params.analysis_driver = 'matlab' + md.qmu.params.evaluation_scheduling = 'master' + md.qmu.params.processors_per_evaluation = 2 else: - md.qmu.params.analysis_driver = 'stressbalance' - md.qmu.params.evaluation_concurrency = 1 + md.qmu.params.analysis_driver = 'stressbalance' + 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 = solve(md,'Transient','overwrite','y') +md.verbose = verbose('000000000') # this line is recommended +md = solve(md, 'Transient', 'overwrite', 'y') md.qmu.results = md.results.dakota @@ -89,10 +88,10 @@ md.results.dakota.moments = [] for i in range(8): - md.results.dakota.moments.append(md.results.dakota.dresp_out[i].mean) + md.results.dakota.moments.append(md.results.dakota.dresp_out[i].mean) for i in range(8): - md.results.dakota.moments.append(md.results.dakota.dresp_out[i].stddev) + md.results.dakota.moments.append(md.results.dakota.dresp_out[i].stddev) -field_names = ['moments'] +field_names = ['moments'] field_tolerances = [1e-11] field_values = [md.results.dakota.moments] Index: /issm/trunk-jpl/test/NightlyRun/test236.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test236.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test236.py (revision 23793) @@ -10,101 +10,101 @@ -md=triangle(model(),'../Exp/Square.exp',150000.) -md=setmask(md,'all','') -md=parameterize(md,'../Par/SquareShelf.py') +md = triangle(model(), '../Exp/Square.exp', 150000.) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelf.py') # Use of ispdd and isdelta18o methods md.smb = SMBpdd() -md.smb.isdelta18o=1 -md.smb.ismungsm=0 +md.smb.isdelta18o = 1 +md.smb.ismungsm = 0 # Add temperature, precipitation and delta18o needed to measure the surface mass balance # creating delta18o -delta18o=np.loadtxt('../Data/delta18o.data') -md.smb.delta18o=delta18o +delta18o = np.loadtxt('../Data/delta18o.data') +md.smb.delta18o = delta18o # creating delta18oSurface -md.smb.delta18o_surface = np.zeros((2,np.size(delta18o,axis=1))) -md.smb.delta18o_surface[1,:] = delta18o[1,:] +md.smb.delta18o_surface = np.zeros((2, np.size(delta18o, axis=1))) +md.smb.delta18o_surface[1, :] = delta18o[1, :] # creating Present day and lgm temperatures # Same temperature over the all region: -tmonth=np.ones(12)*(238.15+20.) -md.smb.temperatures_presentday=np.zeros((md.mesh.numberofvertices+1,12)) -md.smb.temperatures_lgm=np.zeros((md.mesh.numberofvertices+1,12)) -for imonth in range(0,12): - md.smb.temperatures_presentday[0:md.mesh.numberofvertices,imonth]=tmonth[imonth] - md.smb.temperatures_lgm[0:md.mesh.numberofvertices,imonth]=tmonth[imonth]-20. +tmonth = np.ones(12) * (238.15 + 20.) +md.smb.temperatures_presentday = np.zeros((md.mesh.numberofvertices + 1, 12)) +md.smb.temperatures_lgm = np.zeros((md.mesh.numberofvertices + 1, 12)) +for imonth in range(0, 12): + 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: - md.smb.temperatures_presentday[md.mesh.numberofvertices,imonth]=((float(imonth)+1.)/12.) - md.smb.temperatures_lgm[md.mesh.numberofvertices,imonth]=((float(imonth)+1.)/12.) + 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.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.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) # creating precipitation -md.smb.precipitations_presentday=np.zeros((md.mesh.numberofvertices+1,12)) -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[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[md.mesh.numberofvertices,imonth]=((float(imonth)+1.)/12.) +md.smb.precipitations_presentday = np.zeros((md.mesh.numberofvertices + 1, 12)) +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[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[md.mesh.numberofvertices, imonth] = ((float(imonth) + 1.) / 12.) # Interpolation factors -md.smb.Tdiff=0.5*np.ones((2,int(md.timestepping.final_time))) -md.smb.sealev=0.5*np.ones((2,int(md.timestepping.final_time))) +md.smb.Tdiff = 0.5 * np.ones((2, int(md.timestepping.final_time))) +md.smb.sealev = 0.5 * np.ones((2, int(md.timestepping.final_time))) # Year of each data point -md.smb.Tdiff[1,1:int(md.timestepping.final_time)]=np.arange(1.,int(md.timestepping.final_time)) -md.smb.sealev[1,1:int(md.timestepping.final_time)]=np.arange(1.,int(md.timestepping.final_time)) +md.smb.Tdiff[1, 1:int(md.timestepping.final_time)] = np.arange(1., int(md.timestepping.final_time)) +md.smb.sealev[1, 1:int(md.timestepping.final_time)] = np.arange(1., int(md.timestepping.final_time)) # time steps and resolution -md.timestepping.time_step=20. -md.timestepping.final_time=60. +md.timestepping.time_step = 20. +md.timestepping.final_time = 60. # -md.transient.requested_outputs=['default','SmbMonthlytemperatures'] -md=setflowequation(md,'SSA','all') -md.cluster=generic('name',gethostname(),'np',3) -md=solve(md,'Transient') +md.transient.requested_outputs = ['default', 'SmbMonthlytemperatures'] +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'Transient') #Fields and tolerances to track changes -field_names =['Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','SmbMonthlytemperatures1','SmbMassBalance1', - 'Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2','SmbMonthlytemperatures2','SmbMassBalance2', - 'Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3','SmbMonthlytemperatures3','SmbMassBalance3'] -field_tolerances=[1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13, - 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13, - 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13] -field_values=[md.results.TransientSolution[0].Vx, - md.results.TransientSolution[0].Vy, - md.results.TransientSolution[0].Vel, - md.results.TransientSolution[0].Pressure, - md.results.TransientSolution[0].Base, - md.results.TransientSolution[0].Surface, - md.results.TransientSolution[0].Thickness, - md.results.TransientSolution[0].SmbMonthlytemperatures, - md.results.TransientSolution[0].SmbMassBalance, - md.results.TransientSolution[1].Vx, - md.results.TransientSolution[1].Vy, - md.results.TransientSolution[1].Vel, - md.results.TransientSolution[1].Pressure, - md.results.TransientSolution[1].Base, - md.results.TransientSolution[1].Surface, - md.results.TransientSolution[1].Thickness, - md.results.TransientSolution[1].SmbMonthlytemperatures, - md.results.TransientSolution[1].SmbMassBalance, - md.results.TransientSolution[2].Vx, - md.results.TransientSolution[2].Vy, - md.results.TransientSolution[2].Vel, - md.results.TransientSolution[2].Pressure, - md.results.TransientSolution[2].Base, - md.results.TransientSolution[2].Surface, - md.results.TransientSolution[2].Thickness, - md.results.TransientSolution[2].SmbMonthlytemperatures, - md.results.TransientSolution[2].SmbMassBalance] +field_names = ['Vx1', 'Vy1', 'Vel1', 'Pressure1', 'Bed1', 'Surface1', 'Thickness1', 'SmbMonthlytemperatures1', 'SmbMassBalance1', + 'Vx2', 'Vy2', 'Vel2', 'Pressure2', 'Bed2', 'Surface2', 'Thickness2', 'SmbMonthlytemperatures2', 'SmbMassBalance2', + 'Vx3', 'Vy3', 'Vel3', 'Pressure3', 'Bed3', 'Surface3', 'Thickness3', 'SmbMonthlytemperatures3', 'SmbMassBalance3'] +field_tolerances = [1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, + 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, + 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13] +field_values = [md.results.TransientSolution[0].Vx, + md.results.TransientSolution[0].Vy, + md.results.TransientSolution[0].Vel, + md.results.TransientSolution[0].Pressure, + md.results.TransientSolution[0].Base, + md.results.TransientSolution[0].Surface, + md.results.TransientSolution[0].Thickness, + md.results.TransientSolution[0].SmbMonthlytemperatures, + md.results.TransientSolution[0].SmbMassBalance, + md.results.TransientSolution[1].Vx, + md.results.TransientSolution[1].Vy, + md.results.TransientSolution[1].Vel, + md.results.TransientSolution[1].Pressure, + md.results.TransientSolution[1].Base, + md.results.TransientSolution[1].Surface, + md.results.TransientSolution[1].Thickness, + md.results.TransientSolution[1].SmbMonthlytemperatures, + md.results.TransientSolution[1].SmbMassBalance, + md.results.TransientSolution[2].Vx, + md.results.TransientSolution[2].Vy, + md.results.TransientSolution[2].Vel, + md.results.TransientSolution[2].Pressure, + md.results.TransientSolution[2].Base, + md.results.TransientSolution[2].Surface, + md.results.TransientSolution[2].Thickness, + md.results.TransientSolution[2].SmbMonthlytemperatures, + md.results.TransientSolution[2].SmbMassBalance] Index: /issm/trunk-jpl/test/NightlyRun/test237.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test237.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test237.py (revision 23793) @@ -11,112 +11,110 @@ from generic import generic -md=triangle(model(),'../Exp/Square.exp',600000) #180000 -md=setmask(md,'all','') -md=parameterize(md,'../Par/SquareShelf.py') +md = triangle(model(), '../Exp/Square.exp', 600000) #180000 +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelf.py') # Use of ispdd and isdelta18o methods md.smb = SMBpdd() -md.smb.isdelta18o=0 -md.smb.ismungsm=1 +md.smb.isdelta18o = 0 +md.smb.ismungsm = 1 # time steps and resolution -md.timestepping.time_step=20. -md.settings.output_frequency=1 -md.timestepping.final_time=60. +md.timestepping.time_step = 20. +md.settings.output_frequency = 1 +md.timestepping.final_time = 60. # creating Present day and lgm temperatures # Same temperature over the all region: -tmonth=np.ones(12)*(238.15+20.) -md.smb.temperatures_presentday=np.zeros((md.mesh.numberofvertices+1,12)) -md.smb.temperatures_lgm=np.zeros((md.mesh.numberofvertices+1,12)) -for imonth in range(0,12): - md.smb.temperatures_presentday[0:md.mesh.numberofvertices,imonth]=tmonth[imonth] - md.smb.temperatures_lgm[0:md.mesh.numberofvertices,imonth]=tmonth[imonth]-20. +tmonth = np.ones(12) * (238.15 + 20.) +md.smb.temperatures_presentday = np.zeros((md.mesh.numberofvertices + 1, 12)) +md.smb.temperatures_lgm = np.zeros((md.mesh.numberofvertices + 1, 12)) +for imonth in range(0, 12): + 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: - md.smb.temperatures_presentday[md.mesh.numberofvertices,imonth]=((float(imonth)+1.)/12.) - md.smb.temperatures_lgm[md.mesh.numberofvertices,imonth]=((float(imonth)+1.)/12.) + 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.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.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) # creating precipitation -md.smb.precipitations_presentday=np.zeros((md.mesh.numberofvertices+1,12)) -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[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[md.mesh.numberofvertices,imonth]=((float(imonth)+1.)/12.) +md.smb.precipitations_presentday = np.zeros((md.mesh.numberofvertices + 1, 12)) +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[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[md.mesh.numberofvertices, imonth] = ((float(imonth) + 1.) / 12.) -fsize=int(md.timestepping.final_time/md.timestepping.time_step)+2 -md.smb.Pfac=np.zeros((2,fsize)) -md.smb.Tdiff=np.zeros((2,fsize)) -md.smb.sealev=np.zeros((2,fsize)) -for iint in range(0,fsize): +fsize = int(md.timestepping.final_time / md.timestepping.time_step) + 2 +md.smb.Pfac = np.zeros((2, fsize)) +md.smb.Tdiff = np.zeros((2, fsize)) +md.smb.sealev = np.zeros((2, fsize)) +for iint in range(0, fsize): # Interpolation factors - md.smb.Pfac[0,iint]=0.15*(iint+1) - md.smb.Tdiff[0,iint]=0.15*(iint+1) - md.smb.sealev[0,iint]=0.15*(iint+1) - # Year of each data point - md.smb.Pfac[1,iint]=(float(iint))*20 - md.smb.Tdiff[1,iint]=(float(iint))*20 - md.smb.sealev[1,iint]=(float(iint))*20 + md.smb.Pfac[0, iint] = 0.15 * (iint + 1) + md.smb.Tdiff[0, iint] = 0.15 * (iint + 1) + md.smb.sealev[0, iint] = 0.15 * (iint + 1) + # Year of each data point + md.smb.Pfac[1, iint] = (float(iint)) * 20 + md.smb.Tdiff[1, iint] = (float(iint)) * 20 + md.smb.sealev[1, iint] = (float(iint)) * 20 # -md.transient.requested_outputs=['default','SmbMonthlytemperatures'] -md.extrude(3,1.) -md=setflowequation(md,'SSA','all') -md.cluster=generic('name',gethostname(),'np',1) -md=solve(md,'Transient') +md.transient.requested_outputs = ['default', 'SmbMonthlytemperatures'] +md.extrude(3, 1.) +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 1) +md = solve(md, 'Transient') #Fields and tolerances to track changes -field_names =['Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsGroundediceMeltingRate1','SmbMonthlytemperatures1','SmbMassBalance1',\ - 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsGroundediceMeltingRate2','SmbMonthlytemperatures2','SmbMassBalance2',\ - 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsGroundediceMeltingRate3','SmbMonthlytemperatures3','SmbMassBalance3'] -field_tolerances=[1e-13,1e-13,1e-13,1e-13,1e-13,1e-8,1e-8,1e-8,1e-13,1e-8,1e-13,1e-13,\ - 1e-13,1e-13,1e-13,1e-13,1e-13,1e-8,1e-8,1e-8,7e-13,1e-7,1e-13,1e-13,\ - 1e-13,1e-13,1e-08,1e-13,1e-13,1e-8,1e-8,1e-8,7e-13,5e-7,1e-13,1e-13] -field_values=[\ - md.results.TransientSolution[0].Vx,\ - md.results.TransientSolution[0].Vy,\ - md.results.TransientSolution[0].Vz,\ - md.results.TransientSolution[0].Vel,\ - md.results.TransientSolution[0].Pressure,\ - md.results.TransientSolution[0].Base,\ - md.results.TransientSolution[0].Surface,\ - md.results.TransientSolution[0].Thickness,\ - md.results.TransientSolution[0].Temperature,\ - md.results.TransientSolution[0].BasalforcingsGroundediceMeltingRate,\ - md.results.TransientSolution[0].SmbMonthlytemperatures,\ - md.results.TransientSolution[0].SmbMassBalance,\ - md.results.TransientSolution[1].Vx,\ - md.results.TransientSolution[1].Vy,\ - md.results.TransientSolution[1].Vz,\ - md.results.TransientSolution[1].Vel,\ - md.results.TransientSolution[1].Pressure,\ - md.results.TransientSolution[1].Base,\ - md.results.TransientSolution[1].Surface,\ - md.results.TransientSolution[1].Thickness,\ - md.results.TransientSolution[1].Temperature,\ - md.results.TransientSolution[1].BasalforcingsGroundediceMeltingRate,\ - md.results.TransientSolution[1].SmbMonthlytemperatures,\ - md.results.TransientSolution[1].SmbMassBalance,\ - md.results.TransientSolution[2].Vx,\ - md.results.TransientSolution[2].Vy,\ - md.results.TransientSolution[2].Vz,\ - md.results.TransientSolution[2].Vel,\ - md.results.TransientSolution[2].Pressure,\ - md.results.TransientSolution[2].Base,\ - md.results.TransientSolution[2].Surface,\ - md.results.TransientSolution[2].Thickness,\ - md.results.TransientSolution[2].Temperature,\ - md.results.TransientSolution[2].BasalforcingsGroundediceMeltingRate,\ - md.results.TransientSolution[2].SmbMonthlytemperatures,\ - md.results.TransientSolution[2].SmbMassBalance,\ - ] +field_names = ['Vx1', 'Vy1', 'Vz1', 'Vel1', 'Pressure1', 'Bed1', 'Surface1', 'Thickness1', 'Temperature1', 'BasalforcingsGroundediceMeltingRate1', 'SmbMonthlytemperatures1', 'SmbMassBalance1', + 'Vx2', 'Vy2', 'Vz2', 'Vel2', 'Pressure2', 'Bed2', 'Surface2', 'Thickness2', 'Temperature2', 'BasalforcingsGroundediceMeltingRate2', 'SmbMonthlytemperatures2', 'SmbMassBalance2', + 'Vx3', 'Vy3', 'Vz3', 'Vel3', 'Pressure3', 'Bed3', 'Surface3', 'Thickness3', 'Temperature3', 'BasalforcingsGroundediceMeltingRate3', 'SmbMonthlytemperatures3', 'SmbMassBalance3'] +field_tolerances = [1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-8, 1e-8, 1e-8, 1e-13, 1e-8, 1e-13, 1e-13, + 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-8, 1e-8, 1e-8, 7e-13, 1e-7, 1e-13, 1e-13, + 1e-13, 1e-13, 1e-08, 1e-13, 1e-13, 1e-8, 1e-8, 1e-8, 7e-13, 5e-7, 1e-13, 1e-13] +field_values = [md.results.TransientSolution[0].Vx, + md.results.TransientSolution[0].Vy, + md.results.TransientSolution[0].Vz, + md.results.TransientSolution[0].Vel, + md.results.TransientSolution[0].Pressure, + md.results.TransientSolution[0].Base, + md.results.TransientSolution[0].Surface, + md.results.TransientSolution[0].Thickness, + md.results.TransientSolution[0].Temperature, + md.results.TransientSolution[0].BasalforcingsGroundediceMeltingRate, + md.results.TransientSolution[0].SmbMonthlytemperatures, + md.results.TransientSolution[0].SmbMassBalance, + md.results.TransientSolution[1].Vx, + md.results.TransientSolution[1].Vy, + md.results.TransientSolution[1].Vz, + md.results.TransientSolution[1].Vel, + md.results.TransientSolution[1].Pressure, + md.results.TransientSolution[1].Base, + md.results.TransientSolution[1].Surface, + md.results.TransientSolution[1].Thickness, + md.results.TransientSolution[1].Temperature, + md.results.TransientSolution[1].BasalforcingsGroundediceMeltingRate, + md.results.TransientSolution[1].SmbMonthlytemperatures, + md.results.TransientSolution[1].SmbMassBalance, + md.results.TransientSolution[2].Vx, + md.results.TransientSolution[2].Vy, + md.results.TransientSolution[2].Vz, + md.results.TransientSolution[2].Vel, + md.results.TransientSolution[2].Pressure, + md.results.TransientSolution[2].Base, + md.results.TransientSolution[2].Surface, + md.results.TransientSolution[2].Thickness, + md.results.TransientSolution[2].Temperature, + md.results.TransientSolution[2].BasalforcingsGroundediceMeltingRate, + md.results.TransientSolution[2].SmbMonthlytemperatures, + md.results.TransientSolution[2].SmbMassBalance] Index: /issm/trunk-jpl/test/NightlyRun/test238.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test238.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test238.py (revision 23793) @@ -1,3 +1,3 @@ -#Test Name: SquareShelfTranIspddIsdeltaO18pdSSA2d +#Test Name: SquareShelfTranIspddIsdeltaO18pdSSA2d import numpy as np from model import * @@ -10,83 +10,81 @@ -md=triangle(model(),'../Exp/Square.exp',150000.) -md=setmask(md,'all','') -md=parameterize(md,'../Par/SquareShelf.py') +md = triangle(model(), '../Exp/Square.exp', 150000.) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelf.py') # Use of ispdd and isdelta18o methods md.smb = SMBd18opdd() -md.smb.isd18opd=1 +md.smb.isd18opd = 1 # Add temperature, precipitation and delta18o needed to measure the surface mass balance # creating delta18o -delta18o=np.loadtxt('../Data/delta18o.data') -md.smb.delta18o=delta18o +delta18o = np.loadtxt('../Data/delta18o.data') +md.smb.delta18o = delta18o # creating Present day temperatures # Same temperature over the all region: -tmonth=np.ones(12)*(238.15+20.) -md.smb.temperatures_presentday=np.zeros((md.mesh.numberofvertices+1,12)) -for imonth in range(0,12): - md.smb.temperatures_presentday[0:md.mesh.numberofvertices,imonth]=tmonth[imonth] +tmonth = np.ones(12) * (238.15 + 20.) +md.smb.temperatures_presentday = np.zeros((md.mesh.numberofvertices + 1, 12)) +for imonth in range(0, 12): + md.smb.temperatures_presentday[0:md.mesh.numberofvertices, imonth] = tmonth[imonth] # Time for the last line: - md.smb.temperatures_presentday[md.mesh.numberofvertices,imonth]=((float(imonth)+1.)/12.) + 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=md.thermal.spctemperature-10 -md.initialization.temperature=md.thermal.spctemperature +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 md.smb.initialize(md) # creating precipitation -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[md.mesh.numberofvertices,imonth]=(float(imonth)/12.) +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[md.mesh.numberofvertices, imonth] = (float(imonth) / 12.) # time steps and resolution -md.timestepping.time_step=20 -md.settings.output_frequency=1 -md.timestepping.final_time=60 +md.timestepping.time_step = 20 +md.settings.output_frequency = 1 +md.timestepping.final_time = 60 -# -md.transient.requested_outputs=['default','SmbMonthlytemperatures'] -md=setflowequation(md,'SSA','all') -md.cluster=generic('name',gethostname(),'np',3) -md=solve(md,'Transient') +# +md.transient.requested_outputs = ['default', 'SmbMonthlytemperatures'] +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'Transient') #Fields and tolerances to track changes -field_names =['Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','SmbMonthlytemperatures1','SmbMassBalance1',\ - 'Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2','SmbMonthlytemperatures2','SmbMassBalance2',\ - 'Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3','SmbMonthlytemperatures3','SmbMassBalance3'] -field_tolerances=[1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,\ - 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,\ - 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13] -field_values=[\ - md.results.TransientSolution[0].Vx,\ - md.results.TransientSolution[0].Vy,\ - md.results.TransientSolution[0].Vel,\ - md.results.TransientSolution[0].Pressure,\ - md.results.TransientSolution[0].Base,\ - md.results.TransientSolution[0].Surface,\ - md.results.TransientSolution[0].Thickness,\ - md.results.TransientSolution[0].SmbMonthlytemperatures,\ - md.results.TransientSolution[0].SmbMassBalance,\ - md.results.TransientSolution[1].Vx,\ - md.results.TransientSolution[1].Vy,\ - md.results.TransientSolution[1].Vel,\ - md.results.TransientSolution[1].Pressure,\ - md.results.TransientSolution[1].Base,\ - md.results.TransientSolution[1].Surface,\ - md.results.TransientSolution[1].Thickness,\ - md.results.TransientSolution[1].SmbMonthlytemperatures,\ - md.results.TransientSolution[1].SmbMassBalance,\ - md.results.TransientSolution[2].Vx,\ - md.results.TransientSolution[2].Vy,\ - md.results.TransientSolution[2].Vel,\ - md.results.TransientSolution[2].Pressure,\ - md.results.TransientSolution[2].Base,\ - md.results.TransientSolution[2].Surface,\ - md.results.TransientSolution[2].Thickness,\ - md.results.TransientSolution[2].SmbMonthlytemperatures,\ - md.results.TransientSolution[2].SmbMassBalance,\ - ] +field_names = ['Vx1', 'Vy1', 'Vel1', 'Pressure1', 'Bed1', 'Surface1', 'Thickness1', 'SmbMonthlytemperatures1', 'SmbMassBalance1', + 'Vx2', 'Vy2', 'Vel2', 'Pressure2', 'Bed2', 'Surface2', 'Thickness2', 'SmbMonthlytemperatures2', 'SmbMassBalance2', + 'Vx3', 'Vy3', 'Vel3', 'Pressure3', 'Bed3', 'Surface3', 'Thickness3', 'SmbMonthlytemperatures3', 'SmbMassBalance3'] +field_tolerances = [1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, + 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, + 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13] +field_values = [md.results.TransientSolution[0].Vx, + md.results.TransientSolution[0].Vy, + md.results.TransientSolution[0].Vel, + md.results.TransientSolution[0].Pressure, + md.results.TransientSolution[0].Base, + md.results.TransientSolution[0].Surface, + md.results.TransientSolution[0].Thickness, + md.results.TransientSolution[0].SmbMonthlytemperatures, + md.results.TransientSolution[0].SmbMassBalance, + md.results.TransientSolution[1].Vx, + md.results.TransientSolution[1].Vy, + md.results.TransientSolution[1].Vel, + md.results.TransientSolution[1].Pressure, + md.results.TransientSolution[1].Base, + md.results.TransientSolution[1].Surface, + md.results.TransientSolution[1].Thickness, + md.results.TransientSolution[1].SmbMonthlytemperatures, + md.results.TransientSolution[1].SmbMassBalance, + md.results.TransientSolution[2].Vx, + md.results.TransientSolution[2].Vy, + md.results.TransientSolution[2].Vel, + md.results.TransientSolution[2].Pressure, + md.results.TransientSolution[2].Base, + md.results.TransientSolution[2].Surface, + md.results.TransientSolution[2].Thickness, + md.results.TransientSolution[2].SmbMonthlytemperatures, + md.results.TransientSolution[2].SmbMassBalance] Index: /issm/trunk-jpl/test/NightlyRun/test239.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test239.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test239.py (revision 23793) @@ -1,3 +1,3 @@ -#Test Name: SquareShelfTranIspddIsdeltaO18pdInterpSSA2d +#Test Name: SquareShelfTranIspddIsdeltaO18pdInterpSSA2d import numpy as np from model import * @@ -10,83 +10,81 @@ -md=triangle(model(),'../Exp/Square.exp',150000.) -md=setmask(md,'all','') -md=parameterize(md,'../Par/SquareShelf.py') +md = triangle(model(), '../Exp/Square.exp', 150000.) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelf.py') # Use of ispdd and isdelta18o methods md.smb = SMBd18opdd() -md.smb.isd18opd=1 +md.smb.isd18opd = 1 # Add temperature, precipitation and delta18o needed to measure the surface mass balance # creating delta18o -delta18o=np.loadtxt('../Data/delta18o.data') -md.smb.delta18o=delta18o +delta18o = np.loadtxt('../Data/delta18o.data') +md.smb.delta18o = delta18o # creating Present day temperatures # Same temperature over the all region: -tmonth=np.ones(12)*(238.15+20.) -md.smb.temperatures_presentday=np.zeros((md.mesh.numberofvertices+1,12)) -for imonth in range(0,12): - md.smb.temperatures_presentday[0:md.mesh.numberofvertices,imonth]=tmonth[imonth] +tmonth = np.ones(12) * (238.15 + 20.) +md.smb.temperatures_presentday = np.zeros((md.mesh.numberofvertices + 1, 12)) +for imonth in range(0, 12): + md.smb.temperatures_presentday[0:md.mesh.numberofvertices, imonth] = tmonth[imonth] # Time for the last line: - md.smb.temperatures_presentday[md.mesh.numberofvertices,imonth]=(float(imonth)/12.) + 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=md.thermal.spctemperature-10 -md.initialization.temperature=md.thermal.spctemperature +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 md.smb.initialize(md) # creating precipitation -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[md.mesh.numberofvertices,imonth]=((float(imonth)+1.)/12.) +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[md.mesh.numberofvertices, imonth] = ((float(imonth) + 1.) / 12.) # time steps and resolution -md.timestepping.time_step=0.5 -md.settings.output_frequency=1 -md.timestepping.final_time=2 +md.timestepping.time_step = 0.5 +md.settings.output_frequency = 1 +md.timestepping.final_time = 2 -# -md.transient.requested_outputs=['default','SmbMonthlytemperatures'] -md=setflowequation(md,'SSA','all') -md.cluster=generic('name',gethostname(),'np',3) -md=solve(md,'Transient') +# +md.transient.requested_outputs = ['default', 'SmbMonthlytemperatures'] +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'Transient') #Fields and tolerances to track changes -field_names =['Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','SmbMonthlytemperatures1','SmbMassBalance1',\ - 'Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2','SmbMonthlytemperatures2','SmbMassBalance2',\ - 'Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3','SmbMonthlytemperatures3','SmbMassBalance3'] -field_tolerances=[1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,\ - 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,\ - 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13] -field_values=[\ - md.results.TransientSolution[0].Vx,\ - md.results.TransientSolution[0].Vy,\ - md.results.TransientSolution[0].Vel,\ - md.results.TransientSolution[0].Pressure,\ - md.results.TransientSolution[0].Base,\ - md.results.TransientSolution[0].Surface,\ - md.results.TransientSolution[0].Thickness,\ - md.results.TransientSolution[0].SmbMonthlytemperatures,\ - md.results.TransientSolution[0].SmbMassBalance,\ - md.results.TransientSolution[1].Vx,\ - md.results.TransientSolution[1].Vy,\ - md.results.TransientSolution[1].Vel,\ - md.results.TransientSolution[1].Pressure,\ - md.results.TransientSolution[1].Base,\ - md.results.TransientSolution[1].Surface,\ - md.results.TransientSolution[1].Thickness,\ - md.results.TransientSolution[1].SmbMonthlytemperatures,\ - md.results.TransientSolution[1].SmbMassBalance,\ - md.results.TransientSolution[2].Vx,\ - md.results.TransientSolution[2].Vy,\ - md.results.TransientSolution[2].Vel,\ - md.results.TransientSolution[2].Pressure,\ - md.results.TransientSolution[2].Base,\ - md.results.TransientSolution[2].Surface,\ - md.results.TransientSolution[2].Thickness,\ - md.results.TransientSolution[2].SmbMonthlytemperatures,\ - md.results.TransientSolution[2].SmbMassBalance,\ - ] +field_names = ['Vx1', 'Vy1', 'Vel1', 'Pressure1', 'Bed1', 'Surface1', 'Thickness1', 'SmbMonthlytemperatures1', 'SmbMassBalance1', + 'Vx2', 'Vy2', 'Vel2', 'Pressure2', 'Bed2', 'Surface2', 'Thickness2', 'SmbMonthlytemperatures2', 'SmbMassBalance2', + 'Vx3', 'Vy3', 'Vel3', 'Pressure3', 'Bed3', 'Surface3', 'Thickness3', 'SmbMonthlytemperatures3', 'SmbMassBalance3'] +field_tolerances = [1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, + 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, + 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13] +field_values = [md.results.TransientSolution[0].Vx, + md.results.TransientSolution[0].Vy, + md.results.TransientSolution[0].Vel, + md.results.TransientSolution[0].Pressure, + md.results.TransientSolution[0].Base, + md.results.TransientSolution[0].Surface, + md.results.TransientSolution[0].Thickness, + md.results.TransientSolution[0].SmbMonthlytemperatures, + md.results.TransientSolution[0].SmbMassBalance, + md.results.TransientSolution[1].Vx, + md.results.TransientSolution[1].Vy, + md.results.TransientSolution[1].Vel, + md.results.TransientSolution[1].Pressure, + md.results.TransientSolution[1].Base, + md.results.TransientSolution[1].Surface, + md.results.TransientSolution[1].Thickness, + md.results.TransientSolution[1].SmbMonthlytemperatures, + md.results.TransientSolution[1].SmbMassBalance, + md.results.TransientSolution[2].Vx, + md.results.TransientSolution[2].Vy, + md.results.TransientSolution[2].Vel, + md.results.TransientSolution[2].Pressure, + md.results.TransientSolution[2].Base, + md.results.TransientSolution[2].Surface, + md.results.TransientSolution[2].Thickness, + md.results.TransientSolution[2].SmbMonthlytemperatures, + md.results.TransientSolution[2].SmbMassBalance] Index: /issm/trunk-jpl/test/NightlyRun/test240.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test240.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test240.py (revision 23793) @@ -1,3 +1,3 @@ -#Test Name: SquareShelfTranIspddIsdeltaO18pdNoInterpSSA2d +#Test Name: SquareShelfTranIspddIsdeltaO18pdNoInterpSSA2d import numpy as np from model import * @@ -10,84 +10,82 @@ -md=triangle(model(),'../Exp/Square.exp',150000.) -md=setmask(md,'all','') -md=parameterize(md,'../Par/SquareShelf.py') +md = triangle(model(), '../Exp/Square.exp', 150000.) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelf.py') # Use of ispdd and isdelta18o methods md.smb = SMBd18opdd() -md.smb.isd18opd=1 +md.smb.isd18opd = 1 # Add temperature, precipitation and delta18o needed to measure the surface mass balance # creating delta18o -delta18o=np.loadtxt('../Data/delta18o.data') -md.smb.delta18o=delta18o +delta18o = np.loadtxt('../Data/delta18o.data') +md.smb.delta18o = delta18o # creating Present day temperatures # Same temperature over the all region: -tmonth=np.ones(12)*(238.15+20.) -md.smb.temperatures_presentday=np.zeros((md.mesh.numberofvertices+1,12)) -for imonth in range(0,12): - md.smb.temperatures_presentday[0:md.mesh.numberofvertices,imonth]=tmonth[imonth] +tmonth = np.ones(12) * (238.15 + 20.) +md.smb.temperatures_presentday = np.zeros((md.mesh.numberofvertices + 1, 12)) +for imonth in range(0, 12): + md.smb.temperatures_presentday[0:md.mesh.numberofvertices, imonth] = tmonth[imonth] # Time for the last line: - md.smb.temperatures_presentday[md.mesh.numberofvertices,imonth]=(float(imonth)/12.) + 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=md.thermal.spctemperature-10 -md.initialization.temperature=md.thermal.spctemperature +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 md.smb.initialize(md) # creating precipitation -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[md.mesh.numberofvertices,imonth]=((float(imonth)+1.)/12.) +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[md.mesh.numberofvertices, imonth] = ((float(imonth) + 1.) / 12.) # time steps and resolution -md.timestepping.time_step=0.5 -md.settings.output_frequency=1 -md.timestepping.final_time=2 -md.timestepping.interp_forcings=0 +md.timestepping.time_step = 0.5 +md.settings.output_frequency = 1 +md.timestepping.final_time = 2 +md.timestepping.interp_forcings = 0 -# -md.transient.requested_outputs=['default','SmbMonthlytemperatures'] -md=setflowequation(md,'SSA','all') -md.cluster=generic('name',gethostname(),'np',3) -md=solve(md,'Transient') +# +md.transient.requested_outputs = ['default', 'SmbMonthlytemperatures'] +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'Transient') #Fields and tolerances to track changes -field_names =['Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','SmbMonthlytemperatures1','SmbMassBalance1',\ - 'Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2','SmbMonthlytemperatures2','SmbMassBalance2',\ - 'Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3','SmbMonthlytemperatures3','SmbMassBalance3'] -field_tolerances=[1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,\ - 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,\ - 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13] -field_values=[\ - md.results.TransientSolution[0].Vx,\ - md.results.TransientSolution[0].Vy,\ - md.results.TransientSolution[0].Vel,\ - md.results.TransientSolution[0].Pressure,\ - md.results.TransientSolution[0].Base,\ - md.results.TransientSolution[0].Surface,\ - md.results.TransientSolution[0].Thickness,\ - md.results.TransientSolution[0].SmbMonthlytemperatures,\ - md.results.TransientSolution[0].SmbMassBalance,\ - md.results.TransientSolution[1].Vx,\ - md.results.TransientSolution[1].Vy,\ - md.results.TransientSolution[1].Vel,\ - md.results.TransientSolution[1].Pressure,\ - md.results.TransientSolution[1].Base,\ - md.results.TransientSolution[1].Surface,\ - md.results.TransientSolution[1].Thickness,\ - md.results.TransientSolution[1].SmbMonthlytemperatures,\ - md.results.TransientSolution[1].SmbMassBalance,\ - md.results.TransientSolution[2].Vx,\ - md.results.TransientSolution[2].Vy,\ - md.results.TransientSolution[2].Vel,\ - md.results.TransientSolution[2].Pressure,\ - md.results.TransientSolution[2].Base,\ - md.results.TransientSolution[2].Surface,\ - md.results.TransientSolution[2].Thickness,\ - md.results.TransientSolution[2].SmbMonthlytemperatures,\ - md.results.TransientSolution[2].SmbMassBalance,\ - ] +field_names = ['Vx1', 'Vy1', 'Vel1', 'Pressure1', 'Bed1', 'Surface1', 'Thickness1', 'SmbMonthlytemperatures1', 'SmbMassBalance1', + 'Vx2', 'Vy2', 'Vel2', 'Pressure2', 'Bed2', 'Surface2', 'Thickness2', 'SmbMonthlytemperatures2', 'SmbMassBalance2', + 'Vx3', 'Vy3', 'Vel3', 'Pressure3', 'Bed3', 'Surface3', 'Thickness3', 'SmbMonthlytemperatures3', 'SmbMassBalance3'] +field_tolerances = [1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, + 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, + 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13] +field_values = [md.results.TransientSolution[0].Vx, + md.results.TransientSolution[0].Vy, + md.results.TransientSolution[0].Vel, + md.results.TransientSolution[0].Pressure, + md.results.TransientSolution[0].Base, + md.results.TransientSolution[0].Surface, + md.results.TransientSolution[0].Thickness, + md.results.TransientSolution[0].SmbMonthlytemperatures, + md.results.TransientSolution[0].SmbMassBalance, + md.results.TransientSolution[1].Vx, + md.results.TransientSolution[1].Vy, + md.results.TransientSolution[1].Vel, + md.results.TransientSolution[1].Pressure, + md.results.TransientSolution[1].Base, + md.results.TransientSolution[1].Surface, + md.results.TransientSolution[1].Thickness, + md.results.TransientSolution[1].SmbMonthlytemperatures, + md.results.TransientSolution[1].SmbMassBalance, + md.results.TransientSolution[2].Vx, + md.results.TransientSolution[2].Vy, + md.results.TransientSolution[2].Vel, + md.results.TransientSolution[2].Pressure, + md.results.TransientSolution[2].Base, + md.results.TransientSolution[2].Surface, + md.results.TransientSolution[2].Thickness, + md.results.TransientSolution[2].SmbMonthlytemperatures, + md.results.TransientSolution[2].SmbMassBalance] Index: /issm/trunk-jpl/test/NightlyRun/test241.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test241.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test241.py (revision 23793) @@ -10,63 +10,63 @@ -md=triangle(model(),'../Exp/Square.exp',150000.) -md=setmask(md,'all','') -md=parameterize(md,'../Par/SquareShelf.py') -md=setflowequation(md,'SSA','all') -md.cluster=generic('name',gethostname(),'np',3) +md = triangle(model(), '../Exp/Square.exp', 150000.) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelf.py') +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) -md.timestepping.time_step=1. -md.settings.output_frequency=1 -md.timestepping.final_time=4. -md.timestepping.interp_forcings=False +md.timestepping.time_step = 1. +md.settings.output_frequency = 1 +md.timestepping.final_time = 4. +md.timestepping.interp_forcings = False #Set up transient -smb=np.ones((md.mesh.numberofvertices))*3.6 -smb=np.vstack((smb,smb*-1.)).T +smb = np.ones((md.mesh.numberofvertices)) * 3.6 +smb = np.vstack((smb, smb * -1.)).T -md.smb.mass_balance=np.vstack((smb,[1.5,3.])) -md.transient.isthermal=False +md.smb.mass_balance = np.vstack((smb, [1.5, 3.])) +md.transient.isthermal = False -md=solve(md,'Transient') +md = solve(md, 'Transient') #Fields and tolerances to track changes -field_names=['Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','SmbMassBalance1', - 'Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2','SmbMassBalance2', - 'Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3','SmbMassBalance3', - 'Vx4','Vy4','Vel4','Pressure4','Bed4','Surface4','Thickness4','SmbMassBalance4'] -field_tolerances=[1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10, - 1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10, - 1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10, - 1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10] -field_values=[md.results.TransientSolution[0].Vx, - md.results.TransientSolution[0].Vy, - md.results.TransientSolution[0].Vel, - md.results.TransientSolution[0].Pressure, - md.results.TransientSolution[0].Base, - md.results.TransientSolution[0].Surface, - md.results.TransientSolution[0].Thickness, - md.results.TransientSolution[0].SmbMassBalance, - md.results.TransientSolution[1].Vx, - md.results.TransientSolution[1].Vy, - md.results.TransientSolution[1].Vel, - md.results.TransientSolution[1].Pressure, - md.results.TransientSolution[1].Base, - md.results.TransientSolution[1].Surface, - md.results.TransientSolution[1].Thickness, - md.results.TransientSolution[1].SmbMassBalance, - md.results.TransientSolution[2].Vx, - md.results.TransientSolution[2].Vy, - md.results.TransientSolution[2].Vel, - md.results.TransientSolution[2].Pressure, - md.results.TransientSolution[2].Base, - md.results.TransientSolution[2].Surface, - md.results.TransientSolution[2].Thickness, - md.results.TransientSolution[2].SmbMassBalance, - md.results.TransientSolution[3].Vx, - md.results.TransientSolution[3].Vy, - md.results.TransientSolution[3].Vel, - md.results.TransientSolution[3].Pressure, - md.results.TransientSolution[3].Base, - md.results.TransientSolution[3].Surface, - md.results.TransientSolution[3].Thickness, - md.results.TransientSolution[3].SmbMassBalance] +field_names = ['Vx1', 'Vy1', 'Vel1', 'Pressure1', 'Bed1', 'Surface1', 'Thickness1', 'SmbMassBalance1', + 'Vx2', 'Vy2', 'Vel2', 'Pressure2', 'Bed2', 'Surface2', 'Thickness2', 'SmbMassBalance2', + 'Vx3', 'Vy3', 'Vel3', 'Pressure3', 'Bed3', 'Surface3', 'Thickness3', 'SmbMassBalance3', + 'Vx4', 'Vy4', 'Vel4', 'Pressure4', 'Bed4', 'Surface4', 'Thickness4', 'SmbMassBalance4'] +field_tolerances = [1e-09, 1e-09, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10, + 1e-09, 1e-09, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10, + 1e-09, 1e-09, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10, + 1e-09, 1e-09, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10] +field_values = [md.results.TransientSolution[0].Vx, + md.results.TransientSolution[0].Vy, + md.results.TransientSolution[0].Vel, + md.results.TransientSolution[0].Pressure, + md.results.TransientSolution[0].Base, + md.results.TransientSolution[0].Surface, + md.results.TransientSolution[0].Thickness, + md.results.TransientSolution[0].SmbMassBalance, + md.results.TransientSolution[1].Vx, + md.results.TransientSolution[1].Vy, + md.results.TransientSolution[1].Vel, + md.results.TransientSolution[1].Pressure, + md.results.TransientSolution[1].Base, + md.results.TransientSolution[1].Surface, + md.results.TransientSolution[1].Thickness, + md.results.TransientSolution[1].SmbMassBalance, + md.results.TransientSolution[2].Vx, + md.results.TransientSolution[2].Vy, + md.results.TransientSolution[2].Vel, + md.results.TransientSolution[2].Pressure, + md.results.TransientSolution[2].Base, + md.results.TransientSolution[2].Surface, + md.results.TransientSolution[2].Thickness, + md.results.TransientSolution[2].SmbMassBalance, + md.results.TransientSolution[3].Vx, + md.results.TransientSolution[3].Vy, + md.results.TransientSolution[3].Vel, + md.results.TransientSolution[3].Pressure, + md.results.TransientSolution[3].Base, + md.results.TransientSolution[3].Surface, + md.results.TransientSolution[3].Thickness, + md.results.TransientSolution[3].SmbMassBalance] Index: /issm/trunk-jpl/test/NightlyRun/test242.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test242.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test242.py (revision 23793) @@ -10,68 +10,68 @@ -md=triangle(model(),'../Exp/Square.exp',350000.) -md=setmask(md,'all','') -md=parameterize(md,'../Par/SquareShelf.py') -md.extrude(3,1.) -md=setflowequation(md,'HO','all') -md.cluster=generic('name',gethostname(),'np',3) +md = triangle(model(), '../Exp/Square.exp', 350000.) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelf.py') +md.extrude(3, 1.) +md = setflowequation(md, 'HO', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) -md.timestepping.time_step=1. -md.settings.output_frequency=1 -md.timestepping.final_time=4. -md.timestepping.interp_forcings=False +md.timestepping.time_step = 1. +md.settings.output_frequency = 1 +md.timestepping.final_time = 4. +md.timestepping.interp_forcings = False #Set up transient -smb=np.ones((md.mesh.numberofvertices))*3.6 -smb=np.vstack((smb,smb*-1.)).T +smb = np.ones((md.mesh.numberofvertices)) * 3.6 +smb = np.vstack((smb, smb * -1.)).T -md.smb.mass_balance=np.vstack((smb,[1.5,3.])) -md.transient.isthermal=False +md.smb.mass_balance = np.vstack((smb, [1.5, 3.])) +md.transient.isthermal = False -md=solve(md,'Transient') +md = solve(md, 'Transient') #Fields and tolerances to track changes -field_names =['Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','SmbMassBalance1', - 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','SmbMassBalance2', - 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','SmbMassBalance3', - 'Vx4','Vy4','Vz4','Vel4','Pressure4','Bed4','Surface4','Thickness4','SmbMassbalance4'] -field_tolerances=[1e-09,1e-09,1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-13, - 1e-09,1e-09,1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-13, - 1e-09,1e-09,1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-13, - 1e-09,1e-09,1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-13] -field_values=[md.results.TransientSolution[0].Vx, - md.results.TransientSolution[0].Vy, - md.results.TransientSolution[0].Vz, - md.results.TransientSolution[0].Vel, - md.results.TransientSolution[0].Pressure, - md.results.TransientSolution[0].Base, - md.results.TransientSolution[0].Surface, - md.results.TransientSolution[0].Thickness, - md.results.TransientSolution[0].SmbMassBalance, - md.results.TransientSolution[1].Vx, - md.results.TransientSolution[1].Vy, - md.results.TransientSolution[1].Vz, - md.results.TransientSolution[1].Vel, - md.results.TransientSolution[1].Pressure, - md.results.TransientSolution[1].Base, - md.results.TransientSolution[1].Surface, - md.results.TransientSolution[1].Thickness, - md.results.TransientSolution[1].SmbMassBalance, - md.results.TransientSolution[2].Vx, - md.results.TransientSolution[2].Vy, - md.results.TransientSolution[2].Vz, - md.results.TransientSolution[2].Vel, - md.results.TransientSolution[2].Pressure, - md.results.TransientSolution[2].Base, - md.results.TransientSolution[2].Surface, - md.results.TransientSolution[2].Thickness, - md.results.TransientSolution[2].SmbMassBalance, - md.results.TransientSolution[3].Vx, - md.results.TransientSolution[3].Vy, - md.results.TransientSolution[3].Vz, - md.results.TransientSolution[3].Vel, - md.results.TransientSolution[3].Pressure, - md.results.TransientSolution[3].Base, - md.results.TransientSolution[3].Surface, - md.results.TransientSolution[3].Thickness, - md.results.TransientSolution[3].SmbMassBalance] +field_names = ['Vx1', 'Vy1', 'Vz1', 'Vel1', 'Pressure1', 'Bed1', 'Surface1', 'Thickness1', 'SmbMassBalance1', + 'Vx2', 'Vy2', 'Vz2', 'Vel2', 'Pressure2', 'Bed2', 'Surface2', 'Thickness2', 'SmbMassBalance2', + 'Vx3', 'Vy3', 'Vz3', 'Vel3', 'Pressure3', 'Bed3', 'Surface3', 'Thickness3', 'SmbMassBalance3', + 'Vx4', 'Vy4', 'Vz4', 'Vel4', 'Pressure4', 'Bed4', 'Surface4', 'Thickness4', 'SmbMassbalance4'] +field_tolerances = [1e-09, 1e-09, 1e-09, 1e-09, 1e-10, 1e-10, 1e-10, 1e-10, 1e-13, + 1e-09, 1e-09, 1e-09, 1e-09, 1e-10, 1e-10, 1e-10, 1e-10, 1e-13, + 1e-09, 1e-09, 1e-09, 1e-09, 1e-10, 1e-10, 1e-10, 1e-10, 1e-13, + 1e-09, 1e-09, 1e-09, 1e-09, 1e-10, 1e-10, 1e-10, 1e-10, 1e-13] +field_values = [md.results.TransientSolution[0].Vx, + md.results.TransientSolution[0].Vy, + md.results.TransientSolution[0].Vz, + md.results.TransientSolution[0].Vel, + md.results.TransientSolution[0].Pressure, + md.results.TransientSolution[0].Base, + md.results.TransientSolution[0].Surface, + md.results.TransientSolution[0].Thickness, + md.results.TransientSolution[0].SmbMassBalance, + md.results.TransientSolution[1].Vx, + md.results.TransientSolution[1].Vy, + md.results.TransientSolution[1].Vz, + md.results.TransientSolution[1].Vel, + md.results.TransientSolution[1].Pressure, + md.results.TransientSolution[1].Base, + md.results.TransientSolution[1].Surface, + md.results.TransientSolution[1].Thickness, + md.results.TransientSolution[1].SmbMassBalance, + md.results.TransientSolution[2].Vx, + md.results.TransientSolution[2].Vy, + md.results.TransientSolution[2].Vz, + md.results.TransientSolution[2].Vel, + md.results.TransientSolution[2].Pressure, + md.results.TransientSolution[2].Base, + md.results.TransientSolution[2].Surface, + md.results.TransientSolution[2].Thickness, + md.results.TransientSolution[2].SmbMassBalance, + md.results.TransientSolution[3].Vx, + md.results.TransientSolution[3].Vy, + md.results.TransientSolution[3].Vz, + md.results.TransientSolution[3].Vel, + md.results.TransientSolution[3].Pressure, + md.results.TransientSolution[3].Base, + md.results.TransientSolution[3].Surface, + md.results.TransientSolution[3].Thickness, + md.results.TransientSolution[3].SmbMassBalance] Index: /issm/trunk-jpl/test/NightlyRun/test2424.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test2424.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test2424.py (revision 23793) @@ -10,14 +10,14 @@ from newforcing import * -md = triangle(model(),'../Exp/Square.exp',150000.) -md = setmask(md,'../Exp/SquareShelf.exp','') -md = parameterize(md,'../Par/SquareSheetShelf.py') -md = setflowequation(md,'SSA','all') +md = triangle(model(), '../Exp/Square.exp', 150000.) +md = setmask(md, '../Exp/SquareShelf.exp', '') +md = parameterize(md, '../Par/SquareSheetShelf.py') +md = setflowequation(md, 'SSA', 'all') md.initialization.vx[:] = 0. md.initialization.vy[:] = 0. 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 @@ -27,15 +27,15 @@ md.transient.isthermal = 0 md.groundingline.migration = 'AggressiveMigration' -md.transient.requested_outputs = ['IceVolume','IceVolumeAboveFloatation','Sealevel'] +md.transient.requested_outputs = ['IceVolume', 'IceVolumeAboveFloatation', 'Sealevel'] 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) -md = solve(md,'Transient') +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'Transient') -#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 +#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 nsteps = len(md.results.TransientSolution) @@ -45,7 +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_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_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)) Index: /issm/trunk-jpl/test/NightlyRun/test2425.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test2425.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test2425.py (revision 23793) @@ -9,8 +9,8 @@ from solve import * -md = triangle(model(),'../Exp/Square.exp',150000.) -md = setmask(md,'../Exp/SquareShelf.exp','') -md = parameterize(md,'../Par/SquareSheetShelf.py') -md = setflowequation(md,'SSA','all') +md = triangle(model(), '../Exp/Square.exp', 150000.) +md = setmask(md, '../Exp/SquareShelf.exp', '') +md = parameterize(md, '../Par/SquareSheetShelf.py') +md = setflowequation(md, 'SSA', 'all') md.initialization.vx[:] = 0. md.initialization.vy[:] = 0. @@ -26,11 +26,11 @@ md.timestepping.final_time = 1 -md.cluster = generic('name',gethostname(),'np',3) -md = solve(md,'Transient') +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'Transient') vel1 = md.results.TransientSolution[-1].Vel -#get same results with offset in bed and sea level: +#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.bed = -700. - (md.mesh.y - 500000.) / 1000. md.geometry.thickness[:] = 1300. md.geometry.surface = md.geometry.base + md.geometry.thickness @@ -41,10 +41,9 @@ md.slr.sealevel = 1000 * np.ones((md.mesh.numberofvertices,)) -md = solve(md,'Transient','checkconsistency','no') +md = solve(md, 'Transient', 'checkconsistency', 'no') vel2 = md.results.TransientSolution[-1].Vel #Fields and tolerances to track changes -field_names = ['Vel','Veloffset'] -field_tolerances = [1e-13,1e-13] -field_values = [vel1,vel2] - +field_names = ['Vel', 'Veloffset'] +field_tolerances = [1e-13, 1e-13] +field_values = [vel1, vel2] Index: /issm/trunk-jpl/test/NightlyRun/test243.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test243.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test243.py (revision 23793) @@ -11,38 +11,38 @@ from SMBgemb import * -md = triangle(model(),'../Exp/Square.exp',200000.) -md = setmask(md,'all','') -md = parameterize(md,'../Par/SquareShelf.py') -md = setflowequation(md,'SSA','all') +md = triangle(model(), '../Exp/Square.exp', 200000.) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelf.py') +md = setflowequation(md, 'SSA', 'all') md.materials.rho_ice = 910 -md.cluster = generic('name',gethostname(),'np',3) +md.cluster = generic('name', gethostname(), 'np', 3) #Use of Gemb method for SMB computation md.smb = SMBgemb() -md.smb.setdefaultparameters(md.mesh,md.geometry) +md.smb.setdefaultparameters(md.mesh, md.geometry) md.smb.dsnowIdx = 0 #load hourly surface forcing date from 1979 to 2009: if sys.version_info.major == 2: - inputs = np.load('../Data/gemb_input.npy').item() + inputs = np.load('../Data/gemb_input.npy').item() else: - inputs = np.load('../Data/gemb_input.npy',encoding='bytes').item() + inputs = np.load('../Data/gemb_input.npy', encoding='bytes').item() #setup the inputs: -md.smb.Ta = np.append(np.tile(np.conjugate(inputs[b'Ta0']),(md.mesh.numberofelements,1)),np.conjugate([inputs[b'dateN']]),axis=0) -md.smb.V = np.append(np.tile(np.conjugate(inputs[b'V0']),(md.mesh.numberofelements,1)),np.conjugate([inputs[b'dateN']]),axis=0) -md.smb.dswrf = np.append(np.tile(np.conjugate(inputs[b'dsw0']),(md.mesh.numberofelements,1)),np.conjugate([inputs[b'dateN']]),axis=0) -md.smb.dlwrf = np.append(np.tile(np.conjugate(inputs[b'dlw0']),(md.mesh.numberofelements,1)),np.conjugate([inputs[b'dateN']]),axis=0) -md.smb.P = np.append(np.tile(np.conjugate(inputs[b'P0']),(md.mesh.numberofelements,1)),np.conjugate([inputs[b'dateN']]),axis=0) -md.smb.eAir = np.append(np.tile(np.conjugate(inputs[b'eAir0']),(md.mesh.numberofelements,1)),np.conjugate([inputs[b'dateN']]),axis=0) -md.smb.pAir = np.append(np.tile(np.conjugate(inputs[b'pAir0']),(md.mesh.numberofelements,1)),np.conjugate([inputs[b'dateN']]),axis=0) -md.smb.pAir = np.append(np.tile(np.conjugate(inputs[b'pAir0']),(md.mesh.numberofelements,1)),np.conjugate([inputs[b'dateN']]),axis=0) -md.smb.Vz = np.tile(np.conjugate(inputs[b'LP']['Vz']),(md.mesh.numberofelements,1)).flatten() -md.smb.Tz = np.tile(np.conjugate(inputs[b'LP']['Tz']),(md.mesh.numberofelements,1)).flatten() -md.smb.Tmean = np.tile(np.conjugate(inputs[b'LP']['Tmean']),(md.mesh.numberofelements,1)).flatten() -md.smb.C = np.tile(np.conjugate(inputs[b'LP']['C']),(md.mesh.numberofelements,1)).flatten() +md.smb.Ta = np.append(np.tile(np.conjugate(inputs[b'Ta0']), (md.mesh.numberofelements, 1)), np.conjugate([inputs[b'dateN']]), axis=0) +md.smb.V = np.append(np.tile(np.conjugate(inputs[b'V0']), (md.mesh.numberofelements, 1)), np.conjugate([inputs[b'dateN']]), axis=0) +md.smb.dswrf = np.append(np.tile(np.conjugate(inputs[b'dsw0']), (md.mesh.numberofelements, 1)), np.conjugate([inputs[b'dateN']]), axis=0) +md.smb.dlwrf = np.append(np.tile(np.conjugate(inputs[b'dlw0']), (md.mesh.numberofelements, 1)), np.conjugate([inputs[b'dateN']]), axis=0) +md.smb.P = np.append(np.tile(np.conjugate(inputs[b'P0']), (md.mesh.numberofelements, 1)), np.conjugate([inputs[b'dateN']]), axis=0) +md.smb.eAir = np.append(np.tile(np.conjugate(inputs[b'eAir0']), (md.mesh.numberofelements, 1)), np.conjugate([inputs[b'dateN']]), axis=0) +md.smb.pAir = np.append(np.tile(np.conjugate(inputs[b'pAir0']), (md.mesh.numberofelements, 1)), np.conjugate([inputs[b'dateN']]), axis=0) +md.smb.pAir = np.append(np.tile(np.conjugate(inputs[b'pAir0']), (md.mesh.numberofelements, 1)), np.conjugate([inputs[b'dateN']]), axis=0) +md.smb.Vz = np.tile(np.conjugate(inputs[b'LP']['Vz']), (md.mesh.numberofelements, 1)).flatten() +md.smb.Tz = np.tile(np.conjugate(inputs[b'LP']['Tz']), (md.mesh.numberofelements, 1)).flatten() +md.smb.Tmean = np.tile(np.conjugate(inputs[b'LP']['Tmean']), (md.mesh.numberofelements, 1)).flatten() +md.smb.C = np.tile(np.conjugate(inputs[b'LP']['C']), (md.mesh.numberofelements, 1)).flatten() #smb settings -md.smb.requested_outputs = ['SmbDz','SmbT','SmbD','SmbRe','SmbGdn','SmbGsp','SmbEC','SmbA','SmbMassBalance','SmbMAdd','SmbDzAdd','SmbFAC'] +md.smb.requested_outputs = ['SmbDz', 'SmbT', 'SmbD', 'SmbRe', 'SmbGdn', 'SmbGsp', 'SmbEC', 'SmbA', 'SmbMassBalance', 'SmbMAdd', 'SmbDzAdd', 'SmbFAC'] #only run smb core: @@ -58,22 +58,20 @@ #Run transient -md = solve(md,'Transient') +md = solve(md, 'Transient') #Fields and tolerances to track changes -field_names = ['SmbDz','SmbT' ,'SmbD' ,'SmbRe','SmbGdn','SmbGsp','SmbA' ,'SmbEC','SmbMassBalance','SmbMAdd','SmbDzAdd','SmbFAC'] -field_tolerances = [1e-11,1e-12,1e-11,2e-11,1e-11,1e-11,1e-12,2e-12,1e-12,1e-12,1e-12,1e-11] +field_names = ['SmbDz', 'SmbT', 'SmbD', 'SmbRe', 'SmbGdn', 'SmbGsp', 'SmbA', 'SmbEC', 'SmbMassBalance', 'SmbMAdd', 'SmbDzAdd', 'SmbFAC'] +field_tolerances = [1e-11, 1e-12, 1e-11, 2e-11, 1e-11, 1e-11, 1e-12, 2e-12, 1e-12, 1e-12, 1e-12, 1e-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), - md.results.TransientSolution[-1].SmbEC[0], - md.results.TransientSolution[-1].SmbMassBalance[0], - md.results.TransientSolution[-1].SmbMAdd[0], - md.results.TransientSolution[-1].SmbDzAdd[0], - md.results.TransientSolution[-1].SmbFAC[0], - ] +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], + md.results.TransientSolution[-1].SmbMAdd[0], + md.results.TransientSolution[-1].SmbDzAdd[0], + md.results.TransientSolution[-1].SmbFAC[0]] Index: /issm/trunk-jpl/test/NightlyRun/test244.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test244.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test244.py (revision 23793) @@ -19,46 +19,46 @@ from dmeth_params_set import * -md = triangle(model(),'../Exp/Square.exp',200000.) -md = setmask(md,'all','') -md = parameterize(md,'../Par/SquareShelf.py') -md = setflowequation(md,'SSA','all') +md = triangle(model(), '../Exp/Square.exp', 200000.) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelf.py') +md = setflowequation(md, 'SSA', 'all') md.materials.rho_ice = 910 -md.cluster = generic('name',gethostname(),'np',3) +md.cluster = generic('name', gethostname(), 'np', 3) md.geometry.bed = md.geometry.base # Use of Gemb method for SMB computation md.smb = SMBgemb() -md.smb.setdefaultparameters(md.mesh,md.geometry) +md.smb.setdefaultparameters(md.mesh, md.geometry) md.smb.dsnowIdx = 0 #load hourly surface forcing date from 1979 to 2009: -inputs = spio.loadmat('../Data/gemb_input.mat',squeeze_me = True) +inputs = spio.loadmat('../Data/gemb_input.mat', squeeze_me=True) -#setup the inputs: -md.smb.Ta = np.append(np.tile(np.conjugate(inputs['Ta0']),(md.mesh.numberofelements,1)),np.conjugate([inputs['dateN']]),axis=0) -md.smb.V = np.append(np.tile(np.conjugate(inputs['V0']),(md.mesh.numberofelements,1)),np.conjugate([inputs['dateN']]),axis=0) -md.smb.dswrf = np.append(np.tile(np.conjugate(inputs['dsw0']),(md.mesh.numberofelements,1)),np.conjugate([inputs['dateN']]),axis=0) -md.smb.dlwrf = np.append(np.tile(np.conjugate(inputs['dlw0']),(md.mesh.numberofelements,1)),np.conjugate([inputs['dateN']]),axis=0) -md.smb.P = np.append(np.tile(np.conjugate(inputs['P0']),(md.mesh.numberofelements,1)),np.conjugate([inputs['dateN']]),axis=0) -md.smb.eAir = np.append(np.tile(np.conjugate(inputs['eAir0']),(md.mesh.numberofelements,1)),np.conjugate([inputs['dateN']]),axis=0) -md.smb.pAir = np.append(np.tile(np.conjugate(inputs['pAir0']),(md.mesh.numberofelements,1)),np.conjugate([inputs['dateN']]),axis=0) -md.smb.pAir = np.append(np.tile(np.conjugate(inputs['pAir0']),(md.mesh.numberofelements,1)),np.conjugate([inputs['dateN']]),axis=0) -md.smb.Vz = np.tile(np.conjugate(inputs['LP']['Vz']),(md.mesh.numberofelements,1)).flatten() -md.smb.Tz = np.tile(np.conjugate(inputs['LP']['Tz']),(md.mesh.numberofelements,1)).flatten() -md.smb.Tmean = np.tile(np.conjugate(inputs['LP']['Tmean']),(md.mesh.numberofelements,1)).flatten() -md.smb.C = np.tile(np.conjugate(inputs['LP']['C']),(md.mesh.numberofelements,1)).flatten() +#setup the inputs: +md.smb.Ta = np.append(np.tile(np.conjugate(inputs['Ta0']), (md.mesh.numberofelements, 1)), np.conjugate([inputs['dateN']]), axis=0) +md.smb.V = np.append(np.tile(np.conjugate(inputs['V0']), (md.mesh.numberofelements, 1)), np.conjugate([inputs['dateN']]), axis=0) +md.smb.dswrf = np.append(np.tile(np.conjugate(inputs['dsw0']), (md.mesh.numberofelements, 1)), np.conjugate([inputs['dateN']]), axis=0) +md.smb.dlwrf = np.append(np.tile(np.conjugate(inputs['dlw0']), (md.mesh.numberofelements, 1)), np.conjugate([inputs['dateN']]), axis=0) +md.smb.P = np.append(np.tile(np.conjugate(inputs['P0']), (md.mesh.numberofelements, 1)), np.conjugate([inputs['dateN']]), axis=0) +md.smb.eAir = np.append(np.tile(np.conjugate(inputs['eAir0']), (md.mesh.numberofelements, 1)), np.conjugate([inputs['dateN']]), axis=0) +md.smb.pAir = np.append(np.tile(np.conjugate(inputs['pAir0']), (md.mesh.numberofelements, 1)), np.conjugate([inputs['dateN']]), axis=0) +md.smb.pAir = np.append(np.tile(np.conjugate(inputs['pAir0']), (md.mesh.numberofelements, 1)), np.conjugate([inputs['dateN']]), axis=0) +md.smb.Vz = np.tile(np.conjugate(inputs['LP']['Vz']), (md.mesh.numberofelements, 1)).flatten() +md.smb.Tz = np.tile(np.conjugate(inputs['LP']['Tz']), (md.mesh.numberofelements, 1)).flatten() +md.smb.Tmean = np.tile(np.conjugate(inputs['LP']['Tmean']), (md.mesh.numberofelements, 1)).flatten() +md.smb.C = np.tile(np.conjugate(inputs['LP']['C']), (md.mesh.numberofelements, 1)).flatten() #smb settings -md.smb.requested_outputs = ['SmbDz','SmbT','SmbD','SmbRe','SmbGdn','SmbGsp','SmbEC','SmbA','SmbMassBalance'] +md.smb.requested_outputs = ['SmbDz', 'SmbT', 'SmbD', 'SmbRe', 'SmbGdn', 'SmbGsp', 'SmbEC', 'SmbA', 'SmbMassBalance'] -#only run smb core: +#only run smb core: md.transient.isstressbalance = 0 md.transient.ismasstransport = 1 md.transient.isthermal = 0 -#time stepping: +#time stepping: md.timestepping.start_time = 1965. md.timestepping.final_time = 1965.75 -md.timestepping.time_step = 1./365.0 +md.timestepping.time_step = 1. / 365.0 md.timestepping.interp_forcings = 0. @@ -69,35 +69,35 @@ #partitioning md.qmu.numberofpartitions = md.mesh.numberofelements -md = partitioner(md,'package','linear') -md.qmu.partition = (md.qmu.partition - 1).reshape(-1,1).T +md = partitioner(md, 'package', 'linear') +md.qmu.partition = (md.qmu.partition - 1).reshape(-1, 1).T #variables -md.qmu.variables.surface_mass_balanceC = normal_uncertain.normal_uncertain('scaled_SmbC',1,0.5) +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.partition == pa) - mint = telms[vi]*1.05 - pos = np.where(mint < Tmin) - mint[pos] = Tmin - mint_on_partition[pa] = max(mint/telms[vi]) + vi = np.where(md.qmu.partition == pa) + mint = telms[vi] * 1.05 + pos = np.where(mint < Tmin) + mint[pos] = Tmin + mint_on_partition[pa] = max(mint / telms[vi]) 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 = uniform_uncertain.uniform_uncertain('scaled_SmbTa', 1, 0.05) md.qmu.variables.surface_mass_balanceTa[0].lower = 0.95 -md.qmu.variables.surface_mass_balanceTa[0].upper = np.maximum(np.minimum(np.maximum(1.05,mint_on_partition),0.9999),0.0001) +md.qmu.variables.surface_mass_balanceTa[0].upper = np.maximum(np.minimum(np.maximum(1.05, mint_on_partition), 0.9999), 0.0001) #responses -md.qmu.responses.IceVolume = response_function.response_function('IceVolume',[],[0.0001,0.001,0.01,0.25,0.5,0.75,0.99,0.999,0.9999]) -md.qmu.responses.IceMass = response_function.response_function('IceMass',[],[0.0001,0.001,0.01,0.25,0.5,0.75,0.99,0.999,0.9999]) -md.qmu.responses.TotalSmb = response_function.response_function('TotalSmb',[],[0.0001,0.001,0.01,0.25,0.5,0.75,0.99,0.999,0.9999]) +md.qmu.responses.IceVolume = response_function.response_function('IceVolume', [], [0.0001, 0.001, 0.01, 0.25, 0.5, 0.75, 0.99, 0.999, 0.9999]) +md.qmu.responses.IceMass = response_function.response_function('IceMass', [], [0.0001, 0.001, 0.01, 0.25, 0.5, 0.75, 0.99, 0.999, 0.9999]) +md.qmu.responses.TotalSmb = response_function.response_function('TotalSmb', [], [0.0001, 0.001, 0.01, 0.25, 0.5, 0.75, 0.99, 0.999, 0.9999]) # nond_sampling study md.qmu.method = dakota_method.dakota_method('nond_samp') -md.qmu.method = dmeth_params_set(md.qmu.method,'seed',1234,'samples',3,'sample_type','lhs') +md.qmu.method = dmeth_params_set(md.qmu.method, 'seed', 1234, 'samples', 3, 'sample_type', 'lhs') dver = str(version) -if ((int(dver[0]) == 4 and int(dver[2])>2) or int(dver[0])>4): - md.qmu.method = dmeth_params_set(md.qmu.method,'rng','rnum2') +if ((int(dver[0]) == 4 and int(dver[2]) > 2) or int(dver[0]) > 4): + md.qmu.method = dmeth_params_set(md.qmu.method, 'rng', 'rnum2') #parameters @@ -109,18 +109,18 @@ if version >= 6: - md.qmu.params.analysis_driver = 'matlab' - md.qmu.params.evaluation_scheduling = 'master' - md.qmu.params.processors_per_evaluation = 2 + md.qmu.params.analysis_driver = 'matlab' + md.qmu.params.evaluation_scheduling = 'master' + md.qmu.params.processors_per_evaluation = 2 else: - md.qmu.params.analysis_driver = 'stressbalance' - md.qmu.params.evaluation_concurrency = 1 + md.qmu.params.analysis_driver = 'stressbalance' + md.qmu.params.evaluation_concurrency = 1 -md.stressbalance.reltol = 10**-5 #tighten for qmu analyses -md.transient.requested_outputs = ['IceVolume','TotalSmb','IceMass'] +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 = solve(md,'Transient','overwrite','y') +md.verbose = verbose('000000000') # this line is recommended +md = solve(md, 'Transient', 'overwrite', 'y') md.qmu.results = md.results.dakota @@ -128,11 +128,10 @@ md.results.dakota.moments = [] for i in range(3): - md.results.dakota.moments.append(md.results.dakota.dresp_out[i].mean) + md.results.dakota.moments.append(md.results.dakota.dresp_out[i].mean) for i in range(3): - md.results.dakota.moments.append(md.results.dakota.dresp_out[i].stddev) + md.results.dakota.moments.append(md.results.dakota.dresp_out[i].stddev) field_names = ['moments'] field_tolerances = [1e-11] field_values = [md.results.dakota.moments] - Index: /issm/trunk-jpl/test/NightlyRun/test245.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test245.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test245.py (revision 23793) @@ -11,26 +11,26 @@ from SMBpddSicopolis import * -md = triangle(model(),'../Exp/Square.exp',150000.) -md = setmask(md,'all','') -md = parameterize(md,'../Par/SquareShelf.py') +md = triangle(model(), '../Exp/Square.exp', 150000.) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelf.py') # Use of SMBpddSicopolis -md.smb = SMBpddSicopolis() +md.smb = SMBpddSicopolis() # 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)) + +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,)) -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) - md.smb.monthlytemperatures[md.mesh.numberofvertices,imonth] = ((imonth+1)/12.) - md.smb.precipitation[0:md.mesh.numberofvertices,imonth] = precipitation - md.smb.precipitation[md.mesh.numberofvertices,imonth] = ((imonth+1)/12.) +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) + md.smb.monthlytemperatures[md.mesh.numberofvertices, imonth] = ((imonth + 1) / 12.) + md.smb.precipitation[0:md.mesh.numberofvertices, imonth] = precipitation + md.smb.precipitation[md.mesh.numberofvertices, imonth] = ((imonth + 1) / 12.) # time steps and resolution @@ -44,16 +44,13 @@ md.transient.isthermal = 0 -md.transient.requested_outputs = ['default','TemperaturePDD'] -md.cluster = generic('name',gethostname(),'np',1) # 3 for the cluster -md = solve(md,'Transient') +md.transient.requested_outputs = ['default', 'TemperaturePDD'] +md.cluster = generic('name', gethostname(), 'np', 1) # 3 for the cluster +md = solve(md, 'Transient') #Fields and tolerances to track changes -field_names = ['TemperaturePDD1','SmbMassBalance1','TemperaturePDD2','SmbMassBalance2'] -field_tolerances = [1e-13,1e-13,1e-13,1e-13] -field_values = [ - md.results.TransientSolution[0].TemperaturePDD, - md.results.TransientSolution[0].SmbMassBalance, - md.results.TransientSolution[1].TemperaturePDD, - md.results.TransientSolution[1].SmbMassBalance, - ] - +field_names = ['TemperaturePDD1', 'SmbMassBalance1', 'TemperaturePDD2', 'SmbMassBalance2'] +field_tolerances = [1e-13, 1e-13, 1e-13, 1e-13] +field_values = [md.results.TransientSolution[0].TemperaturePDD, + md.results.TransientSolution[0].SmbMassBalance, + md.results.TransientSolution[1].TemperaturePDD, + md.results.TransientSolution[1].SmbMassBalance] Index: /issm/trunk-jpl/test/NightlyRun/test250.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test250.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test250.py (revision 23793) @@ -1,5 +1,4 @@ #Test Name: SquareShelfTranForceNeg2dDakotaSampLinearPart import numpy as np -import scipy.io as spio from os import getcwd from model import * @@ -14,9 +13,9 @@ from dmeth_params_set import * -md = triangle(model(),'../Exp/Square.exp',180000.) -md = setmask(md,'all','') -md = parameterize(md,'../Par/SquareShelf.py') -md = setflowequation(md,'SSA','all') -md.cluster = generic('name',gethostname(),'np',3) +md = triangle(model(), '../Exp/Square.exp', 180000.) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelf.py') +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) md.timestepping.time_step = 1 @@ -24,9 +23,9 @@ 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 -md.smb.mass_balance = np.concatenate((md.smb.mass_balance,[[1.5,3]])) +md.smb.mass_balance = smb +md.smb.mass_balance = np.concatenate((md.smb.mass_balance, [[1.5, 3]])) md.transient.isthermal = 0 #Dakota options @@ -38,30 +37,30 @@ #partitioning md.qmu.numberofpartitions = md.mesh.numberofvertices -md = partitioner(md,'package','linear') -md.qmu.partition = md.qmu.partition-1 +md = partitioner(md, 'package', 'linear') +md.qmu.partition = md.qmu.partition - 1 #variables -md.qmu.variables.surface_mass_balance = normal_uncertain.normal_uncertain('scaled_SmbMassBalance',1,0.1) +md.qmu.variables.surface_mass_balance = normal_uncertain.normal_uncertain('scaled_SmbMassBalance', 1, 0.1) #responses -md.qmu.responses.MaxVel = response_function.response_function('MaxVel',[],[0.0001,0.001,0.01,0.25,0.5,0.75,0.99,0.999,0.9999]) -md.qmu.responses.IceVolume = response_function.response_function('IceVolume',[],[0.0001,0.001,0.01,0.25,0.5,0.75,0.99,0.999,0.9999]) -md.qmu.responses.MassFlux1 = response_function.response_function('indexed_MassFlux_1',[],[0.0001,0.001,0.01,0.25,0.5,0.75,0.99,0.999,0.9999]) -md.qmu.responses.MassFlux2 = response_function.response_function('indexed_MassFlux_2',[],[0.0001,0.001,0.01,0.25,0.5,0.75,0.99,0.999,0.9999]) -md.qmu.responses.MassFlux3 = response_function.response_function('indexed_MassFlux_3',[],[0.0001,0.001,0.01,0.25,0.5,0.75,0.99,0.999,0.9999]) -md.qmu.responses.MassFlux4 = response_function.response_function('indexed_MassFlux_4',[],[0.0001,0.001,0.01,0.25,0.5,0.75,0.99,0.999,0.9999]) -md.qmu.responses.MassFlux5 = response_function.response_function('indexed_MassFlux_5',[],[0.0001,0.001,0.01,0.25,0.5,0.75,0.99,0.999,0.9999]) -md.qmu.responses.massFlux6 = response_function.response_function('indexed_MassFlux_6',[],[0.0001,0.001,0.01,0.25,0.5,0.75,0.99,0.999,0.9999]) +md.qmu.responses.MaxVel = response_function.response_function('MaxVel', [], [0.0001, 0.001, 0.01, 0.25, 0.5, 0.75, 0.99, 0.999, 0.9999]) +md.qmu.responses.IceVolume = response_function.response_function('IceVolume', [], [0.0001, 0.001, 0.01, 0.25, 0.5, 0.75, 0.99, 0.999, 0.9999]) +md.qmu.responses.MassFlux1 = response_function.response_function('indexed_MassFlux_1', [], [0.0001, 0.001, 0.01, 0.25, 0.5, 0.75, 0.99, 0.999, 0.9999]) +md.qmu.responses.MassFlux2 = response_function.response_function('indexed_MassFlux_2', [], [0.0001, 0.001, 0.01, 0.25, 0.5, 0.75, 0.99, 0.999, 0.9999]) +md.qmu.responses.MassFlux3 = response_function.response_function('indexed_MassFlux_3', [], [0.0001, 0.001, 0.01, 0.25, 0.5, 0.75, 0.99, 0.999, 0.9999]) +md.qmu.responses.MassFlux4 = response_function.response_function('indexed_MassFlux_4', [], [0.0001, 0.001, 0.01, 0.25, 0.5, 0.75, 0.99, 0.999, 0.9999]) +md.qmu.responses.MassFlux5 = response_function.response_function('indexed_MassFlux_5', [], [0.0001, 0.001, 0.01, 0.25, 0.5, 0.75, 0.99, 0.999, 0.9999]) +md.qmu.responses.massFlux6 = response_function.response_function('indexed_MassFlux_6', [], [0.0001, 0.001, 0.01, 0.25, 0.5, 0.75, 0.99, 0.999, 0.9999]) #mass flux profiles -md.qmu.mass_flux_profiles = ['../Exp/MassFlux1.exp','../Exp/MassFlux2.exp','../Exp/MassFlux3.exp','../Exp/MassFlux4.exp','../Exp/MassFlux5.exp','../Exp/MassFlux6.exp'] +md.qmu.mass_flux_profiles = ['../Exp/MassFlux1.exp', '../Exp/MassFlux2.exp', '../Exp/MassFlux3.exp', '../Exp/MassFlux4.exp', '../Exp/MassFlux5.exp', '../Exp/MassFlux6.exp'] md.qmu.mass_flux_profile_directory = getcwd() -## nond_sampling study +# nond_sampling study md.qmu.method = dakota_method.dakota_method('nond_samp') -md.qmu.method = dmeth_params_set(md.qmu.method,'seed',1234,'samples',20,'sample_type','lhs') +md.qmu.method = dmeth_params_set(md.qmu.method, 'seed', 1234, 'samples', 20, 'sample_type', 'lhs') dver = str(version) -if ((int(dver[0]) == 4 and int(dver[2])>2) or int(dver[0])>4): - md.qmu.method = dmeth_params_set(md.qmu.method,'rng','rnum2') +if ((int(dver[0]) == 4 and int(dver[2]) > 2) or int(dver[0]) > 4): + md.qmu.method = dmeth_params_set(md.qmu.method, 'rng', 'rnum2') #parameters @@ -73,17 +72,17 @@ if version >= 6: - md.qmu.params.analysis_driver = 'matlab' - md.qmu.params.evaluation_scheduling = 'master' - md.qmu.params.processors_per_evaluation = 2 + md.qmu.params.analysis_driver = 'matlab' + md.qmu.params.evaluation_scheduling = 'master' + md.qmu.params.processors_per_evaluation = 2 else: - md.qmu.params.analysis_driver = 'stressbalance' - md.qmu.params.evaluation_concurrency = 1 + md.qmu.params.analysis_driver = 'stressbalance' + 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 = solve(md,'Transient','overwrite','y') +md.verbose = verbose('000000000') # this line is recommended +md = solve(md, 'Transient', 'overwrite', 'y') md.qmu.results = md.results.dakota @@ -91,8 +90,8 @@ md.results.dakota.moments = [] for i in range(8): - md.results.dakota.moments.append(md.results.dakota.dresp_out[i].mean) + md.results.dakota.moments.append(md.results.dakota.dresp_out[i].mean) for i in range(8): - md.results.dakota.moments.append(md.results.dakota.dresp_out[i].stddev) + md.results.dakota.moments.append(md.results.dakota.dresp_out[i].stddev) field_names = ['moments'] Index: /issm/trunk-jpl/test/NightlyRun/test251.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test251.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test251.py (revision 23793) @@ -1,5 +1,4 @@ #Test Name: SquareShelfTranForceNeg2dDakotaLocalLinearPart import numpy as np -import scipy.io as spio from os import getcwd from model import * @@ -14,9 +13,9 @@ from dmeth_params_set import * -md = triangle(model(),'../Exp/Square.exp',180000.) -md = setmask(md,'all','') -md = parameterize(md,'../Par/SquareShelf.py') -md = setflowequation(md,'SSA','all') -md.cluster = generic('name',gethostname(),'np',3) +md = triangle(model(), '../Exp/Square.exp', 180000.) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelf.py') +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) md.timestepping.time_step = 1 @@ -24,9 +23,9 @@ 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 -md.smb.mass_balance = np.concatenate((md.smb.mass_balance,[[1.5,3]])) +md.smb.mass_balance = smb +md.smb.mass_balance = np.concatenate((md.smb.mass_balance, [[1.5, 3]])) md.transient.isthermal = 0 @@ -39,22 +38,22 @@ #partitioning md.qmu.numberofpartitions = md.mesh.numberofvertices -md = partitioner(md,'package','linear') -md.qmu.partition = md.qmu.partition-1 +md = partitioner(md, 'package', 'linear') +md.qmu.partition = md.qmu.partition - 1 #variables -md.qmu.variables.surface_mass_balance = normal_uncertain.normal_uncertain('scaled_SmbMassBalance',1,100) +md.qmu.variables.surface_mass_balance = normal_uncertain.normal_uncertain('scaled_SmbMassBalance', 1, 100) #responses -md.qmu.responses.MaxVel = response_function.response_function('MaxVel',[],[0.0001,0.001,0.01,0.25,0.5,0.75,0.99,0.999,0.9999]) -md.qmu.responses.IceVolume = response_function.response_function('IceVolume',[],[0.0001,0.001,0.01,0.25,0.5,0.75,0.99,0.999,0.9999]) -md.qmu.responses.MassFlux1 = response_function.response_function('indexed_MassFlux_1',[],[0.0001,0.001,0.01,0.25,0.5,0.75,0.99,0.999,0.9999]) -md.qmu.responses.MassFlux2 = response_function.response_function('indexed_MassFlux_2',[],[0.0001,0.001,0.01,0.25,0.5,0.75,0.99,0.999,0.9999]) -md.qmu.responses.MassFlux3 = response_function.response_function('indexed_MassFlux_3',[],[0.0001,0.001,0.01,0.25,0.5,0.75,0.99,0.999,0.9999]) -md.qmu.responses.MassFlux4 = response_function.response_function('indexed_MassFlux_4',[],[0.0001,0.001,0.01,0.25,0.5,0.75,0.99,0.999,0.9999]) -md.qmu.responses.MassFlux5 = response_function.response_function('indexed_MassFlux_5',[],[0.0001,0.001,0.01,0.25,0.5,0.75,0.99,0.999,0.9999]) -md.qmu.responses.massFlux6 = response_function.response_function('indexed_MassFlux_6',[],[0.0001,0.001,0.01,0.25,0.5,0.75,0.99,0.999,0.9999]) +md.qmu.responses.MaxVel = response_function.response_function('MaxVel', [], [0.0001, 0.001, 0.01, 0.25, 0.5, 0.75, 0.99, 0.999, 0.9999]) +md.qmu.responses.IceVolume = response_function.response_function('IceVolume', [], [0.0001, 0.001, 0.01, 0.25, 0.5, 0.75, 0.99, 0.999, 0.9999]) +md.qmu.responses.MassFlux1 = response_function.response_function('indexed_MassFlux_1', [], [0.0001, 0.001, 0.01, 0.25, 0.5, 0.75, 0.99, 0.999, 0.9999]) +md.qmu.responses.MassFlux2 = response_function.response_function('indexed_MassFlux_2', [], [0.0001, 0.001, 0.01, 0.25, 0.5, 0.75, 0.99, 0.999, 0.9999]) +md.qmu.responses.MassFlux3 = response_function.response_function('indexed_MassFlux_3', [], [0.0001, 0.001, 0.01, 0.25, 0.5, 0.75, 0.99, 0.999, 0.9999]) +md.qmu.responses.MassFlux4 = response_function.response_function('indexed_MassFlux_4', [], [0.0001, 0.001, 0.01, 0.25, 0.5, 0.75, 0.99, 0.999, 0.9999]) +md.qmu.responses.MassFlux5 = response_function.response_function('indexed_MassFlux_5', [], [0.0001, 0.001, 0.01, 0.25, 0.5, 0.75, 0.99, 0.999, 0.9999]) +md.qmu.responses.massFlux6 = response_function.response_function('indexed_MassFlux_6', [], [0.0001, 0.001, 0.01, 0.25, 0.5, 0.75, 0.99, 0.999, 0.9999]) #mass flux profiles -md.qmu.mass_flux_profiles = ['../Exp/MassFlux1.exp','../Exp/MassFlux2.exp','../Exp/MassFlux3.exp','../Exp/MassFlux4.exp','../Exp/MassFlux5.exp','../Exp/MassFlux6.exp'] +md.qmu.mass_flux_profiles = ['../Exp/MassFlux1.exp', '../Exp/MassFlux2.exp', '../Exp/MassFlux3.exp', '../Exp/MassFlux4.exp', '../Exp/MassFlux5.exp', '../Exp/MassFlux6.exp'] md.qmu.mass_flux_profile_directory = getcwd() @@ -70,17 +69,17 @@ if version >= 6: - md.qmu.params.analysis_driver = 'matlab' - md.qmu.params.evaluation_scheduling = 'master' - md.qmu.params.processors_per_evaluation = 2 + md.qmu.params.analysis_driver = 'matlab' + md.qmu.params.evaluation_scheduling = 'master' + md.qmu.params.processors_per_evaluation = 2 else: - md.qmu.params.analysis_driver = 'stressbalance' - md.qmu.params.evaluation_concurrency = 1 + md.qmu.params.analysis_driver = 'stressbalance' + 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 = solve(md,'Transient','overwrite','y') +md.verbose = verbose('000000000') # this line is recommended +md = solve(md, 'Transient', 'overwrite', 'y') md.qmu.results = md.results.dakota @@ -88,8 +87,8 @@ md.results.dakota.moments = [] for i in range(8): - md.results.dakota.moments.append(md.results.dakota.dresp_out[i].mean) + md.results.dakota.moments.append(md.results.dakota.dresp_out[i].mean) for i in range(8): - md.results.dakota.moments.append(md.results.dakota.dresp_out[i].stddev) + md.results.dakota.moments.append(md.results.dakota.dresp_out[i].stddev) field_names = ['moments'] Index: /issm/trunk-jpl/test/NightlyRun/test260.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test260.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test260.py (revision 23793) @@ -10,22 +10,20 @@ from matenhancedice import * -md = triangle(model(),'../Exp/Square.exp',150000.) -md = setmask(md,'all','') +md = triangle(model(), '../Exp/Square.exp', 150000.) +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 = parameterize(md,'../Par/SquareShelf.py') -md = setflowequation(md,'SSA','all') -md.cluster = generic('name',gethostname(),'np',3) -md = solve(md,'Stressbalance') +md = parameterize(md, '../Par/SquareShelf.py') +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'Stressbalance') #Fields and tolerances to track changes -field_names = ['Vx','Vy','Vel','Pressure'] -field_tolerances = [1e-13,1e-13,1e-13,1e-13] -field_values = [ - md.results.StressbalanceSolution.Vx, - md.results.StressbalanceSolution.Vy, - md.results.StressbalanceSolution.Vel, - md.results.StressbalanceSolution.Pressure, - ] +field_names = ['Vx', 'Vy', 'Vel', 'Pressure'] +field_tolerances = [1e-13, 1e-13, 1e-13, 1e-13] +field_values = [md.results.StressbalanceSolution.Vx, + md.results.StressbalanceSolution.Vy, + md.results.StressbalanceSolution.Vel, + md.results.StressbalanceSolution.Pressure] Index: /issm/trunk-jpl/test/NightlyRun/test261.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test261.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test261.py (revision 23793) @@ -10,10 +10,10 @@ from matenhancedice import * -md = triangle(model(),'../Exp/Square.exp',180000.) -md = setmask(md,'all','') -md = parameterize(md,'../Par/SquareShelfConstrained.py') -md = md.extrude(3,1.) -md = setflowequation(md,'SSA','all') -md.cluster = generic('name',gethostname(),'np',3) +md = triangle(model(), '../Exp/Square.exp', 180000.) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelfConstrained.py') +md = md.extrude(3, 1.) +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) md.materials = matenhancedice() md.materials.rheology_B = 3.15e8 * np.ones(md.mesh.numberofvertices,) @@ -25,14 +25,12 @@ md.transient.isthermal = 1 md.transient.isgroundingline = 0 -md = solve(md,'Transient') +md = solve(md, 'Transient') #Fields and tolerances to track changes -field_names = ['Vx','Vy','Vel','Temperature','BasalforcingsGroundediceMeltingRate'] -field_tolerances = [1e-13,1e-13,1e-13,1e-13,1e-13] -field_values = [ - md.results.TransientSolution[0].Vx, - md.results.TransientSolution[0].Vy, - md.results.TransientSolution[0].Vel, - md.results.TransientSolution[0].Temperature, - md.results.TransientSolution[0].BasalforcingsGroundediceMeltingRate, - ] +field_names = ['Vx', 'Vy', 'Vel', 'Temperature', 'BasalforcingsGroundediceMeltingRate'] +field_tolerances = [1e-13, 1e-13, 1e-13, 1e-13, 1e-13] +field_values = [md.results.TransientSolution[0].Vx, + md.results.TransientSolution[0].Vy, + md.results.TransientSolution[0].Vel, + md.results.TransientSolution[0].Temperature, + md.results.TransientSolution[0].BasalforcingsGroundediceMeltingRate] Index: /issm/trunk-jpl/test/NightlyRun/test270.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test270.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test270.py (revision 23793) @@ -10,22 +10,21 @@ from matdamageice import matdamageice from generic import generic -from socket import gethostname -md=triangle(model(),'../Exp/Square.exp',150000.) -md=setmask(md,'all','') -md.materials=matdamageice() -md=parameterize(md,'../Par/SquareShelf.py') -md.damage.isdamage=1 -md.damage.D=0.5*np.ones(md.mesh.numberofvertices) -md.damage.spcdamage=np.nan*np.ones(md.mesh.numberofvertices) -md=setflowequation(md,'SSA','all') -md.cluster=generic('name',gethostname(),'np',3) -md=solve(md,'Stressbalance') +md = triangle(model(), '../Exp/Square.exp', 150000.) +md = setmask(md, 'all', '') +md.materials = matdamageice() +md = parameterize(md, '../Par/SquareShelf.py') +md.damage.isdamage = 1 +md.damage.D = 0.5 * np.ones(md.mesh.numberofvertices) +md.damage.spcdamage = np.nan * np.ones(md.mesh.numberofvertices) +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'Stressbalance') #Fields and tolerances to track changes -field_names =['Vx','Vy','Vel','Pressure'] -field_tolerances=[1e-13,1e-13,1e-13,1e-13] -field_values=[md.results.StressbalanceSolution.Vx, - md.results.StressbalanceSolution.Vy, - md.results.StressbalanceSolution.Vel, - md.results.StressbalanceSolution.Pressure] +field_names = ['Vx', 'Vy', 'Vel', 'Pressure'] +field_tolerances = [1e-13, 1e-13, 1e-13, 1e-13] +field_values = [md.results.StressbalanceSolution.Vx, + md.results.StressbalanceSolution.Vy, + md.results.StressbalanceSolution.Vel, + md.results.StressbalanceSolution.Pressure] Index: /issm/trunk-jpl/test/NightlyRun/test272.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test272.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test272.py (revision 23793) @@ -8,42 +8,43 @@ from setflowequation import setflowequation from solve import solve -from socket import gethostname from matdamageice import matdamageice from generic import generic -md=triangle(model(),'../Exp/Square.exp',150000.) -md=setmask(md,'all','') -md.materials=matdamageice() -md=parameterize(md,'../Par/SquareShelf.py') -md.damage.isdamage=1 -md.damage.D=0.5*np.ones(md.mesh.numberofvertices) -md.damage.spcdamage=np.nan*np.ones(md.mesh.numberofvertices) -md=setflowequation(md,'SSA','all') +md = triangle(model(), '../Exp/Square.exp', 150000.) +md = setmask(md, 'all', '') +md.materials = matdamageice() +md = parameterize(md, '../Par/SquareShelf.py') +md.damage.isdamage = 1 +md.damage.D = 0.5 * np.ones(md.mesh.numberofvertices) +md.damage.spcdamage = np.nan * np.ones(md.mesh.numberofvertices) +md = setflowequation(md, 'SSA', 'all') #control parameters -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.max_parameters=np.ones((md.mesh.numberofvertices,len(md.inversion.control_parameters))) -md.inversion.nsteps=2 -md.inversion.cost_functions=[101] -md.inversion.cost_functions_coefficients=np.ones((md.mesh.numberofvertices,len(md.inversion.cost_functions))) -md.inversion.gradient_scaling=0.9*np.ones((md.inversion.nsteps,len(md.inversion.control_parameters))) -md.inversion.maxiter_per_step=2.*np.ones((md.inversion.nsteps)) -md.inversion.step_threshold=0.99*np.ones((md.inversion.nsteps)) -md.inversion.vx_obs=md.initialization.vx -md.inversion.vy_obs=md.initialization.vy +md.inversion.iscontrol = 1 +md.inversion.control_parameters = ['DamageDbar'] +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.max_parameters = np.ones((md.mesh.numberofvertices, len(md.inversion.control_parameters))) +md.inversion.nsteps = 2 +md.inversion.cost_functions = [101] +md.inversion.cost_functions_coefficients = np.ones((md.mesh.numberofvertices, len(md.inversion.cost_functions))) +md.inversion.gradient_scaling = 0.9 * np.ones((md.inversion.nsteps, len(md.inversion.control_parameters))) +md.inversion.maxiter_per_step = 2. * np.ones((md.inversion.nsteps)) +md.inversion.step_threshold = 0.99 * np.ones((md.inversion.nsteps)) +md.inversion.vx_obs = md.initialization.vx +md.inversion.vy_obs = md.initialization.vy -md.cluster=generic('name',gethostname(),'np',3) -md=solve(md,'Stressbalance') +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'Stressbalance') #Fields and tolerances to track changes -field_names =['Gradient','Misfits','DamageDbar','Pressure','Vel','Vx','Vy'] -field_tolerances=[1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12] -field_values=[md.results.StressbalanceSolution.Gradient1, - md.results.StressbalanceSolution.J, - md.results.StressbalanceSolution.DamageDbar, - md.results.StressbalanceSolution.Pressure, - md.results.StressbalanceSolution.Vel, - md.results.StressbalanceSolution.Vx, - md.results.StressbalanceSolution.Vy] +field_names = ['Gradient', 'Misfits', 'DamageDbar', 'Pressure', 'Vel', 'Vx', 'Vy'] +field_tolerances = [1e-12, 1e-12, 1e-12, 1e-12, 1e-12, 1e-12, 1e-12, 1e-12, 1e-12, 1e-12] +field_values = [md.results.StressbalanceSolution.Gradient1, + md.results.StressbalanceSolution.J, + md.results.StressbalanceSolution.DamageDbar, + md.results.StressbalanceSolution.Pressure, + md.results.StressbalanceSolution.Vel, + md.results.StressbalanceSolution.Vx, + md.results.StressbalanceSolution.Vy] Index: /issm/trunk-jpl/test/NightlyRun/test273.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test273.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test273.py (revision 23793) @@ -10,28 +10,27 @@ from matdamageice import matdamageice from generic import generic -from socket import gethostname -md=triangle(model(),'../Exp/Square.exp',150000.) -md=setmask(md,'all','') -md.materials=matdamageice() -md=parameterize(md,'../Par/SquareShelf.py') -md.damage.isdamage=1 -md.damage.D=0.*np.ones(md.mesh.numberofvertices) -md.damage.spcdamage=np.nan*np.ones(md.mesh.numberofvertices) -md=setflowequation(md,'SSA','all') -md.cluster=generic('name',gethostname(),'np',3) +md = triangle(model(), '../Exp/Square.exp', 150000.) +md = setmask(md, 'all', '') +md.materials = matdamageice() +md = parameterize(md, '../Par/SquareShelf.py') +md.damage.isdamage = 1 +md.damage.D = 0. * np.ones(md.mesh.numberofvertices) +md.damage.spcdamage = np.nan * np.ones(md.mesh.numberofvertices) +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) -md.stressbalance.requested_outputs=['default','NewDamage'] -md.damage.stress_threshold=1.3e5 -md.damage.kappa=2.8 +md.stressbalance.requested_outputs = ['default', 'NewDamage'] +md.damage.stress_threshold = 1.3e5 +md.damage.kappa = 2.8 -md=solve(md,'Stressbalance') +md = solve(md, 'Stressbalance') #Fields and tolerances to track changes -field_names =['Vx','Vy','Vel','Pressure','NewDamage'] -field_tolerances=[1e-13,1e-13,1e-13,1e-13,1e-13] -field_values=[md.results.StressbalanceSolution.Vx, - md.results.StressbalanceSolution.Vy, - md.results.StressbalanceSolution.Vel, - md.results.StressbalanceSolution.Pressure, - md.results.StressbalanceSolution.NewDamage] +field_names = ['Vx', 'Vy', 'Vel', 'Pressure', 'NewDamage'] +field_tolerances = [1e-13, 1e-13, 1e-13, 1e-13, 1e-13] +field_values = [md.results.StressbalanceSolution.Vx, + md.results.StressbalanceSolution.Vy, + md.results.StressbalanceSolution.Vel, + md.results.StressbalanceSolution.Pressure, + md.results.StressbalanceSolution.NewDamage] Index: /issm/trunk-jpl/test/NightlyRun/test274.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test274.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test274.py (revision 23793) @@ -8,28 +8,27 @@ from setflowequation import setflowequation from solve import solve -from socket import gethostname from matdamageice import matdamageice from meshprocessrifts import meshprocessrifts from generic import generic -md=triangle(model(),'../Exp/SquareHole.exp','../Exp/Rifts.exp',50000.) -md=meshprocessrifts(md,'../Exp/Square.exp') -md=setmask(md,'all','') -md.materials=matdamageice() -md=parameterize(md,'../Par/SquareShelf2.py') -md.damage.isdamage=1 -md.damage.D=0.5*np.ones(md.mesh.numberofvertices) -md.damage.spcdamage=np.nan*np.ones(md.mesh.numberofvertices) -md=setflowequation(md,'SSA','all') +md = triangle(model(), '../Exp/SquareHole.exp', '../Exp/Rifts.exp', 50000.) +md = meshprocessrifts(md, '../Exp/Square.exp') +md = setmask(md, 'all', '') +md.materials = matdamageice() +md = parameterize(md, '../Par/SquareShelf2.py') +md.damage.isdamage = 1 +md.damage.D = 0.5 * np.ones(md.mesh.numberofvertices) +md.damage.spcdamage = np.nan * np.ones(md.mesh.numberofvertices) +md = setflowequation(md, 'SSA', 'all') -md.cluster=generic('name',gethostname(),'np',3) +md.cluster = generic('name', gethostname(), 'np', 3) print(md.rifts.riftstruct[0]['fill']) -md=solve(md,'Stressbalance') +md = solve(md, 'Stressbalance') #Fields and tolerances to track changes -field_names =['Vx','Vy','Vel','Pressure'] -field_tolerances=[7e-8,3e-8,3e-8,1e-11] -field_values=[md.results.StressbalanceSolution.Vx, - md.results.StressbalanceSolution.Vy, - md.results.StressbalanceSolution.Vel, - md.results.StressbalanceSolution.Pressure] +field_names = ['Vx', 'Vy', 'Vel', 'Pressure'] +field_tolerances = [7e-8, 3e-8, 3e-8, 1e-11] +field_values = [md.results.StressbalanceSolution.Vx, + md.results.StressbalanceSolution.Vy, + md.results.StressbalanceSolution.Vel, + md.results.StressbalanceSolution.Pressure] Index: /issm/trunk-jpl/test/NightlyRun/test275.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test275.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test275.py (revision 23793) @@ -1,3 +1,3 @@ -#Test Name: SquareShelfDamageEvolutionSSA2dPralong +#Test Name: SquareShelfDamageEvolutionSSA2dPralong import numpy as np from triangle import triangle @@ -6,35 +6,33 @@ from setmask import setmask from parameterize import parameterize -from verbose import verbose from setflowequation import setflowequation from generic import generic -from socket import gethostname from solve import solve from matdamageice import matdamageice -md=triangle(model(),'../Exp/Square.exp',150000.) -md=setmask(md,'all','') -md.materials=matdamageice() -md=parameterize(md,'../Par/SquareShelf.py') -md.damage.isdamage=1 -md.damage.D=0.1*np.ones(md.mesh.numberofvertices) -md.damage.spcdamage=np.nan*np.ones(md.mesh.numberofvertices) -md.damage.law=1 +md = triangle(model(), '../Exp/Square.exp', 150000.) +md = setmask(md, 'all', '') +md.materials = matdamageice() +md = parameterize(md, '../Par/SquareShelf.py') +md.damage.isdamage = 1 +md.damage.D = 0.1 * np.ones(md.mesh.numberofvertices) +md.damage.spcdamage = np.nan * np.ones(md.mesh.numberofvertices) +md.damage.law = 1 -md.damage.c1=1.e-11 -md.damage.c2=0.4 -md.damage.c3=1.e-3 -md.damage.healing=0.4 -md.damage.stress_threshold=1.e5 -md.damage.stabilization=1 +md.damage.c1 = 1.e-11 +md.damage.c2 = 0.4 +md.damage.c3 = 1.e-3 +md.damage.healing = 0.4 +md.damage.stress_threshold = 1.e5 +md.damage.stabilization = 1 -md.damage.requested_outputs=['default','DamageF'] +md.damage.requested_outputs = ['default', 'DamageF'] -md=setflowequation(md,'SSA','all') -md.cluster=generic('name',gethostname(),'np',3) -md=solve(md,'DamageEvolution') +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'DamageEvolution') -field_names=['D','F'] -field_tolerances=[1.e-13,1.e-13] -field_values=[md.results.DamageEvolutionSolution.DamageDbar, - md.results.DamageEvolutionSolution.DamageF] +field_names = ['D', 'F'] +field_tolerances = [1.e-13, 1.e-13] +field_values = [md.results.DamageEvolutionSolution.DamageDbar, + md.results.DamageEvolutionSolution.DamageF] Index: /issm/trunk-jpl/test/NightlyRun/test280.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test280.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test280.py (revision 23793) @@ -10,22 +10,20 @@ from ContourToMesh import * -md=triangle(model(),'../Exp/Square.exp',150000) -md=setmask(md,'all','') -md=parameterize(md,'../Par/SquareShelf.py') -md=setflowequation(md,'SSA','all') -md.cluster=generic('name',gethostname(),'np',3) +md = triangle(model(), '../Exp/Square.exp', 150000) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelf.py') +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) -field_names=[] -field_tolerances=[] -field_values=[] -for i in ['P1bubble','P1bubblecondensed','P2']: - md.flowequation.fe_SSA=i - md=solve(md,'Stressbalance') - field_names =field_names+['Vx'+i,'Vy'+i,'Vel'+i,'Pressure'+i] - field_tolerances=field_tolerances+[1e-12,1e-13,1e-13,1e-13] - field_values=field_values+[\ - md.results.StressbalanceSolution.Vx,\ - md.results.StressbalanceSolution.Vy,\ - md.results.StressbalanceSolution.Vel,\ - md.results.StressbalanceSolution.Pressure,\ - ] +field_names = [] +field_tolerances = [] +field_values = [] +for i in ['P1bubble', 'P1bubblecondensed', 'P2']: + md.flowequation.fe_SSA = i + md = solve(md, 'Stressbalance') + field_names = field_names + ['Vx' + i, 'Vy' + i, 'Vel' + i, 'Pressure' + i] + field_tolerances = field_tolerances + [1e-12, 1e-13, 1e-13, 1e-13] + field_values = field_values + [md.results.StressbalanceSolution.Vx, + md.results.StressbalanceSolution.Vy, + md.results.StressbalanceSolution.Vel, + md.results.StressbalanceSolution.Pressure] Index: /issm/trunk-jpl/test/NightlyRun/test285.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test285.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test285.py (revision 23793) @@ -10,24 +10,22 @@ from ContourToMesh import * -md=triangle(model(),'../Exp/Square.exp',150000.) -md=setmask(md,'all','') -md=parameterize(md,'../Par/SquareShelf.py') -md.extrude(3,2.) -md=setflowequation(md,'HO','all') -md.cluster=generic('name',gethostname(),'np',3) +md = triangle(model(), '../Exp/Square.exp', 150000.) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelf.py') +md.extrude(3, 2.) +md = setflowequation(md, 'HO', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) -field_names=[] -field_tolerances=[] -field_values=[] -for i in ['P1bubble','P1bubblecondensed','P1xP2','P2xP1','P2','P1xP3','P2xP4']: - md.flowequation.fe_HO=i - md=solve(md,'Stressbalance') - field_names =field_names+['Vx'+i,'Vy'+i,'Vz'+i,'Vel'+i,'Pressure'+i] - field_tolerances=field_tolerances+[6.7e-08,5e-08,2e-08,5e-08,1e-13] - field_values=field_values+[\ - md.results.StressbalanceSolution.Vx,\ - md.results.StressbalanceSolution.Vy,\ - md.results.StressbalanceSolution.Vz,\ - md.results.StressbalanceSolution.Vel,\ - md.results.StressbalanceSolution.Pressure,\ - ] +field_names = [] +field_tolerances = [] +field_values = [] +for i in ['P1bubble', 'P1bubblecondensed', 'P1xP2', 'P2xP1', 'P2', 'P1xP3', 'P2xP4']: + md.flowequation.fe_HO = i + md = solve(md, 'Stressbalance') + field_names = field_names + ['Vx' + i, 'Vy' + i, 'Vz' + i, 'Vel' + i, 'Pressure' + i] + field_tolerances = field_tolerances + [6.7e-08, 5e-08, 2e-08, 5e-08, 1e-13] + field_values = field_values + [md.results.StressbalanceSolution.Vx, + md.results.StressbalanceSolution.Vy, + md.results.StressbalanceSolution.Vz, + md.results.StressbalanceSolution.Vel, + md.results.StressbalanceSolution.Pressure] Index: /issm/trunk-jpl/test/NightlyRun/test290.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test290.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test290.py (revision 23793) @@ -10,21 +10,19 @@ from ContourToMesh import * -md=triangle(model(),'../Exp/Square.exp',150000.) -md=setmask(md,'all','') -md=parameterize(md,'../Par/SquareShelf.py') -md.extrude(3,2.) -md=setflowequation(md,'FS','all') -md.flowequation.fe_FS='TaylorHood' -md.cluster=generic('name',gethostname(),'np',3) -md=solve(md,'Stressbalance') +md = triangle(model(), '../Exp/Square.exp', 150000.) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelf.py') +md.extrude(3, 2.) +md = setflowequation(md, 'FS', 'all') +md.flowequation.fe_FS = 'TaylorHood' +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'Stressbalance') #Fields and tolerances to track changes -field_names =['Vx', 'Vy', 'Vz', 'Vel','Pressure'] -field_tolerances=[5e-5,5e-5,8e-4,5e-4,2e-7] -field_values=[\ - md.results.StressbalanceSolution.Vx,\ - md.results.StressbalanceSolution.Vy,\ - md.results.StressbalanceSolution.Vz,\ - md.results.StressbalanceSolution.Vel,\ - md.results.StressbalanceSolution.Pressure,\ - ] +field_names = ['Vx', 'Vy', 'Vz', 'Vel', 'Pressure'] +field_tolerances = [5e-5, 5e-5, 8e-4, 5e-4, 2e-7] +field_values = [md.results.StressbalanceSolution.Vx, + md.results.StressbalanceSolution.Vy, + md.results.StressbalanceSolution.Vz, + md.results.StressbalanceSolution.Vel, + md.results.StressbalanceSolution.Pressure] Index: /issm/trunk-jpl/test/NightlyRun/test291.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test291.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test291.py (revision 23793) @@ -10,21 +10,19 @@ from ContourToMesh import * -md=triangle(model(),'../Exp/Square.exp',150000.) -md=setmask(md,'all','') -md=parameterize(md,'../Par/SquareShelf.py') -md.extrude(2,1.) -md=setflowequation(md,'FS','all') -md.flowequation.fe_FS='OneLayerP4z' -md.cluster=generic('name',gethostname(),'np',1) -md=solve(md,'Stressbalance') +md = triangle(model(), '../Exp/Square.exp', 150000.) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelf.py') +md.extrude(2, 1.) +md = setflowequation(md, 'FS', 'all') +md.flowequation.fe_FS = 'OneLayerP4z' +md.cluster = generic('name', gethostname(), 'np', 1) +md = solve(md, 'Stressbalance') #Fields and tolerances to track changes -field_names =['Vx', 'Vy', 'Vz', 'Vel','Pressure'] -field_tolerances=[5e-5,5e-5,8e-5,5e-5,1e-7] -field_values=[\ - md.results.StressbalanceSolution.Vx,\ - md.results.StressbalanceSolution.Vy,\ - md.results.StressbalanceSolution.Vz,\ - md.results.StressbalanceSolution.Vel,\ - md.results.StressbalanceSolution.Pressure,\ - ] +field_names = ['Vx', 'Vy', 'Vz', 'Vel', 'Pressure'] +field_tolerances = [5e-5, 5e-5, 8e-5, 5e-5, 1e-7] +field_values = [md.results.StressbalanceSolution.Vx, + md.results.StressbalanceSolution.Vy, + md.results.StressbalanceSolution.Vz, + md.results.StressbalanceSolution.Vel, + md.results.StressbalanceSolution.Pressure] Index: /issm/trunk-jpl/test/NightlyRun/test292.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test292.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test292.py (revision 23793) @@ -12,41 +12,41 @@ from linearbasalforcings import linearbasalforcings -md=triangle(model(),'../Exp/Square.exp',150000) -md=setmask(md,'all','') -md=parameterize(md,'../Par/SquareShelf.py') -md=setflowequation(md,'SSA','all') -md.cluster=generic('name',gethostname(),'np',3) -md.basalforcings=linearbasalforcings(md.basalforcings) -md.basalforcings.deepwater_melting_rate = np.array([[50.,100.],[0.,5.]]) -md.timestepping.interp_forcings=0 -md=solve(md,'Transient') +md = triangle(model(), '../Exp/Square.exp', 150000) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelf.py') +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) +md.basalforcings = linearbasalforcings(md.basalforcings) +md.basalforcings.deepwater_melting_rate = np.array([[50., 100.], [0., 5.]]) +md.timestepping.interp_forcings = 0 +md = solve(md, 'Transient') # Fields and tolerances to track changes -field_names =['Vx1','Vy1','Vel1','Pressure1','Base1','Surface1','Thickness1', - 'Vx2','Vy2','Vel2','Pressure2','Base2','Surface2','Thickness2', - 'Vx3','Vy3','Vel3','Pressure3','Base3','Surface3','Thickness3'] -field_tolerances=[1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13, - 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13, - 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13] -field_values=[md.results.TransientSolution[0].Vx, - md.results.TransientSolution[0].Vy, - md.results.TransientSolution[0].Vel, - md.results.TransientSolution[0].Pressure, - md.results.TransientSolution[0].Base, - md.results.TransientSolution[0].Surface, - md.results.TransientSolution[0].Thickness, - md.results.TransientSolution[1].Vx, - md.results.TransientSolution[1].Vy, - md.results.TransientSolution[1].Vel, - md.results.TransientSolution[1].Pressure, - md.results.TransientSolution[1].Base, - md.results.TransientSolution[1].Surface, - md.results.TransientSolution[1].Thickness, - md.results.TransientSolution[2].Vx, - md.results.TransientSolution[2].Vy, - md.results.TransientSolution[2].Vel, - md.results.TransientSolution[2].Pressure, - md.results.TransientSolution[2].Base, - md.results.TransientSolution[2].Surface, - md.results.TransientSolution[2].Thickness] +field_names = ['Vx1', 'Vy1', 'Vel1', 'Pressure1', 'Base1', 'Surface1', 'Thickness1', + 'Vx2', 'Vy2', 'Vel2', 'Pressure2', 'Base2', 'Surface2', 'Thickness2', + 'Vx3', 'Vy3', 'Vel3', 'Pressure3', 'Base3', 'Surface3', 'Thickness3'] +field_tolerances = [1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, + 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, + 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13] +field_values = [md.results.TransientSolution[0].Vx, + md.results.TransientSolution[0].Vy, + md.results.TransientSolution[0].Vel, + md.results.TransientSolution[0].Pressure, + md.results.TransientSolution[0].Base, + md.results.TransientSolution[0].Surface, + md.results.TransientSolution[0].Thickness, + md.results.TransientSolution[1].Vx, + md.results.TransientSolution[1].Vy, + md.results.TransientSolution[1].Vel, + md.results.TransientSolution[1].Pressure, + md.results.TransientSolution[1].Base, + md.results.TransientSolution[1].Surface, + md.results.TransientSolution[1].Thickness, + md.results.TransientSolution[2].Vx, + md.results.TransientSolution[2].Vy, + md.results.TransientSolution[2].Vel, + md.results.TransientSolution[2].Pressure, + md.results.TransientSolution[2].Base, + md.results.TransientSolution[2].Surface, + md.results.TransientSolution[2].Thickness] Index: /issm/trunk-jpl/test/NightlyRun/test293.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test293.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test293.py (revision 23793) @@ -10,9 +10,9 @@ from mismipbasalforcings import * -md = triangle(model(),'../Exp/Square.exp',150000.) -md = setmask(md,'all','') -md = parameterize(md,'../Par/SquareShelf.py') -md = setflowequation(md,'SSA','all') -md.cluster = generic('name',gethostname(),'np',3) +md = triangle(model(), '../Exp/Square.exp', 150000.) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelf.py') +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) md.constants.yts = 365.2422 * 24. * 3600. md.basalforcings = mismipbasalforcings() @@ -20,40 +20,39 @@ md.transient.isgroundingline = 1 md.geometry.bed = min(md.geometry.base) * np.ones(md.mesh.numberofvertices,) -md.transient.requested_outputs = ['default','BasalforcingsFloatingiceMeltingRate'] +md.transient.requested_outputs = ['default', 'BasalforcingsFloatingiceMeltingRate'] -md = solve(md,'Transient') +md = solve(md, 'Transient') #Fields and tolerances to track changes -field_names =['Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','BasalforcingsFloatingiceMeltingRate1', - 'Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2','BasalforcingsFloatingiceMeltingRate2', - 'Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3','BasalforcingsFloatingiceMeltingRate3'] +field_names = ['Vx1', 'Vy1', 'Vel1', 'Pressure1', 'Bed1', 'Surface1', 'Thickness1', 'BasalforcingsFloatingiceMeltingRate1', + 'Vx2', 'Vy2', 'Vel2', 'Pressure2', 'Bed2', 'Surface2', 'Thickness2', 'BasalforcingsFloatingiceMeltingRate2', + 'Vx3', 'Vy3', 'Vel3', 'Pressure3', 'Bed3', 'Surface3', 'Thickness3', 'BasalforcingsFloatingiceMeltingRate3'] field_tolerances = [ - 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,2e-13, - 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,2e-13, - 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,2e-13] + 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 2e-13, + 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 2e-13, + 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 2e-13] field_values = [ - md.results.TransientSolution[0].Vx, - md.results.TransientSolution[0].Vy, - md.results.TransientSolution[0].Vel, - md.results.TransientSolution[0].Pressure, - md.results.TransientSolution[0].Base, - md.results.TransientSolution[0].Surface, - md.results.TransientSolution[0].Thickness, - md.results.TransientSolution[0].BasalforcingsFloatingiceMeltingRate, - md.results.TransientSolution[1].Vx, - md.results.TransientSolution[1].Vy, - md.results.TransientSolution[1].Vel, - md.results.TransientSolution[1].Pressure, - md.results.TransientSolution[1].Base, - md.results.TransientSolution[1].Surface, - md.results.TransientSolution[1].Thickness, - md.results.TransientSolution[1].BasalforcingsFloatingiceMeltingRate, - md.results.TransientSolution[2].Vx, - md.results.TransientSolution[2].Vy, - md.results.TransientSolution[2].Vel, - md.results.TransientSolution[2].Pressure, - md.results.TransientSolution[2].Base, - md.results.TransientSolution[2].Surface, - md.results.TransientSolution[2].Thickness, - md.results.TransientSolution[2].BasalforcingsFloatingiceMeltingRate, - ] + md.results.TransientSolution[0].Vx, + md.results.TransientSolution[0].Vy, + md.results.TransientSolution[0].Vel, + md.results.TransientSolution[0].Pressure, + md.results.TransientSolution[0].Base, + md.results.TransientSolution[0].Surface, + md.results.TransientSolution[0].Thickness, + md.results.TransientSolution[0].BasalforcingsFloatingiceMeltingRate, + md.results.TransientSolution[1].Vx, + md.results.TransientSolution[1].Vy, + md.results.TransientSolution[1].Vel, + md.results.TransientSolution[1].Pressure, + md.results.TransientSolution[1].Base, + md.results.TransientSolution[1].Surface, + md.results.TransientSolution[1].Thickness, + md.results.TransientSolution[1].BasalforcingsFloatingiceMeltingRate, + md.results.TransientSolution[2].Vx, + md.results.TransientSolution[2].Vy, + md.results.TransientSolution[2].Vel, + md.results.TransientSolution[2].Pressure, + md.results.TransientSolution[2].Base, + md.results.TransientSolution[2].Surface, + md.results.TransientSolution[2].Thickness, + md.results.TransientSolution[2].BasalforcingsFloatingiceMeltingRate] Index: /issm/trunk-jpl/test/NightlyRun/test3001.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test3001.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test3001.py (revision 23793) @@ -10,26 +10,24 @@ -md=triangle(model(),'../Exp/Square.exp',50000.) -md=setmask(md,'all','') -md=parameterize(md,'../Par/SquareShelfConstrained.py') -md=setflowequation(md,'SSA','all') -md.cluster=generic('name',gethostname(),'np',1) -md.stressbalance.requested_outputs=['default','DeviatoricStressxx','DeviatoricStressyy','DeviatoricStressxy'] -md.autodiff.isautodiff=True -md.toolkits.DefaultAnalysis=issmgslsolver() -md=solve(md,'Stressbalance') +md = triangle(model(), '../Exp/Square.exp', 50000.) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelfConstrained.py') +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 1) +md.stressbalance.requested_outputs = ['default', 'DeviatoricStressxx', 'DeviatoricStressyy', 'DeviatoricStressxy'] +md.autodiff.isautodiff = True +md.toolkits.DefaultAnalysis = issmgslsolver() +md = solve(md, 'Stressbalance') #Fields and tolerances to track changes -field_names =['Vx','Vy','Vel','Pressure',\ - 'DeviatoricStressxx','DeviatoricStressyy','DeviatoricStressxy'] -field_tolerances=[1e-13,1e-13,1e-13,1e-13,\ - 1e-13,1e-13,1e-13] -field_values=[\ - md.results.StressbalanceSolution.Vx,\ - md.results.StressbalanceSolution.Vy,\ - md.results.StressbalanceSolution.Vel,\ - md.results.StressbalanceSolution.Pressure,\ - md.results.StressbalanceSolution.DeviatoricStressxx,\ - md.results.StressbalanceSolution.DeviatoricStressyy,\ - md.results.StressbalanceSolution.DeviatoricStressxy,\ - ] +field_names = ['Vx', 'Vy', 'Vel', 'Pressure', + 'DeviatoricStressxx', 'DeviatoricStressyy', 'DeviatoricStressxy'] +field_tolerances = [1e-13, 1e-13, 1e-13, 1e-13, + 1e-13, 1e-13, 1e-13] +field_values = [md.results.StressbalanceSolution.Vx, + md.results.StressbalanceSolution.Vy, + md.results.StressbalanceSolution.Vel, + md.results.StressbalanceSolution.Pressure, + md.results.StressbalanceSolution.DeviatoricStressxx, + md.results.StressbalanceSolution.DeviatoricStressyy, + md.results.StressbalanceSolution.DeviatoricStressxy] Index: /issm/trunk-jpl/test/NightlyRun/test3002.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test3002.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test3002.py (revision 23793) @@ -10,22 +10,20 @@ -md=triangle(model(),'../Exp/Square.exp',180000.) -md=setmask(md,'all','') -md=parameterize(md,'../Par/SquareShelfConstrained.py') -md.extrude(3,2.) -md=setflowequation(md,'SSA','all') -md.cluster=generic('name',gethostname(),'np',1) -md.autodiff.isautodiff=True -md.toolkits.DefaultAnalysis=issmgslsolver() -md=solve(md,'Stressbalance') +md = triangle(model(), '../Exp/Square.exp', 180000.) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelfConstrained.py') +md.extrude(3, 2.) +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 1) +md.autodiff.isautodiff = True +md.toolkits.DefaultAnalysis = issmgslsolver() +md = solve(md, 'Stressbalance') #Fields and tolerances to track changes -field_names =['Vx','Vy','Vz','Vel','Pressure'] -field_tolerances=[1e-13,1e-13,1e-13,1e-13,1e-13] -field_values=[\ - md.results.StressbalanceSolution.Vx,\ - md.results.StressbalanceSolution.Vy,\ - md.results.StressbalanceSolution.Vz,\ - md.results.StressbalanceSolution.Vel,\ - md.results.StressbalanceSolution.Pressure,\ - ] +field_names = ['Vx', 'Vy', 'Vz', 'Vel', 'Pressure'] +field_tolerances = [1e-13, 1e-13, 1e-13, 1e-13, 1e-13] +field_values = [md.results.StressbalanceSolution.Vx, + md.results.StressbalanceSolution.Vy, + md.results.StressbalanceSolution.Vz, + md.results.StressbalanceSolution.Vel, + md.results.StressbalanceSolution.Pressure] Index: /issm/trunk-jpl/test/NightlyRun/test3003.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test3003.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test3003.py (revision 23793) @@ -10,31 +10,29 @@ -md=triangle(model(),'../Exp/Square.exp',180000.) -md=setmask(md,'all','') -md=parameterize(md,'../Par/SquareShelfConstrained.py') -md.extrude(3,2.) -md=setflowequation(md,'HO','all') -md.cluster=generic('name',gethostname(),'np',1) -md.stressbalance.requested_outputs=['default','StressTensorxx','StressTensoryy','StressTensorzz','StressTensorxy','StressTensorxz','StressTensoryz'] -md.autodiff.isautodiff=True -md.toolkits.DefaultAnalysis=issmgslsolver() -md=solve(md,'Stressbalance') +md = triangle(model(), '../Exp/Square.exp', 180000.) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelfConstrained.py') +md.extrude(3, 2.) +md = setflowequation(md, 'HO', 'all') +md.cluster = generic('name', gethostname(), 'np', 1) +md.stressbalance.requested_outputs = ['default', 'StressTensorxx', 'StressTensoryy', 'StressTensorzz', 'StressTensorxy', 'StressTensorxz', 'StressTensoryz'] +md.autodiff.isautodiff = True +md.toolkits.DefaultAnalysis = issmgslsolver() +md = solve(md, 'Stressbalance') #Fields and tolerances to track changes -field_names =['Vx','Vy','Vz','Vel','Pressure',\ - 'StressTensorxx','StressTensoryy','StressTensorzz','StressTensorxy','StressTensorxz','StressTensoryz'] -field_tolerances=[1e-09,1e-09,1e-09,1e-09,1e-09,\ - 1e-09,1e-09,1e-09,1e-09,1e-09,2e-09] -field_values=[\ - md.results.StressbalanceSolution.Vx,\ - md.results.StressbalanceSolution.Vy,\ - md.results.StressbalanceSolution.Vz,\ - md.results.StressbalanceSolution.Vel,\ - md.results.StressbalanceSolution.Pressure,\ - md.results.StressbalanceSolution.StressTensorxx,\ - md.results.StressbalanceSolution.StressTensoryy,\ - md.results.StressbalanceSolution.StressTensorzz,\ - md.results.StressbalanceSolution.StressTensorxy,\ - md.results.StressbalanceSolution.StressTensorxz,\ - md.results.StressbalanceSolution.StressTensoryz,\ - ] +field_names = ['Vx', 'Vy', 'Vz', 'Vel', 'Pressure', + 'StressTensorxx', 'StressTensoryy', 'StressTensorzz', 'StressTensorxy', 'StressTensorxz', 'StressTensoryz'] +field_tolerances = [1e-09, 1e-09, 1e-09, 1e-09, 1e-09, + 1e-09, 1e-09, 1e-09, 1e-09, 1e-09, 2e-09] +field_values = [md.results.StressbalanceSolution.Vx, + md.results.StressbalanceSolution.Vy, + md.results.StressbalanceSolution.Vz, + md.results.StressbalanceSolution.Vel, + md.results.StressbalanceSolution.Pressure, + md.results.StressbalanceSolution.StressTensorxx, + md.results.StressbalanceSolution.StressTensoryy, + md.results.StressbalanceSolution.StressTensorzz, + md.results.StressbalanceSolution.StressTensorxy, + md.results.StressbalanceSolution.StressTensorxz, + md.results.StressbalanceSolution.StressTensoryz] Index: /issm/trunk-jpl/test/NightlyRun/test3004.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test3004.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test3004.py (revision 23793) @@ -10,22 +10,20 @@ -md=triangle(model(),'../Exp/Square.exp',180000.) -md=setmask(md,'all','') -md=parameterize(md,'../Par/SquareShelfConstrained.py') -md.extrude(3,2.) -md=setflowequation(md,'FS','all') -md.cluster=generic('name',gethostname(),'np',1) -md.autodiff.isautodiff=True -md.toolkits.DefaultAnalysis=issmgslsolver() -md=solve(md,'Stressbalance') +md = triangle(model(), '../Exp/Square.exp', 180000.) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelfConstrained.py') +md.extrude(3, 2.) +md = setflowequation(md, 'FS', 'all') +md.cluster = generic('name', gethostname(), 'np', 1) +md.autodiff.isautodiff = True +md.toolkits.DefaultAnalysis = issmgslsolver() +md = solve(md, 'Stressbalance') #Fields and tolerances to track changes -field_names =['Vx','Vy','Vz','Vel','Pressure'] -field_tolerances=[1e-08,1e-08,3e-07,1e-08,1e-08] -field_values=[\ - md.results.StressbalanceSolution.Vx,\ - md.results.StressbalanceSolution.Vy,\ - md.results.StressbalanceSolution.Vz,\ - md.results.StressbalanceSolution.Vel,\ - md.results.StressbalanceSolution.Pressure,\ - ] +field_names = ['Vx', 'Vy', 'Vz', 'Vel', 'Pressure'] +field_tolerances = [1e-08, 1e-08, 3e-07, 1e-08, 1e-08] +field_values = [md.results.StressbalanceSolution.Vx, + md.results.StressbalanceSolution.Vy, + md.results.StressbalanceSolution.Vz, + md.results.StressbalanceSolution.Vel, + md.results.StressbalanceSolution.Pressure] Index: /issm/trunk-jpl/test/NightlyRun/test3005.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test3005.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test3005.py (revision 23793) @@ -10,17 +10,15 @@ -md=triangle(model(),'../Exp/Square.exp',150000.) -md=setmask(md,'all','') -md=parameterize(md,'../Par/SquareShelfConstrained.py') -md=setflowequation(md,'SSA','all') -md.cluster=generic('name',gethostname(),'np',1) -md.autodiff.isautodiff=True -md.toolkits.DefaultAnalysis=issmgslsolver() -md=solve(md,'Masstransport') +md = triangle(model(), '../Exp/Square.exp', 150000.) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelfConstrained.py') +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 1) +md.autodiff.isautodiff = True +md.toolkits.DefaultAnalysis = issmgslsolver() +md = solve(md, 'Masstransport') #Fields and tolerances to track changes -field_names =['Thickness'] -field_tolerances=[1e-13] -field_values=[\ - md.results.MasstransportSolution.Thickness,\ - ] +field_names = ['Thickness'] +field_tolerances = [1e-13] +field_values = [md.results.MasstransportSolution.Thickness] Index: /issm/trunk-jpl/test/NightlyRun/test3006.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test3006.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test3006.py (revision 23793) @@ -11,20 +11,18 @@ -md=triangle(model(),'../Exp/Square.exp',150000.) -md=meshconvert(md) -md=setmask(md,'all','') -md=parameterize(md,'../Par/SquareShelfConstrained.py') -md=setflowequation(md,'SSA','all') -md.cluster=generic('name',gethostname(),'np',1) -md.masstransport.stabilization=3 -md.masstransport.spcthickness=md.geometry.thickness -md.autodiff.isautodiff=True -md.toolkits.DefaultAnalysis=issmgslsolver() -md=solve(md,'Masstransport') +md = triangle(model(), '../Exp/Square.exp', 150000.) +md = meshconvert(md) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelfConstrained.py') +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 1) +md.masstransport.stabilization = 3 +md.masstransport.spcthickness = md.geometry.thickness +md.autodiff.isautodiff = True +md.toolkits.DefaultAnalysis = issmgslsolver() +md = solve(md, 'Masstransport') #Fields and tolerances to track changes -field_names =['Thickness'] -field_tolerances=[1e-13] -field_values=[\ - md.results.MasstransportSolution.Thickness,\ - ] +field_names = ['Thickness'] +field_tolerances = [1e-13] +field_values = [md.results.MasstransportSolution.Thickness] Index: /issm/trunk-jpl/test/NightlyRun/test3007.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test3007.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test3007.py (revision 23793) @@ -10,18 +10,16 @@ -md=triangle(model(),'../Exp/Square.exp',150000.) -md=setmask(md,'all','') -md=parameterize(md,'../Par/SquareShelfConstrained.py') -md=setflowequation(md,'SSA','all') -md.extrude(5,3.) -md.cluster=generic('name',gethostname(),'np',1) -md.autodiff.isautodiff=True -md.toolkits.DefaultAnalysis=issmgslsolver() -md=solve(md,'Masstransport') +md = triangle(model(), '../Exp/Square.exp', 150000.) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelfConstrained.py') +md = setflowequation(md, 'SSA', 'all') +md.extrude(5, 3.) +md.cluster = generic('name', gethostname(), 'np', 1) +md.autodiff.isautodiff = True +md.toolkits.DefaultAnalysis = issmgslsolver() +md = solve(md, 'Masstransport') #Fields and tolerances to track changes -field_names =['Thickness'] -field_tolerances=[1e-13] -field_values=[\ - md.results.MasstransportSolution.Thickness,\ - ] +field_names = ['Thickness'] +field_tolerances = [1e-13] +field_values = [md.results.MasstransportSolution.Thickness] Index: /issm/trunk-jpl/test/NightlyRun/test3008.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test3008.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test3008.py (revision 23793) @@ -10,20 +10,18 @@ -md=triangle(model(),'../Exp/Square.exp',180000.) -md=setmask(md,'all','') -md=parameterize(md,'../Par/SquareShelfConstrained.py') -md.extrude(3,1.) -md=setflowequation(md,'SSA','all') -md.timestepping.time_step=0 -md.cluster=generic('name',gethostname(),'np',1) -md.autodiff.isautodiff=True -md.toolkits.DefaultAnalysis=issmgslsolver() -md=solve(md,'Thermal') +md = triangle(model(), '../Exp/Square.exp', 180000.) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelfConstrained.py') +md.extrude(3, 1.) +md = setflowequation(md, 'SSA', 'all') +md.timestepping.time_step = 0 +md.cluster = generic('name', gethostname(), 'np', 1) +md.autodiff.isautodiff = True +md.toolkits.DefaultAnalysis = issmgslsolver() +md = solve(md, 'Thermal') #Fields and tolerances to track changes -field_names =['Temperature','BasalforcingsGroundediceMeltingRate'] -field_tolerances=[1e-13,1e-5] -field_values=[\ - md.results.ThermalSolution.Temperature,\ - md.results.ThermalSolution.BasalforcingsGroundediceMeltingRate,\ - ] +field_names = ['Temperature', 'BasalforcingsGroundediceMeltingRate'] +field_tolerances = [1e-13, 1e-5] +field_values = [md.results.ThermalSolution.Temperature, + md.results.ThermalSolution.BasalforcingsGroundediceMeltingRate] Index: /issm/trunk-jpl/test/NightlyRun/test3009.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test3009.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test3009.py (revision 23793) @@ -10,24 +10,22 @@ -md=triangle(model(),'../Exp/Square.exp',180000.) -md=setmask(md,'all','') -md=parameterize(md,'../Par/SquareShelfConstrained.py') -md.extrude(3,1.) -md=setflowequation(md,'SSA','all') -md.cluster=generic('name',gethostname(),'np',1) -md.transient.isstressbalance=False -md.transient.ismasstransport=False -md.transient.issmb=True -md.transient.isthermal=True -md.transient.isgroundingline=False -md.autodiff.isautodiff=True -md.toolkits.DefaultAnalysis=issmgslsolver() -md=solve(md,'Transient') +md = triangle(model(), '../Exp/Square.exp', 180000.) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelfConstrained.py') +md.extrude(3, 1.) +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 1) +md.transient.isstressbalance = False +md.transient.ismasstransport = False +md.transient.issmb = True +md.transient.isthermal = True +md.transient.isgroundingline = False +md.autodiff.isautodiff = True +md.toolkits.DefaultAnalysis = issmgslsolver() +md = solve(md, 'Transient') #Fields and tolerances to track changes -field_names =['Temperature','BasalforcingsGroundediceMeltingRate'] -field_tolerances=[1e-13,1e-13] -field_values=[\ - md.results.TransientSolution[0].Temperature,\ - md.results.TransientSolution[0].BasalforcingsGroundediceMeltingRate,\ - ] +field_names = ['Temperature', 'BasalforcingsGroundediceMeltingRate'] +field_tolerances = [1e-13, 1e-13] +field_values = [md.results.TransientSolution[0].Temperature, + md.results.TransientSolution[0].BasalforcingsGroundediceMeltingRate] Index: /issm/trunk-jpl/test/NightlyRun/test301.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test301.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test301.py (revision 23793) @@ -9,16 +9,16 @@ -md=triangle(model(),'../Exp/Square.exp',150000.) -md=setmask(md,'','') -md=parameterize(md,'../Par/SquareSheetConstrained.py') -md=setflowequation(md,'SSA','all') -md.cluster=generic('name',gethostname(),'np',3) -md=solve(md,'Stressbalance') +md = triangle(model(), '../Exp/Square.exp', 150000.) +md = setmask(md, '', '') +md = parameterize(md, '../Par/SquareSheetConstrained.py') +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'Stressbalance') #Fields and tolerances to track changes -field_names =['Vx','Vy','Vel','Pressure'] -field_tolerances=[1e-13,1e-13,1e-13,1e-13] -field_values=[md.results.StressbalanceSolution.Vx, - md.results.StressbalanceSolution.Vy, - md.results.StressbalanceSolution.Vel, - md.results.StressbalanceSolution.Pressure] +field_names = ['Vx', 'Vy', 'Vel', 'Pressure'] +field_tolerances = [1e-13, 1e-13, 1e-13, 1e-13] +field_values = [md.results.StressbalanceSolution.Vx, + md.results.StressbalanceSolution.Vy, + md.results.StressbalanceSolution.Vel, + md.results.StressbalanceSolution.Pressure] Index: /issm/trunk-jpl/test/NightlyRun/test3010.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test3010.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test3010.py (revision 23793) @@ -10,44 +10,42 @@ -md=triangle(model(),'../Exp/Square.exp',150000.) -md=setmask(md,'all','') -md=parameterize(md,'../Par/SquareShelfConstrained.py') -md=setflowequation(md,'SSA','all') -md.cluster=generic('name',gethostname(),'np',1) -md.transient.requested_outputs=['IceVolume'] +md = triangle(model(), '../Exp/Square.exp', 150000.) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelfConstrained.py') +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 1) +md.transient.requested_outputs = ['IceVolume'] -md.autodiff.isautodiff=True -md.toolkits.DefaultAnalysis=issmgslsolver() -md=solve(md,'Transient') +md.autodiff.isautodiff = True +md.toolkits.DefaultAnalysis = issmgslsolver() +md = solve(md, 'Transient') #Fields and tolerances to track changes -field_names =['Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Volume1','Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Volume2','Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Volume3'] -field_tolerances=[1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,\ - 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,\ - 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13] -field_values=[\ - md.results.TransientSolution[0].Vx,\ - md.results.TransientSolution[0].Vy,\ - md.results.TransientSolution[0].Vel,\ - md.results.TransientSolution[0].Pressure,\ - md.results.TransientSolution[0].Base,\ - md.results.TransientSolution[0].Surface,\ - md.results.TransientSolution[0].Thickness,\ - md.results.TransientSolution[0].IceVolume,\ - md.results.TransientSolution[1].Vx,\ - md.results.TransientSolution[1].Vy,\ - md.results.TransientSolution[1].Vel,\ - md.results.TransientSolution[1].Pressure,\ - md.results.TransientSolution[1].Base,\ - md.results.TransientSolution[1].Surface,\ - md.results.TransientSolution[1].Thickness,\ - md.results.TransientSolution[1].IceVolume,\ - md.results.TransientSolution[2].Vx,\ - md.results.TransientSolution[2].Vy,\ - md.results.TransientSolution[2].Vel,\ - md.results.TransientSolution[2].Pressure,\ - md.results.TransientSolution[2].Base,\ - md.results.TransientSolution[2].Surface,\ - md.results.TransientSolution[2].Thickness,\ - md.results.TransientSolution[2].IceVolume,\ - ] +field_names = ['Vx1', 'Vy1', 'Vel1', 'Pressure1', 'Bed1', 'Surface1', 'Thickness1', 'Volume1', 'Vx2', 'Vy2', 'Vel2', 'Pressure2', 'Bed2', 'Surface2', 'Thickness2', 'Volume2', 'Vx3', 'Vy3', 'Vel3', 'Pressure3', 'Bed3', 'Surface3', 'Thickness3', 'Volume3'] +field_tolerances = [1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, + 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, + 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13] +field_values = [md.results.TransientSolution[0].Vx, + md.results.TransientSolution[0].Vy, + md.results.TransientSolution[0].Vel, + md.results.TransientSolution[0].Pressure, + md.results.TransientSolution[0].Base, + md.results.TransientSolution[0].Surface, + md.results.TransientSolution[0].Thickness, + md.results.TransientSolution[0].IceVolume, + md.results.TransientSolution[1].Vx, + md.results.TransientSolution[1].Vy, + md.results.TransientSolution[1].Vel, + md.results.TransientSolution[1].Pressure, + md.results.TransientSolution[1].Base, + md.results.TransientSolution[1].Surface, + md.results.TransientSolution[1].Thickness, + md.results.TransientSolution[1].IceVolume, + md.results.TransientSolution[2].Vx, + md.results.TransientSolution[2].Vy, + md.results.TransientSolution[2].Vel, + md.results.TransientSolution[2].Pressure, + md.results.TransientSolution[2].Base, + md.results.TransientSolution[2].Surface, + md.results.TransientSolution[2].Thickness, + md.results.TransientSolution[2].IceVolume] Index: /issm/trunk-jpl/test/NightlyRun/test3015.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test3015.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test3015.py (revision 23793) @@ -1,4 +1,3 @@ #Test Name: SquareShelfConstrainedMasstransp2dAdolcForwardDifference -import numpy as np import copy from model import * @@ -14,82 +13,77 @@ -#This test runs test3005 with autodiff on, and checks that +#This test runs test3005 with autodiff on, and checks that #the value of the scalar forward difference match a step-wise differential #First configure -md=triangle(model(),'../Exp/Square.exp',50000.) -md=setmask(md,'all','') -md=parameterize(md,'../Par/SquareShelfConstrained.py') -md=setflowequation(md,'SSA','all') -md.cluster=generic('name',gethostname(),'np',1) -md.masstransport.requested_outputs=['IceVolume'] -md.verbose=verbose('autodiff',True) +md = triangle(model(), '../Exp/Square.exp', 50000.) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelfConstrained.py') +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 1) +md.masstransport.requested_outputs = ['IceVolume'] +md.verbose = verbose('autodiff', True) #setup autodiff parameters -index=1 #this is the scalar component we are checking against -md.autodiff.independents=[\ - independent('name','md.geometry.thickness','type','vertex','nods',md.mesh.numberofvertices,'fos_forward_index',index) - ] - -md.autodiff.dependents=[\ - dependent('name','IceVolume','type','scalar')\ - ] -md.autodiff.driver='fos_forward' +index = 1 #this is the scalar component we are checking against +md.autodiff.independents = [independent('name', 'md.geometry.thickness', 'type', 'vertex', 'nods', md.mesh.numberofvertices, 'fos_forward_index', index)] +md.autodiff.dependents = [dependent('name', 'IceVolume', 'type', 'scalar')] +md.autodiff.driver = 'fos_forward' #PYTHON: indices start at 0, make sure to offset index -index=index-1 +index = index - 1 #parameters for the step-wise derivative -delta=0.001 -h1=md.geometry.thickness[index] -h0=h1*(1.-delta) -h2=h1*(1.+delta) -deltaH=(h2-h0) +delta = 0.001 +h1 = md.geometry.thickness[index] +h0 = h1 * (1. - delta) +h2 = h1 * (1. + delta) +deltaH = (h2 - h0) #save model -md2=copy.deepcopy(md) +md2 = copy.deepcopy(md) -#evaluate derivative by forward and backward stepping +#evaluate derivative by forward and backward stepping #forward -md=copy.deepcopy(md2) -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.surface=md.geometry.base+md.geometry.thickness -md=SetIceShelfBC(md) +md = copy.deepcopy(md2) +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.surface = md.geometry.base + md.geometry.thickness +md = SetIceShelfBC(md) -md=solve(md,'Masstransport') -V0=md.results.MasstransportSolution.IceVolume +md = solve(md, 'Masstransport') +V0 = md.results.MasstransportSolution.IceVolume #backward -md=copy.deepcopy(md2) -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.surface=md.geometry.base+md.geometry.thickness -md=SetIceShelfBC(md) +md = copy.deepcopy(md2) +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.surface = md.geometry.base + md.geometry.thickness +md = SetIceShelfBC(md) -md=solve(md,'Masstransport') -V2=md.results.MasstransportSolution.IceVolume +md = solve(md, 'Masstransport') +V2 = md.results.MasstransportSolution.IceVolume #compute resulting derivative -dVdh_an=(V2-V0)/deltaH +dVdh_an = (V2 - V0) / deltaH -#evaluate derivative using ADOLC -md=md2 -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.surface=md.geometry.base+md.geometry.thickness -md=SetIceShelfBC(md) +#evaluate derivative using ADOLC +md = md2 +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.surface = md.geometry.base + md.geometry.thickness +md = SetIceShelfBC(md) -md=solve(md,'Masstransport') +md = solve(md, 'Masstransport') #retrieve directly -dVdh_ad=md.results.MasstransportSolution.AutodiffJacobian +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 -field_names =['dV/dh'] -field_tolerances=[1e-8] -field_values=[dVdh_ad] +field_names = ['dV/dh'] +field_tolerances = [1e-8] +field_values = [dVdh_ad] Index: /issm/trunk-jpl/test/NightlyRun/test3019.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test3019.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test3019.py (revision 23793) @@ -13,36 +13,36 @@ #test reverse scalar vs forward vectorial drivers in ADOLC, using the test3009 setup, equivalent to test109 setup. -md=triangle(model(),'../Exp/Square.exp',100000.) -md=setmask(md,'all','') -md=parameterize(md,'../Par/SquareShelfConstrained.py') -md=setflowequation(md,'SSA','all') -md.cluster=generic('name',gethostname(),'np',1) -#md.toolkits.DefaultAnalysis=issmgslsolver() +md = triangle(model(), '../Exp/Square.exp', 100000.) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelfConstrained.py') +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 1) +#md.toolkits.DefaultAnalysis = issmgslsolver() -md.autodiff.isautodiff=True -md.verbose.autodiff=True +md.autodiff.isautodiff = True +md.verbose.autodiff = True -#first run scalar reverse mode: -md.autodiff.independents=[independent('name','md.geometry.thickness','type','vertex','nods',md.mesh.numberofvertices)] -md.autodiff.dependents=[dependent('name','MaxVel','type','scalar','fos_reverse_index',1)] -md.autodiff.driver='fos_reverse' +#first run scalar reverse mode: +md.autodiff.independents = [independent('name', 'md.geometry.thickness', 'type', 'vertex', 'nods', md.mesh.numberofvertices)] +md.autodiff.dependents = [dependent('name', 'MaxVel', 'type', 'scalar', 'fos_reverse_index', 1)] +md.autodiff.driver = 'fos_reverse' -md=solve(md,'Transient') +md = solve(md, 'Transient') -#recover jacobian: -jac_reverse=md.results.TransientSolution[0].AutodiffJacobian +#recover jacobian: +jac_reverse = md.results.TransientSolution[0].AutodiffJacobian #now run vectorial forward mode -md.autodiff.independents=[independent('name','md.geometry.thickness','type','vertex','nods',md.mesh.numberofvertices,'fov_forward_indices',np.arange(1,md.mesh.numberofvertices+1))] -md.autodiff.dependents=[dependent('name','MaxVel','type','scalar')] -md.autodiff.driver='fov_forward' +md.autodiff.independents = [independent('name', 'md.geometry.thickness', 'type', 'vertex', 'nods', md.mesh.numberofvertices, 'fov_forward_indices', np.arange(1, md.mesh.numberofvertices + 1))] +md.autodiff.dependents = [dependent('name', 'MaxVel', 'type', 'scalar')] +md.autodiff.driver = 'fov_forward' -md=solve(md,'Transient') +md = solve(md, 'Transient') -#recover jacobian: -jac_forward=md.results.TransientSolution[0].AutodiffJacobian +#recover jacobian: +jac_forward = md.results.TransientSolution[0].AutodiffJacobian #Fields and tolerances to track changes -field_names =['Jac Forward','Jac Reverse','Jac Forward - Reverse'] -field_tolerances=[1e-8,1e-8,5e-6] -field_values=[jac_forward,jac_reverse,jac_forward-jac_reverse] +field_names = ['Jac Forward', 'Jac Reverse', 'Jac Forward - Reverse'] +field_tolerances = [1e-8, 1e-8, 5e-6] +field_values = [jac_forward, jac_reverse, jac_forward - jac_reverse] Index: /issm/trunk-jpl/test/NightlyRun/test302.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test302.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test302.py (revision 23793) @@ -9,18 +9,16 @@ -md=triangle(model(),'../Exp/Square.exp',150000.) -md=setmask(md,'','') -md=parameterize(md,'../Par/SquareSheetConstrained.py') -md=setflowequation(md,'SIA','all') -md.cluster=generic('name',gethostname(),'np',3) -md=solve(md,'Stressbalance') +md = triangle(model(), '../Exp/Square.exp', 150000.) +md = setmask(md, '', '') +md = parameterize(md, '../Par/SquareSheetConstrained.py') +md = setflowequation(md, 'SIA', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'Stressbalance') #Fields and tolerances to track changes -field_names =['Vx','Vy','Vel','Pressure'] -field_tolerances=[1e-13,1e-13,1e-13,1e-13] -field_values=[\ - md.results.StressbalanceSolution.Vx,\ - md.results.StressbalanceSolution.Vy,\ - md.results.StressbalanceSolution.Vel,\ - md.results.StressbalanceSolution.Pressure,\ - ] +field_names = ['Vx', 'Vy', 'Vel', 'Pressure'] +field_tolerances = [1e-13, 1e-13, 1e-13, 1e-13] +field_values = [md.results.StressbalanceSolution.Vx, + md.results.StressbalanceSolution.Vy, + md.results.StressbalanceSolution.Vel, + md.results.StressbalanceSolution.Pressure] Index: /issm/trunk-jpl/test/NightlyRun/test3020.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test3020.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test3020.py (revision 23793) @@ -1,4 +1,3 @@ #Test Name: SquareShelfConstrainedTranAdolcReverseVsForward -import numpy as np import copy from model import * @@ -14,89 +13,84 @@ -#This test runs test3020 with autodiff on, and checks that +#This test runs test3020 with autodiff on, and checks that #the value of the scalar forward difference match a step-wise differential #First configure -md=triangle(model(),'../Exp/Square.exp',150000.) -md=setmask(md,'all','') -md=parameterize(md,'../Par/SquareShelfConstrained.py') -md=setflowequation(md,'SSA','all') -md.cluster=generic('name',gethostname(),'np',1) -md.transient.requested_outputs=['IceVolume','MaxVel'] -md.verbose=verbose('autodiff',True) -md.stressbalance.restol=0.000001 +md = triangle(model(), '../Exp/Square.exp', 150000.) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelfConstrained.py') +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 1) +md.transient.requested_outputs = ['IceVolume', 'MaxVel'] +md.verbose = verbose('autodiff', True) +md.stressbalance.restol = 0.000001 #setup autodiff parameters -index=1 #this is the scalar component we are checking against -md.autodiff.independents=[\ - independent('name','md.geometry.thickness','type','vertex','nods',md.mesh.numberofvertices,'fos_forward_index',index) - ] - -md.autodiff.dependents=[\ - dependent('name','IceVolume','type','scalar'),\ - dependent('name','MaxVel','type','scalar')\ - ] -md.autodiff.driver='fos_forward' +index = 1 #this is the scalar component we are checking against +md.autodiff.independents = [independent('name', 'md.geometry.thickness', 'type', 'vertex', 'nods', md.mesh.numberofvertices, 'fos_forward_index', index)] +md.autodiff.dependents = [dependent('name', 'IceVolume', 'type', 'scalar'), + dependent('name', 'MaxVel', 'type', 'scalar')] +md.autodiff.driver = 'fos_forward' #PYTHON: indices start at 0, make sure to offset index -index=index-1 +index = index - 1 #parameters for the step-wise derivative -delta=0.00001 -h1=md.geometry.thickness[index] -h0=h1*(1.-delta) -h2=h1*(1.+delta) -deltaH=(h2-h0) +delta = 0.00001 +h1 = md.geometry.thickness[index] +h0 = h1 * (1. - delta) +h2 = h1 * (1. + delta) +deltaH = (h2 - h0) #save model: -md2=copy.deepcopy(md) +md2 = copy.deepcopy(md) -#evaluate derivative by forward and backward stepping +#evaluate derivative by forward and backward stepping #forward -md=copy.deepcopy(md2) -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.surface=md.geometry.base+md.geometry.thickness -md=SetIceShelfBC(md) +md = copy.deepcopy(md2) +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.surface = md.geometry.base + md.geometry.thickness +md = SetIceShelfBC(md) -md=solve(md,'Transient') -V0=md.results.TransientSolution[-1].IceVolume -MaxV0=md.results.TransientSolution[-1].MaxVel +md = solve(md, 'Transient') +V0 = md.results.TransientSolution[-1].IceVolume +MaxV0 = md.results.TransientSolution[-1].MaxVel #backward -md=copy.deepcopy(md2) -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.surface=md.geometry.base+md.geometry.thickness -md=SetIceShelfBC(md) +md = copy.deepcopy(md2) +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.surface = md.geometry.base + md.geometry.thickness +md = SetIceShelfBC(md) -md=solve(md,'Transient') -V2=md.results.TransientSolution[-1].IceVolume -MaxV2=md.results.TransientSolution[-1].MaxVel +md = solve(md, 'Transient') +V2 = md.results.TransientSolution[-1].IceVolume +MaxV2 = md.results.TransientSolution[-1].MaxVel #compute resulting derivative -dVdh_an=(V2-V0)/deltaH -dMaxVdh_an=(MaxV2-MaxV0)/deltaH +dVdh_an = (V2 - V0) / deltaH +dMaxVdh_an = (MaxV2 - MaxV0) / deltaH -#evaluate derivative using ADOLC -md=copy.deepcopy(md2) -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.surface=md.geometry.base+md.geometry.thickness -md=SetIceShelfBC(md) +#evaluate derivative using ADOLC +md = copy.deepcopy(md2) +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.surface = md.geometry.base + md.geometry.thickness +md = SetIceShelfBC(md) -md=solve(md,'Transient') +md = solve(md, 'Transient') #retrieve directly -dVdh_ad=md.results.TransientSolution[0].AutodiffJacobian[0] -dMaxVdh_ad=md.results.TransientSolution[0].AutodiffJacobian[1] +dVdh_ad = md.results.TransientSolution[0].AutodiffJacobian[0] +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_tolerances=[1e-13,1e-13] -field_values=[dVdh_ad-dVdh_an,dMaxVdh_an-dMaxVdh_ad] +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/test303.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test303.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test303.py (revision 23793) @@ -9,18 +9,16 @@ -md=triangle(model(),'../Exp/Square.exp',150000.) -md=setmask(md,'','') -md=parameterize(md,'../Par/SquareSheetConstrained.py') -md=setflowequation(md,'SIA','../Exp/SquareHalfRight.exp','fill','SSA') -md.cluster=generic('name',gethostname(),'np',3) -md=solve(md,'Stressbalance') +md = triangle(model(), '../Exp/Square.exp', 150000.) +md = setmask(md, '', '') +md = parameterize(md, '../Par/SquareSheetConstrained.py') +md = setflowequation(md, 'SIA', '../Exp/SquareHalfRight.exp', 'fill', 'SSA') +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'Stressbalance') #Fields and tolerances to track changes -field_names =['Vx','Vy','Vel','Pressure'] -field_tolerances=[1e-13,1e-13,1e-13,1e-13] -field_values=[\ - md.results.StressbalanceSolution.Vx,\ - md.results.StressbalanceSolution.Vy,\ - md.results.StressbalanceSolution.Vel,\ - md.results.StressbalanceSolution.Pressure,\ - ] +field_names = ['Vx', 'Vy', 'Vel', 'Pressure'] +field_tolerances = [1e-13, 1e-13, 1e-13, 1e-13] +field_values = [md.results.StressbalanceSolution.Vx, + md.results.StressbalanceSolution.Vy, + md.results.StressbalanceSolution.Vel, + md.results.StressbalanceSolution.Pressure] Index: /issm/trunk-jpl/test/NightlyRun/test304.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test304.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test304.py (revision 23793) @@ -9,20 +9,18 @@ -md=triangle(model(),'../Exp/Square.exp',180000.) -md=setmask(md,'','') -md=parameterize(md,'../Par/SquareSheetConstrained.py') -md.extrude(3,2.) -md=setflowequation(md,'SSA','all') -md.cluster=generic('name',gethostname(),'np',3) -md=solve(md,'Stressbalance') +md = triangle(model(), '../Exp/Square.exp', 180000.) +md = setmask(md, '', '') +md = parameterize(md, '../Par/SquareSheetConstrained.py') +md.extrude(3, 2.) +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'Stressbalance') #Fields and tolerances to track changes -field_names =['Vx','Vy','Vz','Vel','Pressure'] -field_tolerances=[1e-13,1e-13,1e-13,1e-13,1e-13] -field_values=[\ - md.results.StressbalanceSolution.Vx,\ - md.results.StressbalanceSolution.Vy,\ - md.results.StressbalanceSolution.Vz,\ - md.results.StressbalanceSolution.Vel,\ - md.results.StressbalanceSolution.Pressure,\ - ] +field_names = ['Vx', 'Vy', 'Vz', 'Vel', 'Pressure'] +field_tolerances = [1e-13, 1e-13, 1e-13, 1e-13, 1e-13] +field_values = [md.results.StressbalanceSolution.Vx, + md.results.StressbalanceSolution.Vy, + md.results.StressbalanceSolution.Vz, + md.results.StressbalanceSolution.Vel, + md.results.StressbalanceSolution.Pressure] Index: /issm/trunk-jpl/test/NightlyRun/test305.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test305.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test305.py (revision 23793) @@ -9,20 +9,18 @@ -md=triangle(model(),'../Exp/Square.exp',180000.) -md=setmask(md,'','') -md=parameterize(md,'../Par/SquareSheetConstrained.py') -md.extrude(5,2.) -md=setflowequation(md,'SIA','all') -md.cluster=generic('name',gethostname(),'np',3) -md=solve(md,'Stressbalance') +md = triangle(model(), '../Exp/Square.exp', 180000.) +md = setmask(md, '', '') +md = parameterize(md, '../Par/SquareSheetConstrained.py') +md.extrude(5, 2.) +md = setflowequation(md, 'SIA', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'Stressbalance') #Fields and tolerances to track changes -field_names =['Vx','Vy','Vz','Vel','Pressure'] -field_tolerances=[1e-13,1e-13,1e-13,1e-13,1e-13] -field_values=[\ - md.results.StressbalanceSolution.Vx,\ - md.results.StressbalanceSolution.Vy,\ - md.results.StressbalanceSolution.Vz,\ - md.results.StressbalanceSolution.Vel,\ - md.results.StressbalanceSolution.Pressure,\ - ] +field_names = ['Vx', 'Vy', 'Vz', 'Vel', 'Pressure'] +field_tolerances = [1e-13, 1e-13, 1e-13, 1e-13, 1e-13] +field_values = [md.results.StressbalanceSolution.Vx, + md.results.StressbalanceSolution.Vy, + md.results.StressbalanceSolution.Vz, + md.results.StressbalanceSolution.Vel, + md.results.StressbalanceSolution.Pressure] Index: /issm/trunk-jpl/test/NightlyRun/test306.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test306.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test306.py (revision 23793) @@ -9,20 +9,18 @@ -md=triangle(model(),'../Exp/Square.exp',180000.) -md=setmask(md,'','') -md=parameterize(md,'../Par/SquareSheetConstrained.py') -md.extrude(4,2.) -md=setflowequation(md,'SIA','../Exp/SquareHalfRight.exp','fill','SSA') -md.cluster=generic('name',gethostname(),'np',3) -md=solve(md,'Stressbalance') +md = triangle(model(), '../Exp/Square.exp', 180000.) +md = setmask(md, '', '') +md = parameterize(md, '../Par/SquareSheetConstrained.py') +md.extrude(4, 2.) +md = setflowequation(md, 'SIA', '../Exp/SquareHalfRight.exp', 'fill', 'SSA') +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'Stressbalance') #Fields and tolerances to track changes -field_names =['Vx','Vy','Vz','Vel','Pressure'] -field_tolerances=[1e-13,1e-13,1e-13,1e-13,1e-13] -field_values=[\ - md.results.StressbalanceSolution.Vx,\ - md.results.StressbalanceSolution.Vy,\ - md.results.StressbalanceSolution.Vz,\ - md.results.StressbalanceSolution.Vel,\ - md.results.StressbalanceSolution.Pressure,\ - ] +field_names = ['Vx', 'Vy', 'Vz', 'Vel', 'Pressure'] +field_tolerances = [1e-13, 1e-13, 1e-13, 1e-13, 1e-13] +field_values = [md.results.StressbalanceSolution.Vx, + md.results.StressbalanceSolution.Vy, + md.results.StressbalanceSolution.Vz, + md.results.StressbalanceSolution.Vel, + md.results.StressbalanceSolution.Pressure] Index: /issm/trunk-jpl/test/NightlyRun/test307.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test307.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test307.py (revision 23793) @@ -9,20 +9,18 @@ -md=triangle(model(),'../Exp/Square.exp',180000.) -md=setmask(md,'','') -md=parameterize(md,'../Par/SquareSheetConstrained.py') -md.extrude(3,1.) -md=setflowequation(md,'HO','all') -md.cluster=generic('name',gethostname(),'np',3) -md=solve(md,'Stressbalance') +md = triangle(model(), '../Exp/Square.exp', 180000.) +md = setmask(md, '', '') +md = parameterize(md, '../Par/SquareSheetConstrained.py') +md.extrude(3, 1.) +md = setflowequation(md, 'HO', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'Stressbalance') #Fields and tolerances to track changes -field_names =['Vx','Vy','Vz','Vel','Pressure'] -field_tolerances=[1e-09,1e-09,2e-10,2e-10,1e-10] -field_values=[\ - md.results.StressbalanceSolution.Vx,\ - md.results.StressbalanceSolution.Vy,\ - md.results.StressbalanceSolution.Vz,\ - md.results.StressbalanceSolution.Vel,\ - md.results.StressbalanceSolution.Pressure,\ - ] +field_names = ['Vx', 'Vy', 'Vz', 'Vel', 'Pressure'] +field_tolerances = [1e-09, 1e-09, 2e-10, 2e-10, 1e-10] +field_values = [md.results.StressbalanceSolution.Vx, + md.results.StressbalanceSolution.Vy, + md.results.StressbalanceSolution.Vz, + md.results.StressbalanceSolution.Vel, + md.results.StressbalanceSolution.Pressure] Index: /issm/trunk-jpl/test/NightlyRun/test308.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test308.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test308.py (revision 23793) @@ -9,20 +9,18 @@ -md=triangle(model(),'../Exp/Square.exp',180000.) -md=setmask(md,'','') -md=parameterize(md,'../Par/SquareSheetConstrained.py') -md.extrude(3,1.) -md=setflowequation(md,'FS','all') -md.cluster=generic('name',gethostname(),'np',3) -md=solve(md,'Stressbalance') +md = triangle(model(), '../Exp/Square.exp', 180000.) +md = setmask(md, '', '') +md = parameterize(md, '../Par/SquareSheetConstrained.py') +md.extrude(3, 1.) +md = setflowequation(md, 'FS', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'Stressbalance') #Fields and tolerances to track changes -field_names =['Vx','Vy','Vz','Vel','Pressure'] -field_tolerances=[1e-09,1e-09,1e-09,1e-09,1e-09] -field_values=[\ - md.results.StressbalanceSolution.Vx,\ - md.results.StressbalanceSolution.Vy,\ - md.results.StressbalanceSolution.Vz,\ - md.results.StressbalanceSolution.Vel,\ - md.results.StressbalanceSolution.Pressure,\ - ] +field_names = ['Vx', 'Vy', 'Vz', 'Vel', 'Pressure'] +field_tolerances = [1e-09, 1e-09, 1e-09, 1e-09, 1e-09] +field_values = [md.results.StressbalanceSolution.Vx, + md.results.StressbalanceSolution.Vy, + md.results.StressbalanceSolution.Vz, + md.results.StressbalanceSolution.Vel, + md.results.StressbalanceSolution.Pressure] Index: /issm/trunk-jpl/test/NightlyRun/test309.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test309.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test309.py (revision 23793) @@ -9,15 +9,13 @@ -md=triangle(model(),'../Exp/Square.exp',150000.) -md=setmask(md,'','') -md=parameterize(md,'../Par/SquareSheetConstrained.py') -md=setflowequation(md,'SSA','all') -md.cluster=generic('name',gethostname(),'np',3) -md=solve(md,'Masstransport') +md = triangle(model(), '../Exp/Square.exp', 150000.) +md = setmask(md, '', '') +md = parameterize(md, '../Par/SquareSheetConstrained.py') +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'Masstransport') #Fields and tolerances to track changes -field_names =['Thickness'] -field_tolerances=[1e-13] -field_values=[\ - md.results.MasstransportSolution.Thickness,\ - ] +field_names = ['Thickness'] +field_tolerances = [1e-13] +field_values = [md.results.MasstransportSolution.Thickness] Index: /issm/trunk-jpl/test/NightlyRun/test310.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test310.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test310.py (revision 23793) @@ -10,18 +10,16 @@ -md=triangle(model(),'../Exp/Square.exp',150000.) -md=meshconvert(md) -md=setmask(md,'','') -md=parameterize(md,'../Par/SquareSheetConstrained.py') -md=setflowequation(md,'SSA','all') -md.masstransport.stabilization=3 -md.masstransport.spcthickness=md.geometry.thickness -md.cluster=generic('name',gethostname(),'np',3) -md=solve(md,'Masstransport') +md = triangle(model(), '../Exp/Square.exp', 150000.) +md = meshconvert(md) +md = setmask(md, '', '') +md = parameterize(md, '../Par/SquareSheetConstrained.py') +md = setflowequation(md, 'SSA', 'all') +md.masstransport.stabilization = 3 +md.masstransport.spcthickness = md.geometry.thickness +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'Masstransport') #Fields and tolerances to track changes -field_names =['Thickness'] -field_tolerances=[1e-13] -field_values=[\ - md.results.MasstransportSolution.Thickness,\ - ] +field_names = ['Thickness'] +field_tolerances = [1e-13] +field_values = [md.results.MasstransportSolution.Thickness] Index: /issm/trunk-jpl/test/NightlyRun/test3101.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test3101.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test3101.py (revision 23793) @@ -10,27 +10,25 @@ -md=triangle(model(),'../Exp/Square.exp',50000.) -md=setmask(md,'all','') -md=parameterize(md,'../Par/SquareShelfConstrained.py') -md=setflowequation(md,'SSA','all') -md.cluster=generic('name',gethostname(),'np',3) -md.stressbalance.requested_outputs=['default','DeviatoricStressxx','DeviatoricStressyy','DeviatoricStressxy'] +md = triangle(model(), '../Exp/Square.exp', 50000.) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelfConstrained.py') +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) +md.stressbalance.requested_outputs = ['default', 'DeviatoricStressxx', 'DeviatoricStressyy', 'DeviatoricStressxy'] -md.autodiff.isautodiff=True -md.toolkits.DefaultAnalysis=issmmumpssolver() -md=solve(md,'Stressbalance') +md.autodiff.isautodiff = True +md.toolkits.DefaultAnalysis = issmmumpssolver() +md = solve(md, 'Stressbalance') #Fields and tolerances to track changes -field_names =['Vx','Vy','Vel','Pressure',\ - 'DeviatoricStressxx','DeviatoricStressyy','DeviatoricStressxy'] -field_tolerances=[1e-12,1e-12,1e-12,1e-12,\ - 1e-12,1e-12,1e-12] -field_values=[\ - md.results.StressbalanceSolution.Vx,\ - md.results.StressbalanceSolution.Vy,\ - md.results.StressbalanceSolution.Vel,\ - md.results.StressbalanceSolution.Pressure,\ - md.results.StressbalanceSolution.DeviatoricStressxx,\ - md.results.StressbalanceSolution.DeviatoricStressyy,\ - md.results.StressbalanceSolution.DeviatoricStressxy,\ - ] +field_names = ['Vx', 'Vy', 'Vel', 'Pressure', + 'DeviatoricStressxx', 'DeviatoricStressyy', 'DeviatoricStressxy'] +field_tolerances = [1e-12, 1e-12, 1e-12, 1e-12, + 1e-12, 1e-12, 1e-12] +field_values = [md.results.StressbalanceSolution.Vx, + md.results.StressbalanceSolution.Vy, + md.results.StressbalanceSolution.Vel, + md.results.StressbalanceSolution.Pressure, + md.results.StressbalanceSolution.DeviatoricStressxx, + md.results.StressbalanceSolution.DeviatoricStressyy, + md.results.StressbalanceSolution.DeviatoricStressxy] Index: /issm/trunk-jpl/test/NightlyRun/test3102.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test3102.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test3102.py (revision 23793) @@ -9,23 +9,21 @@ from issmmumpssolver import issmmumpssolver -md=triangle(model(),'../Exp/Square.exp',180000.) -md=setmask(md,'all','') -md=parameterize(md,'../Par/SquareShelfConstrained.py') -md.extrude(3,2.) -md=setflowequation(md,'SSA','all') -md.cluster=generic('name',gethostname(),'np',3) -md.autodiff.isautodiff=True -md.toolkits.DefaultAnalysis=issmmumpssolver() +md = triangle(model(), '../Exp/Square.exp', 180000.) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelfConstrained.py') +md.extrude(3, 2.) +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) +md.autodiff.isautodiff = True +md.toolkits.DefaultAnalysis = issmmumpssolver() -md=solve(md,'Stressbalance') +md = solve(md, 'Stressbalance') #Fields and tolerances to track changes -field_names =['Vx','Vy','Vz','Vel','Pressure'] -field_tolerances=[1e-13,1e-13,1e-13,1e-13,1e-13] -field_values=[\ - md.results.StressbalanceSolution.Vx,\ - md.results.StressbalanceSolution.Vy,\ - md.results.StressbalanceSolution.Vz,\ - md.results.StressbalanceSolution.Vel,\ - md.results.StressbalanceSolution.Pressure,\ - ] +field_names = ['Vx', 'Vy', 'Vz', 'Vel', 'Pressure'] +field_tolerances = [1e-13, 1e-13, 1e-13, 1e-13, 1e-13] +field_values = [md.results.StressbalanceSolution.Vx, + md.results.StressbalanceSolution.Vy, + md.results.StressbalanceSolution.Vz, + md.results.StressbalanceSolution.Vel, + md.results.StressbalanceSolution.Pressure] Index: /issm/trunk-jpl/test/NightlyRun/test3103.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test3103.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test3103.py (revision 23793) @@ -10,32 +10,30 @@ -md=triangle(model(),'../Exp/Square.exp',180000.) -md=setmask(md,'all','') -md=parameterize(md,'../Par/SquareShelfConstrained.py') -md.extrude(3,2.) -md=setflowequation(md,'HO','all') -md.cluster=generic('name',gethostname(),'np',3) -md.stressbalance.requested_outputs=['default','StressTensorxx','StressTensoryy','StressTensorzz','StressTensorxy','StressTensorxz','StressTensoryz'] +md = triangle(model(), '../Exp/Square.exp', 180000.) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelfConstrained.py') +md.extrude(3, 2.) +md = setflowequation(md, 'HO', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) +md.stressbalance.requested_outputs = ['default', 'StressTensorxx', 'StressTensoryy', 'StressTensorzz', 'StressTensorxy', 'StressTensorxz', 'StressTensoryz'] -md.autodiff.isautodiff=True -md.toolkits.DefaultAnalysis=issmmumpssolver() -md=solve(md,'Stressbalance') +md.autodiff.isautodiff = True +md.toolkits.DefaultAnalysis = issmmumpssolver() +md = solve(md, 'Stressbalance') #Fields and tolerances to track changes -field_names =['Vx','Vy','Vz','Vel','Pressure',\ - 'StressTensorxx','StressTensoryy','StressTensorzz','StressTensorxy','StressTensorxz','StressTensoryz'] -field_tolerances=[1e-09,1e-09,1e-09,1e-09,1e-09,\ - 1e-09,1e-09,1e-09,1e-09,1e-09,2e-09] -field_values=[\ - md.results.StressbalanceSolution.Vx,\ - md.results.StressbalanceSolution.Vy,\ - md.results.StressbalanceSolution.Vz,\ - md.results.StressbalanceSolution.Vel,\ - md.results.StressbalanceSolution.Pressure,\ - md.results.StressbalanceSolution.StressTensorxx,\ - md.results.StressbalanceSolution.StressTensoryy,\ - md.results.StressbalanceSolution.StressTensorzz,\ - md.results.StressbalanceSolution.StressTensorxy,\ - md.results.StressbalanceSolution.StressTensorxz,\ - md.results.StressbalanceSolution.StressTensoryz,\ - ] +field_names = ['Vx', 'Vy', 'Vz', 'Vel', 'Pressure', + 'StressTensorxx', 'StressTensoryy', 'StressTensorzz', 'StressTensorxy', 'StressTensorxz', 'StressTensoryz'] +field_tolerances = [1e-09, 1e-09, 1e-09, 1e-09, 1e-09, + 1e-09, 1e-09, 1e-09, 1e-09, 1e-09, 2e-09] +field_values = [md.results.StressbalanceSolution.Vx, + md.results.StressbalanceSolution.Vy, + md.results.StressbalanceSolution.Vz, + md.results.StressbalanceSolution.Vel, + md.results.StressbalanceSolution.Pressure, + md.results.StressbalanceSolution.StressTensorxx, + md.results.StressbalanceSolution.StressTensoryy, + md.results.StressbalanceSolution.StressTensorzz, + md.results.StressbalanceSolution.StressTensorxy, + md.results.StressbalanceSolution.StressTensorxz, + md.results.StressbalanceSolution.StressTensoryz] Index: /issm/trunk-jpl/test/NightlyRun/test3104.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test3104.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test3104.py (revision 23793) @@ -10,23 +10,21 @@ -md=triangle(model(),'../Exp/Square.exp',180000.) -md=setmask(md,'all','') -md=parameterize(md,'../Par/SquareShelfConstrained.py') -md.extrude(3,2.) -md=setflowequation(md,'FS','all') -md.cluster=generic('name',gethostname(),'np',3) +md = triangle(model(), '../Exp/Square.exp', 180000.) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelfConstrained.py') +md.extrude(3, 2.) +md = setflowequation(md, 'FS', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) -md.autodiff.isautodiff=True -md.toolkits.DefaultAnalysis=issmmumpssolver() -md=solve(md,'Stressbalance') +md.autodiff.isautodiff = True +md.toolkits.DefaultAnalysis = issmmumpssolver() +md = solve(md, 'Stressbalance') #Fields and tolerances to track changes -field_names =['Vx','Vy','Vz','Vel','Pressure'] -field_tolerances=[1e-08,1e-08,2e-07,1e-08,1e-08] -field_values=[\ - md.results.StressbalanceSolution.Vx,\ - md.results.StressbalanceSolution.Vy,\ - md.results.StressbalanceSolution.Vz,\ - md.results.StressbalanceSolution.Vel,\ - md.results.StressbalanceSolution.Pressure,\ - ] +field_names = ['Vx', 'Vy', 'Vz', 'Vel', 'Pressure'] +field_tolerances = [1e-08, 1e-08, 2e-07, 1e-08, 1e-08] +field_values = [md.results.StressbalanceSolution.Vx, + md.results.StressbalanceSolution.Vy, + md.results.StressbalanceSolution.Vz, + md.results.StressbalanceSolution.Vel, + md.results.StressbalanceSolution.Pressure] Index: /issm/trunk-jpl/test/NightlyRun/test3105.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test3105.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test3105.py (revision 23793) @@ -10,18 +10,16 @@ -md=triangle(model(),'../Exp/Square.exp',150000.) -md=setmask(md,'all','') -md=parameterize(md,'../Par/SquareShelfConstrained.py') -md=setflowequation(md,'SSA','all') -md.cluster=generic('name',gethostname(),'np',3) +md = triangle(model(), '../Exp/Square.exp', 150000.) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelfConstrained.py') +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) -md.autodiff.isautodiff=True -md.toolkits.DefaultAnalysis=issmmumpssolver() -md=solve(md,'Masstransport') +md.autodiff.isautodiff = True +md.toolkits.DefaultAnalysis = issmmumpssolver() +md = solve(md, 'Masstransport') #Fields and tolerances to track changes -field_names =['Thickness'] -field_tolerances=[1e-13] -field_values=[\ - md.results.MasstransportSolution.Thickness,\ - ] +field_names = ['Thickness'] +field_tolerances = [1e-13] +field_values = [md.results.MasstransportSolution.Thickness] Index: /issm/trunk-jpl/test/NightlyRun/test3106.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test3106.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test3106.py (revision 23793) @@ -11,21 +11,19 @@ -md=triangle(model(),'../Exp/Square.exp',150000.) -md=meshconvert(md) -md=setmask(md,'all','') -md=parameterize(md,'../Par/SquareShelfConstrained.py') -md=setflowequation(md,'SSA','all') -md.cluster=generic('name',gethostname(),'np',3) -md.masstransport.stabilization=3 -md.masstransport.spcthickness=md.geometry.thickness +md = triangle(model(), '../Exp/Square.exp', 150000.) +md = meshconvert(md) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelfConstrained.py') +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) +md.masstransport.stabilization = 3 +md.masstransport.spcthickness = md.geometry.thickness -md.autodiff.isautodiff=True -md.toolkits.DefaultAnalysis=issmmumpssolver() -md=solve(md,'Masstransport') +md.autodiff.isautodiff = True +md.toolkits.DefaultAnalysis = issmmumpssolver() +md = solve(md, 'Masstransport') #Fields and tolerances to track changes -field_names =['Thickness'] -field_tolerances=[1e-13] -field_values=[\ - md.results.MasstransportSolution.Thickness,\ - ] +field_names = ['Thickness'] +field_tolerances = [1e-13] +field_values = [md.results.MasstransportSolution.Thickness] Index: /issm/trunk-jpl/test/NightlyRun/test3107.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test3107.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test3107.py (revision 23793) @@ -10,19 +10,17 @@ -md=triangle(model(),'../Exp/Square.exp',150000.) -md=setmask(md,'all','') -md=parameterize(md,'../Par/SquareShelfConstrained.py') -md=setflowequation(md,'SSA','all') -md.extrude(5,3.) -md.cluster=generic('name',gethostname(),'np',3) +md = triangle(model(), '../Exp/Square.exp', 150000.) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelfConstrained.py') +md = setflowequation(md, 'SSA', 'all') +md.extrude(5, 3.) +md.cluster = generic('name', gethostname(), 'np', 3) -md.autodiff.isautodiff=True -md.toolkits.DefaultAnalysis=issmmumpssolver() -md=solve(md,'Masstransport') +md.autodiff.isautodiff = True +md.toolkits.DefaultAnalysis = issmmumpssolver() +md = solve(md, 'Masstransport') #Fields and tolerances to track changes -field_names =['Thickness'] -field_tolerances=[1e-13] -field_values=[\ - md.results.MasstransportSolution.Thickness,\ - ] +field_names = ['Thickness'] +field_tolerances = [1e-13] +field_values = [md.results.MasstransportSolution.Thickness] Index: /issm/trunk-jpl/test/NightlyRun/test3108.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test3108.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test3108.py (revision 23793) @@ -10,21 +10,19 @@ -md=triangle(model(),'../Exp/Square.exp',180000.) -md=setmask(md,'all','') -md=parameterize(md,'../Par/SquareShelfConstrained.py') -md.extrude(3,1.) -md=setflowequation(md,'SSA','all') -md.timestepping.time_step=0 -md.cluster=generic('name',gethostname(),'np',3) +md = triangle(model(), '../Exp/Square.exp', 180000.) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelfConstrained.py') +md.extrude(3, 1.) +md = setflowequation(md, 'SSA', 'all') +md.timestepping.time_step = 0 +md.cluster = generic('name', gethostname(), 'np', 3) -md.autodiff.isautodiff=True -md.toolkits.DefaultAnalysis=issmmumpssolver() -md=solve(md,'Thermal') +md.autodiff.isautodiff = True +md.toolkits.DefaultAnalysis = issmmumpssolver() +md = solve(md, 'Thermal') #Fields and tolerances to track changes -field_names =['Temperature','BasalforcingsGroundediceMeltingRate'] -field_tolerances=[1e-13,1e-5] -field_values=[\ - md.results.ThermalSolution.Temperature,\ - md.results.ThermalSolution.BasalforcingsGroundediceMeltingRate,\ - ] +field_names = ['Temperature', 'BasalforcingsGroundediceMeltingRate'] +field_tolerances = [1e-13, 1e-5] +field_values = [md.results.ThermalSolution.Temperature, + md.results.ThermalSolution.BasalforcingsGroundediceMeltingRate] Index: /issm/trunk-jpl/test/NightlyRun/test3109.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test3109.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test3109.py (revision 23793) @@ -10,25 +10,23 @@ -md=triangle(model(),'../Exp/Square.exp',180000.) -md=setmask(md,'all','') -md=parameterize(md,'../Par/SquareShelfConstrained.py') -md.extrude(3,1.) -md=setflowequation(md,'SSA','all') -md.cluster=generic('name',gethostname(),'np',3) -md.transient.isstressbalance=False -md.transient.ismasstransport=False -md.transient.issmb=True -md.transient.isthermal=True -md.transient.isgroundingline=False +md = triangle(model(), '../Exp/Square.exp', 180000.) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelfConstrained.py') +md.extrude(3, 1.) +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) +md.transient.isstressbalance = False +md.transient.ismasstransport = False +md.transient.issmb = True +md.transient.isthermal = True +md.transient.isgroundingline = False -md.autodiff.isautodiff=True -md.toolkits.DefaultAnalysis=issmmumpssolver() -md=solve(md,'Transient') +md.autodiff.isautodiff = True +md.toolkits.DefaultAnalysis = issmmumpssolver() +md = solve(md, 'Transient') #Fields and tolerances to track changes -field_names =['Temperature','BasalforcingsGroundediceMeltingRate'] -field_tolerances=[1e-13,1e-13] -field_values=[\ - md.results.TransientSolution[0].Temperature,\ - md.results.TransientSolution[0].BasalforcingsGroundediceMeltingRate,\ - ] +field_names = ['Temperature', 'BasalforcingsGroundediceMeltingRate'] +field_tolerances = [1e-13, 1e-13] +field_values = [md.results.TransientSolution[0].Temperature, + md.results.TransientSolution[0].BasalforcingsGroundediceMeltingRate] Index: /issm/trunk-jpl/test/NightlyRun/test311.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test311.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test311.py (revision 23793) @@ -9,16 +9,14 @@ -md=triangle(model(),'../Exp/Square.exp',150000.) -md=setmask(md,'','') -md=parameterize(md,'../Par/SquareSheetConstrained.py') -md=setflowequation(md,'SSA','all') -md.extrude(5,0.5) -md.cluster=generic('name',gethostname(),'np',3) -md=solve(md,'Masstransport') +md = triangle(model(), '../Exp/Square.exp', 150000.) +md = setmask(md, '', '') +md = parameterize(md, '../Par/SquareSheetConstrained.py') +md = setflowequation(md, 'SSA', 'all') +md.extrude(5, 0.5) +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'Masstransport') #Fields and tolerances to track changes -field_names =['Thickness'] -field_tolerances=[1e-13] -field_values=[\ - md.results.MasstransportSolution.Thickness,\ - ] +field_names = ['Thickness'] +field_tolerances = [1e-13] +field_values = [md.results.MasstransportSolution.Thickness] Index: /issm/trunk-jpl/test/NightlyRun/test3110.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test3110.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test3110.py (revision 23793) @@ -9,44 +9,42 @@ -md=triangle(model(),'../Exp/Square.exp',150000.) -md=setmask(md,'all','') -md=parameterize(md,'../Par/SquareShelfConstrained.py') -md=setflowequation(md,'SSA','all') -md.cluster=generic('name',gethostname(),'np',3) +md = triangle(model(), '../Exp/Square.exp', 150000.) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelfConstrained.py') +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) -md.transient.requested_outputs=['IceVolume'] +md.transient.requested_outputs = ['IceVolume'] -md.autodiff.isautodiff=True -md=solve(md,'Transient') +md.autodiff.isautodiff = True +md = solve(md, 'Transient') #Fields and tolerances to track changes -field_names =['Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Volume1','Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Volume2','Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Volume3'] -field_tolerances=[1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,\ - 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,\ - 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13] -field_values=[\ - md.results.TransientSolution[0].Vx,\ - md.results.TransientSolution[0].Vy,\ - md.results.TransientSolution[0].Vel,\ - md.results.TransientSolution[0].Pressure,\ - md.results.TransientSolution[0].Base,\ - md.results.TransientSolution[0].Surface,\ - md.results.TransientSolution[0].Thickness,\ - md.results.TransientSolution[0].IceVolume,\ - md.results.TransientSolution[1].Vx,\ - md.results.TransientSolution[1].Vy,\ - md.results.TransientSolution[1].Vel,\ - md.results.TransientSolution[1].Pressure,\ - md.results.TransientSolution[1].Base,\ - md.results.TransientSolution[1].Surface,\ - md.results.TransientSolution[1].Thickness,\ - md.results.TransientSolution[1].IceVolume,\ - md.results.TransientSolution[2].Vx,\ - md.results.TransientSolution[2].Vy,\ - md.results.TransientSolution[2].Vel,\ - md.results.TransientSolution[2].Pressure,\ - md.results.TransientSolution[2].Base,\ - md.results.TransientSolution[2].Surface,\ - md.results.TransientSolution[2].Thickness,\ - md.results.TransientSolution[2].IceVolume,\ - ] +field_names = ['Vx1', 'Vy1', 'Vel1', 'Pressure1', 'Bed1', 'Surface1', 'Thickness1', 'Volume1', 'Vx2', 'Vy2', 'Vel2', 'Pressure2', 'Bed2', 'Surface2', 'Thickness2', 'Volume2', 'Vx3', 'Vy3', 'Vel3', 'Pressure3', 'Bed3', 'Surface3', 'Thickness3', 'Volume3'] +field_tolerances = [1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, + 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, + 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13] +field_values = [md.results.TransientSolution[0].Vx, + md.results.TransientSolution[0].Vy, + md.results.TransientSolution[0].Vel, + md.results.TransientSolution[0].Pressure, + md.results.TransientSolution[0].Base, + md.results.TransientSolution[0].Surface, + md.results.TransientSolution[0].Thickness, + md.results.TransientSolution[0].IceVolume, + md.results.TransientSolution[1].Vx, + md.results.TransientSolution[1].Vy, + md.results.TransientSolution[1].Vel, + md.results.TransientSolution[1].Pressure, + md.results.TransientSolution[1].Base, + md.results.TransientSolution[1].Surface, + md.results.TransientSolution[1].Thickness, + md.results.TransientSolution[1].IceVolume, + md.results.TransientSolution[2].Vx, + md.results.TransientSolution[2].Vy, + md.results.TransientSolution[2].Vel, + md.results.TransientSolution[2].Pressure, + md.results.TransientSolution[2].Base, + md.results.TransientSolution[2].Surface, + md.results.TransientSolution[2].Thickness, + md.results.TransientSolution[2].IceVolume] Index: /issm/trunk-jpl/test/NightlyRun/test3119.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test3119.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test3119.py (revision 23793) @@ -1,3 +1,2 @@ -import numpy as np from model import * from socket import gethostname @@ -13,25 +12,25 @@ #test reverse scalar vs forward vectorial drivers in ADOLC, using the test3009 setup, equivalent to test109 setup. -md=triangle(model(),'../Exp/Square.exp',100000.) -md=setmask(md,'all','') -md=parameterize(md,'../Par/SquareShelfConstrained.py') -md=setflowequation(md,'SSA','all') -md.cluster=generic('name',gethostname(),'np',1) +md = triangle(model(), '../Exp/Square.exp', 100000.) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelfConstrained.py') +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 1) -md.autodiff.isautodiff=True -md.toolkits.DefaultAnalysis=issmgslsolver() +md.autodiff.isautodiff = True +md.toolkits.DefaultAnalysis = issmgslsolver() #first run scalar reverse mode: -md.autodiff.independents=[independent('name','md.geometry.thickness','type','vertex','nods',md.mesh.numberofvertices)] -md.autodiff.dependents=[dependent('name','MaxVel','type','scalar','fos_reverse_index',1)] -md.autodiff.driver='fos_reverse' +md.autodiff.independents = [independent('name', 'md.geometry.thickness', 'type', 'vertex', 'nods', md.mesh.numberofvertices)] +md.autodiff.dependents = [dependent('name', 'MaxVel', 'type', 'scalar', 'fos_reverse_index', 1)] +md.autodiff.driver = 'fos_reverse' -md=solve(md,'Transient') +md = solve(md, 'Transient') #recover jacobian: -jac_reverse=md.results.TransientSolution[0].AutodiffJacobian +jac_reverse = md.results.TransientSolution[0].AutodiffJacobian #Fields and tolerances to track changes -field_names =['Jac Reverse'] -field_tolerances=[1e-13] -field_values=[jac_reverse] +field_names = ['Jac Reverse'] +field_tolerances = [1e-13] +field_values = [jac_reverse] Index: /issm/trunk-jpl/test/NightlyRun/test312.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test312.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test312.py (revision 23793) @@ -9,18 +9,16 @@ -md=triangle(model(),'../Exp/Square.exp',180000.) -md=setmask(md,'','') -md=parameterize(md,'../Par/SquareSheetConstrained.py') -md.extrude(3,1.) -md=setflowequation(md,'SSA','all') -md.timestepping.time_step=0. -md.cluster=generic('name',gethostname(),'np',3) -md=solve(md,'Thermal') +md = triangle(model(), '../Exp/Square.exp', 180000.) +md = setmask(md, '', '') +md = parameterize(md, '../Par/SquareSheetConstrained.py') +md.extrude(3, 1.) +md = setflowequation(md, 'SSA', 'all') +md.timestepping.time_step = 0. +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'Thermal') #Fields and tolerances to track changes -field_names =['Temperature','BasalforcingsGroundediceMeltingRate'] -field_tolerances=[1e-13,1e-8] -field_values=[\ - md.results.ThermalSolution.Temperature,\ - md.results.ThermalSolution.BasalforcingsGroundediceMeltingRate,\ - ] +field_names = ['Temperature', 'BasalforcingsGroundediceMeltingRate'] +field_tolerances = [1e-13, 1e-8] +field_values = [md.results.ThermalSolution.Temperature, + md.results.ThermalSolution.BasalforcingsGroundediceMeltingRate] Index: /issm/trunk-jpl/test/NightlyRun/test313.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test313.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test313.py (revision 23793) @@ -9,23 +9,21 @@ -md=triangle(model(),'../Exp/Square.exp',180000.) -md=setmask(md,'','') -md=parameterize(md,'../Par/SquareSheetConstrained.py') -md.extrude(3,1.) -md=setflowequation(md,'SSA','all') -md.cluster=generic('name',gethostname(),'np',3) -md.verbose=verbose('convergence',True,'solution',True) -md.transient.isstressbalance=False -md.transient.ismasstransport=False -md.transient.issmb=True -md.transient.isthermal=True -md.transient.isgroundingline=False -md=solve(md,'Transient') +md = triangle(model(), '../Exp/Square.exp', 180000.) +md = setmask(md, '', '') +md = parameterize(md, '../Par/SquareSheetConstrained.py') +md.extrude(3, 1.) +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) +md.verbose = verbose('convergence', True, 'solution', True) +md.transient.isstressbalance = False +md.transient.ismasstransport = False +md.transient.issmb = True +md.transient.isthermal = True +md.transient.isgroundingline = False +md = solve(md, 'Transient') #Fields and tolerances to track changes -field_names =['Temperature','BasalforcingsGroundediceMeltingRate'] -field_tolerances=[1e-13,1e-13] -field_values=[\ - md.results.TransientSolution[0].Temperature,\ - md.results.TransientSolution[0].BasalforcingsGroundediceMeltingRate,\ - ] +field_names = ['Temperature', 'BasalforcingsGroundediceMeltingRate'] +field_tolerances = [1e-13, 1e-13] +field_values = [md.results.TransientSolution[0].Temperature, + md.results.TransientSolution[0].BasalforcingsGroundediceMeltingRate] Index: /issm/trunk-jpl/test/NightlyRun/test314.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test314.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test314.py (revision 23793) @@ -9,48 +9,44 @@ -md=triangle(model(),'../Exp/Square.exp',150000.) -md=setmask(md,'','') -md=parameterize(md,'../Par/SquareSheetConstrained.py') -md=setflowequation(md,'SIA','all') -md.cluster=generic('name',gethostname(),'np',3) -md.transient.requested_outputs=['default','GroundedArea','FloatingArea','IceVolume'] -md=solve(md,'Transient') +md = triangle(model(), '../Exp/Square.exp', 150000.) +md = setmask(md, '', '') +md = parameterize(md, '../Par/SquareSheetConstrained.py') +md = setflowequation(md, 'SIA', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) +md.transient.requested_outputs = ['default', 'GroundedArea', 'FloatingArea', 'IceVolume'] +md = solve(md, 'Transient') #Fields and tolerances to track changes -field_names =[ -'Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','GroundedArea1','FloatingArea1', -'Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2','GroundedArea2','FloatingArea2', -'Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3','GroundedArea3','FloatingArea3'] -field_tolerances=[ - 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13, - 1e-10,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13, - 1e-10,1.5e-13,1.5e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13] -field_values=[\ - md.results.TransientSolution[0].Vx,\ - md.results.TransientSolution[0].Vy,\ - md.results.TransientSolution[0].Vel,\ - md.results.TransientSolution[0].Pressure,\ - md.results.TransientSolution[0].Base,\ - md.results.TransientSolution[0].Surface,\ - md.results.TransientSolution[0].Thickness,\ - md.results.TransientSolution[0].GroundedArea,\ - md.results.TransientSolution[0].FloatingArea,\ - md.results.TransientSolution[1].Vx,\ - md.results.TransientSolution[1].Vy,\ - md.results.TransientSolution[1].Vel,\ - md.results.TransientSolution[1].Pressure,\ - md.results.TransientSolution[1].Base,\ - md.results.TransientSolution[1].Surface,\ - md.results.TransientSolution[1].Thickness,\ - md.results.TransientSolution[1].GroundedArea,\ - md.results.TransientSolution[1].FloatingArea,\ - md.results.TransientSolution[2].Vx,\ - md.results.TransientSolution[2].Vy,\ - md.results.TransientSolution[2].Vel,\ - md.results.TransientSolution[2].Pressure,\ - md.results.TransientSolution[2].Base,\ - md.results.TransientSolution[2].Surface,\ - md.results.TransientSolution[2].Thickness,\ - md.results.TransientSolution[2].GroundedArea,\ - md.results.TransientSolution[2].FloatingArea,\ - ] +field_names = ['Vx1', 'Vy1', 'Vel1', 'Pressure1', 'Bed1', 'Surface1', 'Thickness1', 'GroundedArea1', 'FloatingArea1', + 'Vx2', 'Vy2', 'Vel2', 'Pressure2', 'Bed2', 'Surface2', 'Thickness2', 'GroundedArea2', 'FloatingArea2', + 'Vx3', 'Vy3', 'Vel3', 'Pressure3', 'Bed3', 'Surface3', 'Thickness3', 'GroundedArea3', 'FloatingArea3'] +field_tolerances = [1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, + 1e-10, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, + 1e-10, 1.5e-13, 1.5e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13] +field_values = [md.results.TransientSolution[0].Vx, + md.results.TransientSolution[0].Vy, + md.results.TransientSolution[0].Vel, + md.results.TransientSolution[0].Pressure, + md.results.TransientSolution[0].Base, + md.results.TransientSolution[0].Surface, + md.results.TransientSolution[0].Thickness, + md.results.TransientSolution[0].GroundedArea, + md.results.TransientSolution[0].FloatingArea, + md.results.TransientSolution[1].Vx, + md.results.TransientSolution[1].Vy, + md.results.TransientSolution[1].Vel, + md.results.TransientSolution[1].Pressure, + md.results.TransientSolution[1].Base, + md.results.TransientSolution[1].Surface, + md.results.TransientSolution[1].Thickness, + md.results.TransientSolution[1].GroundedArea, + md.results.TransientSolution[1].FloatingArea, + md.results.TransientSolution[2].Vx, + md.results.TransientSolution[2].Vy, + md.results.TransientSolution[2].Vel, + md.results.TransientSolution[2].Pressure, + md.results.TransientSolution[2].Base, + md.results.TransientSolution[2].Surface, + md.results.TransientSolution[2].Thickness, + md.results.TransientSolution[2].GroundedArea, + md.results.TransientSolution[2].FloatingArea] Index: /issm/trunk-jpl/test/NightlyRun/test315.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test315.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test315.py (revision 23793) @@ -9,49 +9,47 @@ -md=triangle(model(),'../Exp/Square.exp',150000.) -md=setmask(md,'','') -md=parameterize(md,'../Par/SquareSheetConstrained.py') -md.extrude(5,1.2) -md=setflowequation(md,'SIA','all') -md.cluster=generic('name',gethostname(),'np',3) -md=solve(md,'Transient') +md = triangle(model(), '../Exp/Square.exp', 150000.) +md = setmask(md, '', '') +md = parameterize(md, '../Par/SquareSheetConstrained.py') +md.extrude(5, 1.2) +md = setflowequation(md, 'SIA', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'Transient') #Fields and tolerances to track changes -field_names =['Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsGroundediceMeltingRate1',\ - 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsGroundediceMeltingRate2',\ - 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsGroundediceMeltingRate3'] -field_tolerances=[1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,\ - 1e-10,1e-13,5e-13,5e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,\ - 1e-10,2e-13,5e-13,2e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13] -field_values=[\ - md.results.TransientSolution[0].Vx,\ - md.results.TransientSolution[0].Vy,\ - md.results.TransientSolution[0].Vz,\ - md.results.TransientSolution[0].Vel,\ - md.results.TransientSolution[0].Pressure,\ - md.results.TransientSolution[0].Base,\ - md.results.TransientSolution[0].Surface,\ - md.results.TransientSolution[0].Thickness,\ - md.results.TransientSolution[0].Temperature,\ - md.results.TransientSolution[0].BasalforcingsGroundediceMeltingRate,\ - md.results.TransientSolution[1].Vx,\ - md.results.TransientSolution[1].Vy,\ - md.results.TransientSolution[1].Vz,\ - md.results.TransientSolution[1].Vel,\ - md.results.TransientSolution[1].Pressure,\ - md.results.TransientSolution[1].Base,\ - md.results.TransientSolution[1].Surface,\ - md.results.TransientSolution[1].Thickness,\ - md.results.TransientSolution[1].Temperature,\ - md.results.TransientSolution[1].BasalforcingsGroundediceMeltingRate,\ - md.results.TransientSolution[2].Vx,\ - md.results.TransientSolution[2].Vy,\ - md.results.TransientSolution[2].Vz,\ - md.results.TransientSolution[2].Vel,\ - md.results.TransientSolution[2].Pressure,\ - md.results.TransientSolution[2].Base,\ - md.results.TransientSolution[2].Surface,\ - md.results.TransientSolution[2].Thickness,\ - md.results.TransientSolution[2].Temperature,\ - md.results.TransientSolution[2].BasalforcingsGroundediceMeltingRate,\ - ] +field_names = ['Vx1', 'Vy1', 'Vz1', 'Vel1', 'Pressure1', 'Bed1', 'Surface1', 'Thickness1', 'Temperature1', 'BasalforcingsGroundediceMeltingRate1', + 'Vx2', 'Vy2', 'Vz2', 'Vel2', 'Pressure2', 'Bed2', 'Surface2', 'Thickness2', 'Temperature2', 'BasalforcingsGroundediceMeltingRate2', + 'Vx3', 'Vy3', 'Vz3', 'Vel3', 'Pressure3', 'Bed3', 'Surface3', 'Thickness3', 'Temperature3', 'BasalforcingsGroundediceMeltingRate3'] +field_tolerances = [1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, + 1e-10, 1e-13, 5e-13, 5e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, + 1e-10, 2e-13, 5e-13, 2e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13] +field_values = [md.results.TransientSolution[0].Vx, + md.results.TransientSolution[0].Vy, + md.results.TransientSolution[0].Vz, + md.results.TransientSolution[0].Vel, + md.results.TransientSolution[0].Pressure, + md.results.TransientSolution[0].Base, + md.results.TransientSolution[0].Surface, + md.results.TransientSolution[0].Thickness, + md.results.TransientSolution[0].Temperature, + md.results.TransientSolution[0].BasalforcingsGroundediceMeltingRate, + md.results.TransientSolution[1].Vx, + md.results.TransientSolution[1].Vy, + md.results.TransientSolution[1].Vz, + md.results.TransientSolution[1].Vel, + md.results.TransientSolution[1].Pressure, + md.results.TransientSolution[1].Base, + md.results.TransientSolution[1].Surface, + md.results.TransientSolution[1].Thickness, + md.results.TransientSolution[1].Temperature, + md.results.TransientSolution[1].BasalforcingsGroundediceMeltingRate, + md.results.TransientSolution[2].Vx, + md.results.TransientSolution[2].Vy, + md.results.TransientSolution[2].Vz, + md.results.TransientSolution[2].Vel, + md.results.TransientSolution[2].Pressure, + md.results.TransientSolution[2].Base, + md.results.TransientSolution[2].Surface, + md.results.TransientSolution[2].Thickness, + md.results.TransientSolution[2].Temperature, + md.results.TransientSolution[2].BasalforcingsGroundediceMeltingRate] Index: /issm/trunk-jpl/test/NightlyRun/test316.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test316.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test316.py (revision 23793) @@ -9,37 +9,35 @@ -md=triangle(model(),'../Exp/Square.exp',150000.) -md=setmask(md,'','') -md=parameterize(md,'../Par/SquareSheetConstrained.py') -md=setflowequation(md,'SSA','all') -md.cluster=generic('name',gethostname(),'np',3) -md=solve(md,'Transient') +md = triangle(model(), '../Exp/Square.exp', 150000.) +md = setmask(md, '', '') +md = parameterize(md, '../Par/SquareSheetConstrained.py') +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'Transient') #Fields and tolerances to track changes -field_names =['Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3'] -field_tolerances=[1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,\ - 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,\ - 2e-13,1e-13,1e-13,2e-13,1e-13,1e-13,1e-13] -field_values=[\ - md.results.TransientSolution[0].Vx,\ - md.results.TransientSolution[0].Vy,\ - md.results.TransientSolution[0].Vel,\ - md.results.TransientSolution[0].Pressure,\ - md.results.TransientSolution[0].Base,\ - md.results.TransientSolution[0].Surface,\ - md.results.TransientSolution[0].Thickness,\ - md.results.TransientSolution[1].Vx,\ - md.results.TransientSolution[1].Vy,\ - md.results.TransientSolution[1].Vel,\ - md.results.TransientSolution[1].Pressure,\ - md.results.TransientSolution[1].Base,\ - md.results.TransientSolution[1].Surface,\ - md.results.TransientSolution[1].Thickness,\ - md.results.TransientSolution[2].Vx,\ - md.results.TransientSolution[2].Vy,\ - md.results.TransientSolution[2].Vel,\ - md.results.TransientSolution[2].Pressure,\ - md.results.TransientSolution[2].Base,\ - md.results.TransientSolution[2].Surface,\ - md.results.TransientSolution[2].Thickness,\ - ] +field_names = ['Vx1', 'Vy1', 'Vel1', 'Pressure1', 'Bed1', 'Surface1', 'Thickness1', 'Vx2', 'Vy2', 'Vel2', 'Pressure2', 'Bed2', 'Surface2', 'Thickness2', 'Vx3', 'Vy3', 'Vel3', 'Pressure3', 'Bed3', 'Surface3', 'Thickness3'] +field_tolerances = [1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, + 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, + 2e-13, 1e-13, 1e-13, 2e-13, 1e-13, 1e-13, 1e-13] +field_values = [md.results.TransientSolution[0].Vx, + md.results.TransientSolution[0].Vy, + md.results.TransientSolution[0].Vel, + md.results.TransientSolution[0].Pressure, + md.results.TransientSolution[0].Base, + md.results.TransientSolution[0].Surface, + md.results.TransientSolution[0].Thickness, + md.results.TransientSolution[1].Vx, + md.results.TransientSolution[1].Vy, + md.results.TransientSolution[1].Vel, + md.results.TransientSolution[1].Pressure, + md.results.TransientSolution[1].Base, + md.results.TransientSolution[1].Surface, + md.results.TransientSolution[1].Thickness, + md.results.TransientSolution[2].Vx, + md.results.TransientSolution[2].Vy, + md.results.TransientSolution[2].Vel, + md.results.TransientSolution[2].Pressure, + md.results.TransientSolution[2].Base, + md.results.TransientSolution[2].Surface, + md.results.TransientSolution[2].Thickness] Index: /issm/trunk-jpl/test/NightlyRun/test317.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test317.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test317.py (revision 23793) @@ -9,63 +9,61 @@ -md=triangle(model(),'../Exp/Square.exp',200000.) -md=setmask(md,'','') -md=parameterize(md,'../Par/SquareSheetConstrained.py') -md.basalforcings.groundedice_melting_rate[:]=5. -md.extrude(3,1.) -md=setflowequation(md,'HO','all') -md.cluster=generic('name',gethostname(),'np',3) -md.transient.requested_outputs=['default','GroundedArea','FloatingArea','TotalFloatingBmb','TotalGroundedBmb'] -md=solve(md,'Transient') +md = triangle(model(), '../Exp/Square.exp', 200000.) +md = setmask(md, '', '') +md = parameterize(md, '../Par/SquareSheetConstrained.py') +md.basalforcings.groundedice_melting_rate[:] = 5. +md.extrude(3, 1.) +md = setflowequation(md, 'HO', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) +md.transient.requested_outputs = ['default', 'GroundedArea', 'FloatingArea', 'TotalFloatingBmb', 'TotalGroundedBmb'] +md = solve(md, 'Transient') #Fields and tolerances to track changes -field_names =['Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsGroundediceMeltingRate1','GroundedArea1','FloatingArea1','TotalFloatingBmb1','TotalGroundedBmb1'\ - 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsGroundediceMeltingRate2','GroundedArea2','FloatingArea2','TotalFloatingBmb2','TotalGroundedBmb2',\ - 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsGroundediceMeltingRate3','GroundedArea3','FloatingArea3','TotalFloatingBmb2','TotalGroundedBmb2'] -field_tolerances=[1e-09,1e-09,1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-12,1e-12,1e-12,1e-12,\ - 1e-09,1e-09,1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-12,1e-12,1e-12,1e-12,\ - 1e-09,5e-10,1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-12,1e-12,1e-12,1e-12] -field_values=[\ - md.results.TransientSolution[0].Vx,\ - md.results.TransientSolution[0].Vy,\ - md.results.TransientSolution[0].Vz,\ - md.results.TransientSolution[0].Vel,\ - md.results.TransientSolution[0].Pressure,\ - md.results.TransientSolution[0].Base,\ - md.results.TransientSolution[0].Surface,\ - md.results.TransientSolution[0].Thickness,\ - md.results.TransientSolution[0].Temperature,\ - md.results.TransientSolution[0].BasalforcingsGroundediceMeltingRate,\ - md.results.TransientSolution[0].GroundedArea,\ - md.results.TransientSolution[0].FloatingArea,\ - md.results.TransientSolution[0].TotalFloatingBmb,\ - md.results.TransientSolution[0].TotalGroundedBmb,\ - md.results.TransientSolution[1].Vx,\ - md.results.TransientSolution[1].Vy,\ - md.results.TransientSolution[1].Vz,\ - md.results.TransientSolution[1].Vel,\ - md.results.TransientSolution[1].Pressure,\ - md.results.TransientSolution[1].Base,\ - md.results.TransientSolution[1].Surface,\ - md.results.TransientSolution[1].Thickness,\ - md.results.TransientSolution[1].Temperature,\ - md.results.TransientSolution[1].BasalforcingsGroundediceMeltingRate,\ - md.results.TransientSolution[1].GroundedArea,\ - md.results.TransientSolution[1].FloatingArea,\ - md.results.TransientSolution[1].TotalFloatingBmb,\ - md.results.TransientSolution[1].TotalGroundedBmb,\ - md.results.TransientSolution[2].Vx,\ - md.results.TransientSolution[2].Vy,\ - md.results.TransientSolution[2].Vz,\ - md.results.TransientSolution[2].Vel,\ - md.results.TransientSolution[2].Pressure,\ - md.results.TransientSolution[2].Base,\ - md.results.TransientSolution[2].Surface,\ - md.results.TransientSolution[2].Thickness,\ - md.results.TransientSolution[2].Temperature,\ - md.results.TransientSolution[2].BasalforcingsGroundediceMeltingRate,\ - md.results.TransientSolution[2].GroundedArea,\ - md.results.TransientSolution[2].FloatingArea,\ - md.results.TransientSolution[2].TotalFloatingBmb,\ - md.results.TransientSolution[2].TotalGroundedBmb,\ - ] +field_names = ['Vx1', 'Vy1', 'Vz1', 'Vel1', 'Pressure1', 'Bed1', 'Surface1', 'Thickness1', 'Temperature1', 'BasalforcingsGroundediceMeltingRate1', 'GroundedArea1', 'FloatingArea1', 'TotalFloatingBmb1', 'TotalGroundedBmb1' + 'Vx2', 'Vy2', 'Vz2', 'Vel2', 'Pressure2', 'Bed2', 'Surface2', 'Thickness2', 'Temperature2', 'BasalforcingsGroundediceMeltingRate2', 'GroundedArea2', 'FloatingArea2', 'TotalFloatingBmb2', 'TotalGroundedBmb2', + 'Vx3', 'Vy3', 'Vz3', 'Vel3', 'Pressure3', 'Bed3', 'Surface3', 'Thickness3', 'Temperature3', 'BasalforcingsGroundediceMeltingRate3', 'GroundedArea3', 'FloatingArea3', 'TotalFloatingBmb2', 'TotalGroundedBmb2'] +field_tolerances = [1e-09, 1e-09, 1e-09, 1e-09, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10, 1e-12, 1e-12, 1e-12, 1e-12, + 1e-09, 1e-09, 1e-09, 1e-09, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10, 1e-12, 1e-12, 1e-12, 1e-12, + 1e-09, 5e-10, 1e-09, 1e-09, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10, 1e-12, 1e-12, 1e-12, 1e-12] +field_values = [md.results.TransientSolution[0].Vx, + md.results.TransientSolution[0].Vy, + md.results.TransientSolution[0].Vz, + md.results.TransientSolution[0].Vel, + md.results.TransientSolution[0].Pressure, + md.results.TransientSolution[0].Base, + md.results.TransientSolution[0].Surface, + md.results.TransientSolution[0].Thickness, + md.results.TransientSolution[0].Temperature, + md.results.TransientSolution[0].BasalforcingsGroundediceMeltingRate, + md.results.TransientSolution[0].GroundedArea, + md.results.TransientSolution[0].FloatingArea, + md.results.TransientSolution[0].TotalFloatingBmb, + md.results.TransientSolution[0].TotalGroundedBmb, + md.results.TransientSolution[1].Vx, + md.results.TransientSolution[1].Vy, + md.results.TransientSolution[1].Vz, + md.results.TransientSolution[1].Vel, + md.results.TransientSolution[1].Pressure, + md.results.TransientSolution[1].Base, + md.results.TransientSolution[1].Surface, + md.results.TransientSolution[1].Thickness, + md.results.TransientSolution[1].Temperature, + md.results.TransientSolution[1].BasalforcingsGroundediceMeltingRate, + md.results.TransientSolution[1].GroundedArea, + md.results.TransientSolution[1].FloatingArea, + md.results.TransientSolution[1].TotalFloatingBmb, + md.results.TransientSolution[1].TotalGroundedBmb, + md.results.TransientSolution[2].Vx, + md.results.TransientSolution[2].Vy, + md.results.TransientSolution[2].Vz, + md.results.TransientSolution[2].Vel, + md.results.TransientSolution[2].Pressure, + md.results.TransientSolution[2].Base, + md.results.TransientSolution[2].Surface, + md.results.TransientSolution[2].Thickness, + md.results.TransientSolution[2].Temperature, + md.results.TransientSolution[2].BasalforcingsGroundediceMeltingRate, + md.results.TransientSolution[2].GroundedArea, + md.results.TransientSolution[2].FloatingArea, + md.results.TransientSolution[2].TotalFloatingBmb, + md.results.TransientSolution[2].TotalGroundedBmb] Index: /issm/trunk-jpl/test/NightlyRun/test318.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test318.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test318.py (revision 23793) @@ -9,23 +9,21 @@ -md=triangle(model(),'../Exp/Square.exp',180000.) -md=setmask(md,'','') -md=parameterize(md,'../Par/SquareSheetConstrained.py') -md.extrude(4,1.) -md=setflowequation(md,'SIA','all') -md.cluster=generic('name',gethostname(),'np',3) -md.timestepping.time_step=0 -md=solve(md,'Steadystate') +md = triangle(model(), '../Exp/Square.exp', 180000.) +md = setmask(md, '', '') +md = parameterize(md, '../Par/SquareSheetConstrained.py') +md.extrude(4, 1.) +md = setflowequation(md, 'SIA', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) +md.timestepping.time_step = 0 +md = solve(md, 'Steadystate') #Fields and tolerances to track changes -field_names =['Vx','Vy','Vz','Vel','Pressure','Temperature','BasalforcingsGroundediceMeltingRate'] -field_tolerances=[1e-13,1e-13,2.6e-10,1e-10,1e-13,1e-11,1e-6] -field_values=[\ - md.results.SteadystateSolution.Vx,\ - md.results.SteadystateSolution.Vy,\ - md.results.SteadystateSolution.Vz,\ - md.results.SteadystateSolution.Vel,\ - md.results.SteadystateSolution.Pressure,\ - md.results.SteadystateSolution.Temperature,\ - md.results.SteadystateSolution.BasalforcingsGroundediceMeltingRate,\ - ] +field_names = ['Vx', 'Vy', 'Vz', 'Vel', 'Pressure', 'Temperature', 'BasalforcingsGroundediceMeltingRate'] +field_tolerances = [1e-13, 1e-13, 2.6e-10, 1e-10, 1e-13, 1e-11, 1e-6] +field_values = [md.results.SteadystateSolution.Vx, + md.results.SteadystateSolution.Vy, + md.results.SteadystateSolution.Vz, + md.results.SteadystateSolution.Vel, + md.results.SteadystateSolution.Pressure, + md.results.SteadystateSolution.Temperature, + md.results.SteadystateSolution.BasalforcingsGroundediceMeltingRate] Index: /issm/trunk-jpl/test/NightlyRun/test319.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test319.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test319.py (revision 23793) @@ -10,37 +10,36 @@ -md=triangle(model(),'../Exp/Square.exp',200000.) -md=setmask(md,'','') -md=parameterize(md,'../Par/SquareSheetConstrained.py') -md=setflowequation(md,'SSA','all') +md = triangle(model(), '../Exp/Square.exp', 200000.) +md = setmask(md, '', '') +md = parameterize(md, '../Par/SquareSheetConstrained.py') +md = setflowequation(md, 'SSA', 'all') #control parameters -md.inversion.iscontrol=1 -md.inversion.control_parameters=['FrictionCoefficient'] -md.inversion.min_parameters=1.*np.ones((md.mesh.numberofvertices,len(md.inversion.control_parameters))) -md.inversion.max_parameters=200.*np.ones((md.mesh.numberofvertices,len(md.inversion.control_parameters))) -md.inversion.nsteps=2 -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.gradient_scaling=3.*np.ones((md.inversion.nsteps,len(md.inversion.control_parameters))) -md.inversion.maxiter_per_step=2*np.ones(md.inversion.nsteps) -md.inversion.step_threshold=0.3*np.ones(md.inversion.nsteps) -md.inversion.vx_obs=md.initialization.vx -md.inversion.vy_obs=md.initialization.vy -md.cluster=generic('name',gethostname(),'np',3) -md=solve(md,'Stressbalance') +md.inversion.iscontrol = 1 +md.inversion.control_parameters = ['FrictionCoefficient'] +md.inversion.min_parameters = 1. * np.ones((md.mesh.numberofvertices, len(md.inversion.control_parameters))) +md.inversion.max_parameters = 200. * np.ones((md.mesh.numberofvertices, len(md.inversion.control_parameters))) +md.inversion.nsteps = 2 +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.gradient_scaling = 3. * np.ones((md.inversion.nsteps, len(md.inversion.control_parameters))) +md.inversion.maxiter_per_step = 2 * np.ones(md.inversion.nsteps) +md.inversion.step_threshold = 0.3 * np.ones(md.inversion.nsteps) +md.inversion.vx_obs = md.initialization.vx +md.inversion.vy_obs = md.initialization.vy + +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'Stressbalance') #Fields and tolerances to track changes -field_names =['Gradient','Misfits','FrictionCoefficient','Pressure','Vel','Vx','Vy'] -field_tolerances=[1e-12,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13] -field_values=[\ - md.results.StressbalanceSolution.Gradient1,\ - md.results.StressbalanceSolution.J,\ - md.results.StressbalanceSolution.FrictionCoefficient,\ - md.results.StressbalanceSolution.Pressure,\ - md.results.StressbalanceSolution.Vel,\ - md.results.StressbalanceSolution.Vx,\ - md.results.StressbalanceSolution.Vy,\ -] +field_names = ['Gradient', 'Misfits', 'FrictionCoefficient', 'Pressure', 'Vel', 'Vx', 'Vy'] +field_tolerances = [1e-12, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13] +field_values = [md.results.StressbalanceSolution.Gradient1, + md.results.StressbalanceSolution.J, + md.results.StressbalanceSolution.FrictionCoefficient, + md.results.StressbalanceSolution.Pressure, + md.results.StressbalanceSolution.Vel, + md.results.StressbalanceSolution.Vx, + md.results.StressbalanceSolution.Vy] Index: /issm/trunk-jpl/test/NightlyRun/test320.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test320.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test320.py (revision 23793) @@ -10,38 +10,36 @@ -md=triangle(model(),'../Exp/Square.exp',200000.) -md=setmask(md,'','') -md=parameterize(md,'../Par/SquareSheetConstrained.py') -md.extrude(3,1.) -md=setflowequation(md,'SSA','all') +md = triangle(model(), '../Exp/Square.exp', 200000.) +md = setmask(md, '', '') +md = parameterize(md, '../Par/SquareSheetConstrained.py') +md.extrude(3, 1.) +md = setflowequation(md, 'SSA', 'all') #control parameters -md.inversion.iscontrol=1 -md.inversion.control_parameters=['FrictionCoefficient'] -md.inversion.min_parameters=1.*np.ones((md.mesh.numberofvertices,len(md.inversion.control_parameters))) -md.inversion.max_parameters=200.*np.ones((md.mesh.numberofvertices,len(md.inversion.control_parameters))) -md.inversion.nsteps=2 -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.gradient_scaling=3.*np.ones((md.inversion.nsteps,len(md.inversion.control_parameters))) -md.inversion.maxiter_per_step=2*np.ones(md.inversion.nsteps) -md.inversion.step_threshold=0.3*np.ones(md.inversion.nsteps) -md.inversion.vx_obs=md.initialization.vx -md.inversion.vy_obs=md.initialization.vy +md.inversion.iscontrol = 1 +md.inversion.control_parameters = ['FrictionCoefficient'] +md.inversion.min_parameters = 1. * np.ones((md.mesh.numberofvertices, len(md.inversion.control_parameters))) +md.inversion.max_parameters = 200. * np.ones((md.mesh.numberofvertices, len(md.inversion.control_parameters))) +md.inversion.nsteps = 2 +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.gradient_scaling = 3. * np.ones((md.inversion.nsteps, len(md.inversion.control_parameters))) +md.inversion.maxiter_per_step = 2 * np.ones(md.inversion.nsteps) +md.inversion.step_threshold = 0.3 * np.ones(md.inversion.nsteps) +md.inversion.vx_obs = md.initialization.vx +md.inversion.vy_obs = md.initialization.vy -md.cluster=generic('name',gethostname(),'np',3) -md=solve(md,'Stressbalance') +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'Stressbalance') #Fields and tolerances to track changes -field_names =['Gradient','Misfits','FrictionCoefficient','Pressure','Vel','Vx','Vy'] -field_tolerances=[1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12] -field_values=[\ - md.results.StressbalanceSolution.Gradient1,\ - md.results.StressbalanceSolution.J,\ - md.results.StressbalanceSolution.FrictionCoefficient,\ - md.results.StressbalanceSolution.Pressure,\ - md.results.StressbalanceSolution.Vel,\ - md.results.StressbalanceSolution.Vx,\ - md.results.StressbalanceSolution.Vy,\ -] +field_names = ['Gradient', 'Misfits', 'FrictionCoefficient', 'Pressure', 'Vel', 'Vx', 'Vy'] +field_tolerances = [1e-12, 1e-12, 1e-12, 1e-12, 1e-12, 1e-12, 1e-12, 1e-12, 1e-12, 1e-12] +field_values = [md.results.StressbalanceSolution.Gradient1, + md.results.StressbalanceSolution.J, + md.results.StressbalanceSolution.FrictionCoefficient, + md.results.StressbalanceSolution.Pressure, + md.results.StressbalanceSolution.Vel, + md.results.StressbalanceSolution.Vx, + md.results.StressbalanceSolution.Vy] Index: /issm/trunk-jpl/test/NightlyRun/test321.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test321.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test321.py (revision 23793) @@ -10,38 +10,36 @@ -md=triangle(model(),'../Exp/Square.exp',200000.) -md=setmask(md,'','') -md=parameterize(md,'../Par/SquareSheetConstrained.py') -md.extrude(3,1.) -md=setflowequation(md,'HO','all') +md = triangle(model(), '../Exp/Square.exp', 200000.) +md = setmask(md, '', '') +md = parameterize(md, '../Par/SquareSheetConstrained.py') +md.extrude(3, 1.) +md = setflowequation(md, 'HO', 'all') #control parameters -md.inversion.iscontrol=1 -md.inversion.control_parameters=['FrictionCoefficient'] -md.inversion.min_parameters=1.*np.ones((md.mesh.numberofvertices,len(md.inversion.control_parameters))) -md.inversion.max_parameters=200.*np.ones((md.mesh.numberofvertices,len(md.inversion.control_parameters))) -md.inversion.nsteps=2 -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.gradient_scaling=3.*np.ones((md.inversion.nsteps,len(md.inversion.control_parameters))) -md.inversion.maxiter_per_step=2*np.ones(md.inversion.nsteps) -md.inversion.step_threshold=0.3*np.ones(md.inversion.nsteps) -md.inversion.vx_obs=md.initialization.vx -md.inversion.vy_obs=md.initialization.vy +md.inversion.iscontrol = 1 +md.inversion.control_parameters = ['FrictionCoefficient'] +md.inversion.min_parameters = 1. * np.ones((md.mesh.numberofvertices, len(md.inversion.control_parameters))) +md.inversion.max_parameters = 200. * np.ones((md.mesh.numberofvertices, len(md.inversion.control_parameters))) +md.inversion.nsteps = 2 +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.gradient_scaling = 3. * np.ones((md.inversion.nsteps, len(md.inversion.control_parameters))) +md.inversion.maxiter_per_step = 2 * np.ones(md.inversion.nsteps) +md.inversion.step_threshold = 0.3 * np.ones(md.inversion.nsteps) +md.inversion.vx_obs = md.initialization.vx +md.inversion.vy_obs = md.initialization.vy -md.cluster=generic('name',gethostname(),'np',3) -md=solve(md,'Stressbalance') +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'Stressbalance') #Fields and tolerances to track changes -field_names =['Gradient','Misfits','FrictionCoefficient','Pressure','Vel','Vx','Vy'] -field_tolerances=[1e-08,1e-07,1e-10,1e-10,1e-09,1e-09,1e-09] -field_values=[\ - md.results.StressbalanceSolution.Gradient1,\ - md.results.StressbalanceSolution.J,\ - md.results.StressbalanceSolution.FrictionCoefficient,\ - md.results.StressbalanceSolution.Pressure,\ - md.results.StressbalanceSolution.Vel,\ - md.results.StressbalanceSolution.Vx,\ - md.results.StressbalanceSolution.Vy,\ -] +field_names = ['Gradient', 'Misfits', 'FrictionCoefficient', 'Pressure', 'Vel', 'Vx', 'Vy'] +field_tolerances = [1e-08, 1e-07, 1e-10, 1e-10, 1e-09, 1e-09, 1e-09] +field_values = [md.results.StressbalanceSolution.Gradient1, + md.results.StressbalanceSolution.J, + md.results.StressbalanceSolution.FrictionCoefficient, + md.results.StressbalanceSolution.Pressure, + md.results.StressbalanceSolution.Vel, + md.results.StressbalanceSolution.Vx, + md.results.StressbalanceSolution.Vy] Index: /issm/trunk-jpl/test/NightlyRun/test322.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test322.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test322.py (revision 23793) @@ -10,38 +10,36 @@ -md=triangle(model(),'../Exp/Square.exp',200000.) -md=setmask(md,'','') -md=parameterize(md,'../Par/SquareSheetConstrained.py') -md.extrude(3,1.) -md=setflowequation(md,'FS','all') +md = triangle(model(), '../Exp/Square.exp', 200000.) +md = setmask(md, '', '') +md = parameterize(md, '../Par/SquareSheetConstrained.py') +md.extrude(3, 1.) +md = setflowequation(md, 'FS', 'all') #control parameters -md.inversion.iscontrol=1 -md.inversion.control_parameters=['FrictionCoefficient'] -md.inversion.min_parameters=1.*np.ones((md.mesh.numberofvertices,len(md.inversion.control_parameters))) -md.inversion.max_parameters=200.*np.ones((md.mesh.numberofvertices,len(md.inversion.control_parameters))) -md.inversion.nsteps=2 -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.gradient_scaling=3.*np.ones((md.inversion.nsteps,len(md.inversion.control_parameters))) -md.inversion.maxiter_per_step=2*np.ones(md.inversion.nsteps) -md.inversion.step_threshold=0.3*np.ones(md.inversion.nsteps) -md.inversion.vx_obs=md.initialization.vx -md.inversion.vy_obs=md.initialization.vy +md.inversion.iscontrol = 1 +md.inversion.control_parameters = ['FrictionCoefficient'] +md.inversion.min_parameters = 1. * np.ones((md.mesh.numberofvertices, len(md.inversion.control_parameters))) +md.inversion.max_parameters = 200. * np.ones((md.mesh.numberofvertices, len(md.inversion.control_parameters))) +md.inversion.nsteps = 2 +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.gradient_scaling = 3. * np.ones((md.inversion.nsteps, len(md.inversion.control_parameters))) +md.inversion.maxiter_per_step = 2 * np.ones(md.inversion.nsteps) +md.inversion.step_threshold = 0.3 * np.ones(md.inversion.nsteps) +md.inversion.vx_obs = md.initialization.vx +md.inversion.vy_obs = md.initialization.vy -md.cluster=generic('name',gethostname(),'np',3) -md=solve(md,'Stressbalance') +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'Stressbalance') #Fields and tolerances to track changes -field_names =['Gradient','Misfits','FrictionCoefficient','Pressure','Vel','Vx','Vy'] -field_tolerances=[5e-05,1e-07,2e-06,8e-08,8e-07,9e-07,8e-07] -field_values=[\ - md.results.StressbalanceSolution.Gradient1,\ - md.results.StressbalanceSolution.J,\ - md.results.StressbalanceSolution.FrictionCoefficient,\ - md.results.StressbalanceSolution.Pressure,\ - md.results.StressbalanceSolution.Vel,\ - md.results.StressbalanceSolution.Vx,\ - md.results.StressbalanceSolution.Vy,\ -] +field_names = ['Gradient', 'Misfits', 'FrictionCoefficient', 'Pressure', 'Vel', 'Vx', 'Vy'] +field_tolerances = [5e-05, 1e-07, 2e-06, 8e-08, 8e-07, 9e-07, 8e-07] +field_values = [md.results.StressbalanceSolution.Gradient1, + md.results.StressbalanceSolution.J, + md.results.StressbalanceSolution.FrictionCoefficient, + md.results.StressbalanceSolution.Pressure, + md.results.StressbalanceSolution.Vel, + md.results.StressbalanceSolution.Vx, + md.results.StressbalanceSolution.Vy] Index: /issm/trunk-jpl/test/NightlyRun/test323.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test323.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test323.py (revision 23793) @@ -1,4 +1,3 @@ #Test Name: SquareSheetConstrainedTranCflSSA2d -import numpy as np from model import * from socket import gethostname @@ -10,38 +9,36 @@ -md=triangle(model(),'../Exp/Square.exp',150000.) -md=setmask(md,'','') -md=parameterize(md,'../Par/SquareSheetConstrained.py') -md=setflowequation(md,'SSA','all') -md.cluster=generic('name',gethostname(),'np',3) -md.timestepping = timesteppingadaptive(md.timestepping); -md.timestepping.time_step_max = 10000.; -md.timestepping.final_time=1120. -md=solve(md,'Transient') +md = triangle(model(), '../Exp/Square.exp', 150000.) +md = setmask(md, '', '') +md = parameterize(md, '../Par/SquareSheetConstrained.py') +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) +md.timestepping = timesteppingadaptive(md.timestepping) +md.timestepping.time_step_max = 10000. +md.timestepping.final_time = 1120. +md = solve(md, 'Transient') #Fields and tolerances to track changes -field_names =['Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3'] -field_tolerances=[1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-12,1e-12] -field_values=[\ - md.results.TransientSolution[0].Vx,\ - md.results.TransientSolution[0].Vy,\ - md.results.TransientSolution[0].Vel,\ - md.results.TransientSolution[0].Pressure,\ - md.results.TransientSolution[0].Base,\ - md.results.TransientSolution[0].Surface,\ - md.results.TransientSolution[0].Thickness,\ - md.results.TransientSolution[1].Vx,\ - md.results.TransientSolution[1].Vy,\ - md.results.TransientSolution[1].Vel,\ - md.results.TransientSolution[1].Pressure,\ - md.results.TransientSolution[1].Base,\ - md.results.TransientSolution[1].Surface,\ - md.results.TransientSolution[1].Thickness,\ - md.results.TransientSolution[2].Vx,\ - md.results.TransientSolution[2].Vy,\ - md.results.TransientSolution[2].Vel,\ - md.results.TransientSolution[2].Pressure,\ - md.results.TransientSolution[2].Base,\ - md.results.TransientSolution[2].Surface,\ - md.results.TransientSolution[2].Thickness,\ - ] +field_names = ['Vx1', 'Vy1', 'Vel1', 'Pressure1', 'Bed1', 'Surface1', 'Thickness1', 'Vx2', 'Vy2', 'Vel2', 'Pressure2', 'Bed2', 'Surface2', 'Thickness2', 'Vx3', 'Vy3', 'Vel3', 'Pressure3', 'Bed3', 'Surface3', 'Thickness3'] +field_tolerances = [1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-12, 1e-12] +field_values = [md.results.TransientSolution[0].Vx, + md.results.TransientSolution[0].Vy, + md.results.TransientSolution[0].Vel, + md.results.TransientSolution[0].Pressure, + md.results.TransientSolution[0].Base, + md.results.TransientSolution[0].Surface, + md.results.TransientSolution[0].Thickness, + md.results.TransientSolution[1].Vx, + md.results.TransientSolution[1].Vy, + md.results.TransientSolution[1].Vel, + md.results.TransientSolution[1].Pressure, + md.results.TransientSolution[1].Base, + md.results.TransientSolution[1].Surface, + md.results.TransientSolution[1].Thickness, + md.results.TransientSolution[2].Vx, + md.results.TransientSolution[2].Vy, + md.results.TransientSolution[2].Vel, + md.results.TransientSolution[2].Pressure, + md.results.TransientSolution[2].Base, + md.results.TransientSolution[2].Surface, + md.results.TransientSolution[2].Thickness] Index: /issm/trunk-jpl/test/NightlyRun/test324.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test324.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test324.py (revision 23793) @@ -1,4 +1,3 @@ #Test Name: SquareSheetConstrainedTranCflSIA3d -import numpy as np from model import * from socket import gethostname @@ -10,52 +9,50 @@ -md=triangle(model(),'../Exp/Square.exp',150000.) -md=setmask(md,'','') -md=parameterize(md,'../Par/SquareSheetConstrained.py') -md.extrude(5,1.2) -md=setflowequation(md,'SIA','all') -md.cluster=generic('name',gethostname(),'np',3) -md.timestepping = timesteppingadaptive(md.timestepping); -md.timestepping.time_step_max = 10000.; -md.timestepping.final_time=16000. -md=solve(md,'Transient') +md = triangle(model(), '../Exp/Square.exp', 150000.) +md = setmask(md, '', '') +md = parameterize(md, '../Par/SquareSheetConstrained.py') +md.extrude(5, 1.2) +md = setflowequation(md, 'SIA', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) +md.timestepping = timesteppingadaptive(md.timestepping) +md.timestepping.time_step_max = 10000. +md.timestepping.final_time = 16000. +md = solve(md, 'Transient') #Fields and tolerances to track changes -field_names =['Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsGroundediceMeltingRate1',\ - 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsGroundediceMeltingRate2',\ - 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsGroundediceMeltingRate3'] -field_tolerances=[1e-13, 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,\ - 5e-11,1e-13,5e-13,5e-11,1e-13,1e-13,5e-13,1e-13,1e-13,1e-13,\ - 1e-10, 1e-12,1e-12,1e-12,1e-13,1e-13,1e-12,1e-12,1e-13,1e-13] -field_values=[\ - md.results.TransientSolution[0].Vx,\ - md.results.TransientSolution[0].Vy,\ - md.results.TransientSolution[0].Vz,\ - md.results.TransientSolution[0].Vel,\ - md.results.TransientSolution[0].Pressure,\ - md.results.TransientSolution[0].Base,\ - md.results.TransientSolution[0].Surface,\ - md.results.TransientSolution[0].Thickness,\ - md.results.TransientSolution[0].Temperature,\ - md.results.TransientSolution[0].BasalforcingsGroundediceMeltingRate,\ - md.results.TransientSolution[1].Vx,\ - md.results.TransientSolution[1].Vy,\ - md.results.TransientSolution[1].Vz,\ - md.results.TransientSolution[1].Vel,\ - md.results.TransientSolution[1].Pressure,\ - md.results.TransientSolution[1].Base,\ - md.results.TransientSolution[1].Surface,\ - md.results.TransientSolution[1].Thickness,\ - md.results.TransientSolution[1].Temperature,\ - md.results.TransientSolution[1].BasalforcingsGroundediceMeltingRate,\ - md.results.TransientSolution[2].Vx,\ - md.results.TransientSolution[2].Vy,\ - md.results.TransientSolution[2].Vz,\ - md.results.TransientSolution[2].Vel,\ - md.results.TransientSolution[2].Pressure,\ - md.results.TransientSolution[2].Base,\ - md.results.TransientSolution[2].Surface,\ - md.results.TransientSolution[2].Thickness,\ - md.results.TransientSolution[2].Temperature,\ - md.results.TransientSolution[2].BasalforcingsGroundediceMeltingRate,\ - ] +field_names = ['Vx1', 'Vy1', 'Vz1', 'Vel1', 'Pressure1', 'Bed1', 'Surface1', 'Thickness1', 'Temperature1', 'BasalforcingsGroundediceMeltingRate1', + 'Vx2', 'Vy2', 'Vz2', 'Vel2', 'Pressure2', 'Bed2', 'Surface2', 'Thickness2', 'Temperature2', 'BasalforcingsGroundediceMeltingRate2', + 'Vx3', 'Vy3', 'Vz3', 'Vel3', 'Pressure3', 'Bed3', 'Surface3', 'Thickness3', 'Temperature3', 'BasalforcingsGroundediceMeltingRate3'] +field_tolerances = [1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, + 5e-11, 1e-13, 5e-13, 5e-11, 1e-13, 1e-13, 5e-13, 1e-13, 1e-13, 1e-13, + 1e-10, 1e-12, 1e-12, 1e-12, 1e-13, 1e-13, 1e-12, 1e-12, 1e-13, 1e-13] +field_values = [md.results.TransientSolution[0].Vx, + md.results.TransientSolution[0].Vy, + md.results.TransientSolution[0].Vz, + md.results.TransientSolution[0].Vel, + md.results.TransientSolution[0].Pressure, + md.results.TransientSolution[0].Base, + md.results.TransientSolution[0].Surface, + md.results.TransientSolution[0].Thickness, + md.results.TransientSolution[0].Temperature, + md.results.TransientSolution[0].BasalforcingsGroundediceMeltingRate, + md.results.TransientSolution[1].Vx, + md.results.TransientSolution[1].Vy, + md.results.TransientSolution[1].Vz, + md.results.TransientSolution[1].Vel, + md.results.TransientSolution[1].Pressure, + md.results.TransientSolution[1].Base, + md.results.TransientSolution[1].Surface, + md.results.TransientSolution[1].Thickness, + md.results.TransientSolution[1].Temperature, + md.results.TransientSolution[1].BasalforcingsGroundediceMeltingRate, + md.results.TransientSolution[2].Vx, + md.results.TransientSolution[2].Vy, + md.results.TransientSolution[2].Vz, + md.results.TransientSolution[2].Vel, + md.results.TransientSolution[2].Pressure, + md.results.TransientSolution[2].Base, + md.results.TransientSolution[2].Surface, + md.results.TransientSolution[2].Thickness, + md.results.TransientSolution[2].Temperature, + md.results.TransientSolution[2].BasalforcingsGroundediceMeltingRate] Index: /issm/trunk-jpl/test/NightlyRun/test325.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test325.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test325.py (revision 23793) @@ -10,24 +10,22 @@ -md=triangle(model(),'../Exp/Square.exp',180000.) -md=setmask(md,'','') -md=parameterize(md,'../Par/SquareSheetConstrained.py') -md.extrude(3,1.) -md=setflowequation(md,'SSA','all') -md.timestepping.time_step=0. -md.initialization.waterfraction=np.zeros((md.mesh.numberofvertices)) -md.initialization.watercolumn=np.zeros((md.mesh.numberofvertices)) +md = triangle(model(), '../Exp/Square.exp', 180000.) +md = setmask(md, '', '') +md = parameterize(md, '../Par/SquareSheetConstrained.py') +md.extrude(3, 1.) +md = setflowequation(md, 'SSA', 'all') +md.timestepping.time_step = 0. +md.initialization.waterfraction = np.zeros((md.mesh.numberofvertices)) +md.initialization.watercolumn = np.zeros((md.mesh.numberofvertices)) md.thermal.isenthalpy = 1 md.thermal.isdynamicbasalspc = 1 -md.cluster=generic('name',gethostname(),'np',3) -md=solve(md,'Thermal') +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'Thermal') #Fields and tolerances to track changes -field_names =['Enthalpy','Waterfraction','Temperature'] -field_tolerances=[1e-13,5e-13,1e-13] -field_values=[\ - md.results.ThermalSolution.Enthalpy,\ - md.results.ThermalSolution.Waterfraction,\ - md.results.ThermalSolution.Temperature,\ - ] +field_names = ['Enthalpy', 'Waterfraction', 'Temperature'] +field_tolerances = [1e-13, 5e-13, 1e-13] +field_values = [md.results.ThermalSolution.Enthalpy, + md.results.ThermalSolution.Waterfraction, + md.results.ThermalSolution.Temperature] Index: /issm/trunk-jpl/test/NightlyRun/test326.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test326.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test326.py (revision 23793) @@ -10,35 +10,33 @@ -md=triangle(model(),'../Exp/Square.exp',180000.) -md=setmask(md,'','') -md=parameterize(md,'../Par/SquareSheetConstrained.py') -md.extrude(3,1.) -md=setflowequation(md,'SSA','all') -md.cluster=generic('name',gethostname(),'np',3) -md.initialization.waterfraction=np.zeros((md.mesh.numberofvertices)) -md.initialization.watercolumn=np.zeros((md.mesh.numberofvertices)) -md.transient.isstressbalance=False -md.transient.ismasstransport=False -md.transient.issmb=True -md.transient.isthermal=True -md.transient.isgroundingline=False -md.thermal.isenthalpy=1 -md.thermal.isdynamicbasalspc=1 -md=solve(md,'Transient') +md = triangle(model(), '../Exp/Square.exp', 180000.) +md = setmask(md, '', '') +md = parameterize(md, '../Par/SquareSheetConstrained.py') +md.extrude(3, 1.) +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) +md.initialization.waterfraction = np.zeros((md.mesh.numberofvertices)) +md.initialization.watercolumn = np.zeros((md.mesh.numberofvertices)) +md.transient.isstressbalance = False +md.transient.ismasstransport = False +md.transient.issmb = True +md.transient.isthermal = True +md.transient.isgroundingline = False +md.thermal.isenthalpy = 1 +md.thermal.isdynamicbasalspc = 1 +md = solve(md, 'Transient') #Fields and tolerances to track changes -field_names =['Enthalpy1','Waterfraction1','Temperature1',\ - 'Enthalpy2','Waterfraction2','Temperature2',\ - 'Enthalpy3','Waterfraction3','Temperature3'] -field_tolerances=[1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13] -field_values=[\ - md.results.TransientSolution[0].Enthalpy,\ - md.results.TransientSolution[0].Waterfraction,\ - md.results.TransientSolution[0].Temperature,\ - md.results.TransientSolution[1].Enthalpy,\ - md.results.TransientSolution[1].Waterfraction,\ - md.results.TransientSolution[1].Temperature,\ - md.results.TransientSolution[2].Enthalpy,\ - md.results.TransientSolution[2].Waterfraction,\ - md.results.TransientSolution[2].Temperature,\ - ] +field_names = ['Enthalpy1', 'Waterfraction1', 'Temperature1', + 'Enthalpy2', 'Waterfraction2', 'Temperature2', + 'Enthalpy3', 'Waterfraction3', 'Temperature3'] +field_tolerances = [1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13] +field_values = [md.results.TransientSolution[0].Enthalpy, + md.results.TransientSolution[0].Waterfraction, + md.results.TransientSolution[0].Temperature, + md.results.TransientSolution[1].Enthalpy, + md.results.TransientSolution[1].Waterfraction, + md.results.TransientSolution[1].Temperature, + md.results.TransientSolution[2].Enthalpy, + md.results.TransientSolution[2].Waterfraction, + md.results.TransientSolution[2].Temperature] Index: /issm/trunk-jpl/test/NightlyRun/test327.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test327.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test327.py (revision 23793) @@ -10,59 +10,57 @@ -md=triangle(model(),'../Exp/Square.exp',200000.) -md=setmask(md,'','') -md=parameterize(md,'../Par/SquareSheetConstrained.py') -md.extrude(3,1.) -md=setflowequation(md,'HO','all') -md.cluster=generic('name',gethostname(),'np',3) -md.initialization.waterfraction=np.zeros((md.mesh.numberofvertices)) -md.initialization.watercolumn=np.zeros((md.mesh.numberofvertices)) -md.initialization.temperature[:]=272. -md.thermal.spctemperature[np.nonzero(md.mesh.vertexonsurface)[0]]=272. -md.thermal.isenthalpy=1 -md.thermal.isdynamicbasalspc=1 -md.basalforcings.geothermalflux[:]=5. -md=solve(md,'Transient') +md = triangle(model(), '../Exp/Square.exp', 200000.) +md = setmask(md, '', '') +md = parameterize(md, '../Par/SquareSheetConstrained.py') +md.extrude(3, 1.) +md = setflowequation(md, 'HO', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) +md.initialization.waterfraction = np.zeros((md.mesh.numberofvertices)) +md.initialization.watercolumn = np.zeros((md.mesh.numberofvertices)) +md.initialization.temperature[:] = 272. +md.thermal.spctemperature[np.nonzero(md.mesh.vertexonsurface)[0]] = 272. +md.thermal.isenthalpy = 1 +md.thermal.isdynamicbasalspc = 1 +md.basalforcings.geothermalflux[:] = 5. +md = solve(md, 'Transient') #Fields and tolerances to track changes -field_names =['Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','Enthalpy1','Waterfraction1',\ - 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','Enthalpy2','Waterfraction2',\ - 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','Enthalpy3','Waterfraction3'] -field_tolerances=[1e-09,1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,\ - 1e-09,1e-09,1e-10,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,\ - 1e-09,5e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-4,1e-10] -field_values=[\ - md.results.TransientSolution[0].Vx,\ - md.results.TransientSolution[0].Vy,\ - md.results.TransientSolution[0].Vz,\ - md.results.TransientSolution[0].Vel,\ - md.results.TransientSolution[0].Pressure,\ - md.results.TransientSolution[0].Base,\ - md.results.TransientSolution[0].Surface,\ - md.results.TransientSolution[0].Thickness,\ - md.results.TransientSolution[0].Temperature,\ - md.results.TransientSolution[0].Enthalpy,\ - md.results.TransientSolution[0].Waterfraction,\ - md.results.TransientSolution[1].Vx,\ - md.results.TransientSolution[1].Vy,\ - md.results.TransientSolution[1].Vz,\ - md.results.TransientSolution[1].Vel,\ - md.results.TransientSolution[1].Pressure,\ - md.results.TransientSolution[1].Base,\ - md.results.TransientSolution[1].Surface,\ - md.results.TransientSolution[1].Thickness,\ - md.results.TransientSolution[1].Temperature,\ - md.results.TransientSolution[1].Enthalpy,\ - md.results.TransientSolution[1].Waterfraction,\ - md.results.TransientSolution[2].Vx,\ - md.results.TransientSolution[2].Vy,\ - md.results.TransientSolution[2].Vz,\ - md.results.TransientSolution[2].Vel,\ - md.results.TransientSolution[2].Pressure,\ - md.results.TransientSolution[2].Base,\ - md.results.TransientSolution[2].Surface,\ - md.results.TransientSolution[2].Thickness,\ - md.results.TransientSolution[2].Temperature,\ - md.results.TransientSolution[2].Enthalpy,\ - md.results.TransientSolution[2].Waterfraction,\ - ] +field_names = ['Vx1', 'Vy1', 'Vz1', 'Vel1', 'Pressure1', 'Bed1', 'Surface1', 'Thickness1', 'Temperature1', 'Enthalpy1', 'Waterfraction1', + 'Vx2', 'Vy2', 'Vz2', 'Vel2', 'Pressure2', 'Bed2', 'Surface2', 'Thickness2', 'Temperature2', 'Enthalpy2', 'Waterfraction2', + 'Vx3', 'Vy3', 'Vz3', 'Vel3', 'Pressure3', 'Bed3', 'Surface3', 'Thickness3', 'Temperature3', 'Enthalpy3', 'Waterfraction3'] +field_tolerances = [1e-09, 1e-09, 1e-09, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10, + 1e-09, 1e-09, 1e-10, 1e-09, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10, + 1e-09, 5e-10, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10, 1e-4, 1e-10] +field_values = [md.results.TransientSolution[0].Vx, + md.results.TransientSolution[0].Vy, + md.results.TransientSolution[0].Vz, + md.results.TransientSolution[0].Vel, + md.results.TransientSolution[0].Pressure, + md.results.TransientSolution[0].Base, + md.results.TransientSolution[0].Surface, + md.results.TransientSolution[0].Thickness, + md.results.TransientSolution[0].Temperature, + md.results.TransientSolution[0].Enthalpy, + md.results.TransientSolution[0].Waterfraction, + md.results.TransientSolution[1].Vx, + md.results.TransientSolution[1].Vy, + md.results.TransientSolution[1].Vz, + md.results.TransientSolution[1].Vel, + md.results.TransientSolution[1].Pressure, + md.results.TransientSolution[1].Base, + md.results.TransientSolution[1].Surface, + md.results.TransientSolution[1].Thickness, + md.results.TransientSolution[1].Temperature, + md.results.TransientSolution[1].Enthalpy, + md.results.TransientSolution[1].Waterfraction, + md.results.TransientSolution[2].Vx, + md.results.TransientSolution[2].Vy, + md.results.TransientSolution[2].Vz, + md.results.TransientSolution[2].Vel, + md.results.TransientSolution[2].Pressure, + md.results.TransientSolution[2].Base, + md.results.TransientSolution[2].Surface, + md.results.TransientSolution[2].Thickness, + md.results.TransientSolution[2].Temperature, + md.results.TransientSolution[2].Enthalpy, + md.results.TransientSolution[2].Waterfraction] Index: /issm/trunk-jpl/test/NightlyRun/test328.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test328.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test328.py (revision 23793) @@ -9,56 +9,56 @@ from solve import * -md=triangle(model(),'../Exp/Square.exp',150000.) -md=setmask(md,'','') -md=parameterize(md,'../Par/SquareSheetConstrained.py') -md=setflowequation(md,'SSA','all') +md = triangle(model(), '../Exp/Square.exp', 150000.) +md = setmask(md, '', '') +md = parameterize(md, '../Par/SquareSheetConstrained.py') +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_neg=250. + 0.000051*md.mesh.x - 0.00011*md.mesh.y -md.transient.requested_outputs=['default','TotalSmb'] -md.smb.href=copy.deepcopy(md.geometry.surface) -md.smb.smbref= 1000. - 0.001*md.mesh.x - 0.005*md.mesh.y -md.cluster=generic('name',gethostname(),'np',3) -md=solve(md,'Transient') +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'] +md.smb.href = copy.deepcopy(md.geometry.surface) +md.smb.smbref = 1000. - 0.001 * md.mesh.x - 0.005 * md.mesh.y +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'Transient') #Fields and tolerances to track changes -field_names =['Vx1','Vy1','Vel1', - 'Bed1','Surface1','Thickness1', - 'SMB1','TotalSmb1', - 'Vx2','Vy2','Vel2','Bed2', - 'Surface2','Thickness2', - 'SMB2','TotalSmb2','Vx3','Vy3', - 'Vel3','Bed3','Surface3', - 'Thickness3','SMB3','TotalSmb3'] -field_tolerances=[1e-13,1e-13,1e-13, - 1e-13,1e-13,1e-13, - 1e-13,1e-13,1e-13, - 1e-13,1e-13,1e-13, - 1e-13,1e-13,1e-13, - 1e-13,1e-13,1e-13, - 1e-13,1e-13,1e-13, - 1e-13,1e-13,1e-13] -field_values=[md.results.TransientSolution[0].Vx, - md.results.TransientSolution[0].Vy, - md.results.TransientSolution[0].Vel, - md.results.TransientSolution[0].Base, - md.results.TransientSolution[0].Surface, - md.results.TransientSolution[0].Thickness, - md.results.TransientSolution[0].SmbMassBalance, - md.results.TransientSolution[0].TotalSmb, - md.results.TransientSolution[1].Vx, - md.results.TransientSolution[1].Vy, - md.results.TransientSolution[1].Vel, - md.results.TransientSolution[1].Base, - md.results.TransientSolution[1].Surface, - md.results.TransientSolution[1].Thickness, - md.results.TransientSolution[1].TotalSmb, - md.results.TransientSolution[1].SmbMassBalance, - md.results.TransientSolution[2].Vx, - md.results.TransientSolution[2].Vy, - md.results.TransientSolution[2].Vel, - md.results.TransientSolution[2].Base, - md.results.TransientSolution[2].Surface, - md.results.TransientSolution[2].Thickness, - md.results.TransientSolution[2].SmbMassBalance, - md.results.TransientSolution[2].TotalSmb] +field_names = ['Vx1', 'Vy1', 'Vel1', + 'Bed1', 'Surface1', 'Thickness1', + 'SMB1', 'TotalSmb1', + 'Vx2', 'Vy2', 'Vel2', 'Bed2', + 'Surface2', 'Thickness2', + 'SMB2', 'TotalSmb2', 'Vx3', 'Vy3', + 'Vel3', 'Bed3', 'Surface3', + 'Thickness3', 'SMB3', 'TotalSmb3'] +field_tolerances = [1e-13, 1e-13, 1e-13, + 1e-13, 1e-13, 1e-13, + 1e-13, 1e-13, 1e-13, + 1e-13, 1e-13, 1e-13, + 1e-13, 1e-13, 1e-13, + 1e-13, 1e-13, 1e-13, + 1e-13, 1e-13, 1e-13, + 1e-13, 1e-13, 1e-13] +field_values = [md.results.TransientSolution[0].Vx, + md.results.TransientSolution[0].Vy, + md.results.TransientSolution[0].Vel, + md.results.TransientSolution[0].Base, + md.results.TransientSolution[0].Surface, + md.results.TransientSolution[0].Thickness, + md.results.TransientSolution[0].SmbMassBalance, + md.results.TransientSolution[0].TotalSmb, + md.results.TransientSolution[1].Vx, + md.results.TransientSolution[1].Vy, + md.results.TransientSolution[1].Vel, + md.results.TransientSolution[1].Base, + md.results.TransientSolution[1].Surface, + md.results.TransientSolution[1].Thickness, + md.results.TransientSolution[1].TotalSmb, + md.results.TransientSolution[1].SmbMassBalance, + md.results.TransientSolution[2].Vx, + md.results.TransientSolution[2].Vy, + md.results.TransientSolution[2].Vel, + md.results.TransientSolution[2].Base, + md.results.TransientSolution[2].Surface, + md.results.TransientSolution[2].Thickness, + md.results.TransientSolution[2].SmbMassBalance, + md.results.TransientSolution[2].TotalSmb] Index: /issm/trunk-jpl/test/NightlyRun/test329.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test329.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test329.py (revision 23793) @@ -9,65 +9,65 @@ from solve import * -md=triangle(model(),'../Exp/Square.exp',150000.) -md=setmask(md,'','') -md=parameterize(md,'../Par/SquareSheetConstrained.py') -md.extrude(3,1) -md=setflowequation(md,'HO','all') +md = triangle(model(), '../Exp/Square.exp', 150000.) +md = setmask(md, '', '') +md = parameterize(md, '../Par/SquareSheetConstrained.py') +md.extrude(3, 1) +md = setflowequation(md, 'HO', 'all') md.smb = SMBgradients() -md.smb.b_pos=-100. + 0.00005*md.mesh.x - 0.0001*md.mesh.y -md.smb.b_neg=250. + 0.000051*md.mesh.x - 0.00011*md.mesh.y -md.smb.href=copy.deepcopy(md.geometry.surface) -md.smb.smbref= 1000. - 0.001*md.mesh.x - 0.005*md.mesh.y -md.transient.requested_outputs=['default','TotalSmb'] -md.cluster=generic('name',gethostname(),'np',3) -md=solve(md,'Transient') +md.smb.b_pos = - 100. + 0.00005 * md.mesh.x - 0.0001 * md.mesh.y +md.smb.b_neg = 250. + 0.000051 * md.mesh.x - 0.00011 * md.mesh.y +md.smb.href = copy.deepcopy(md.geometry.surface) +md.smb.smbref = 1000. - 0.001 * md.mesh.x - 0.005 * md.mesh.y +md.transient.requested_outputs = ['default', 'TotalSmb'] +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'Transient') #Fields and tolerances to track changes -field_names =['Vx1','Vy1','Vz1','Vel1', - 'Bed1','Surface1','Thickness1', - 'Temperature1','SMB1','TotalSmb1', - 'Vx2','Vy2','Vz2','Vel2', - 'Bed2','Surface2','Thickness2', - 'Temperature2','SMB2','TotalSmb2', - 'Vx3','Vy3','Vz3','Vel3', - 'Bed3','Surface3','Thickness3', - 'Temperature3','SMB3','TotalSmb3'] -field_tolerances=[1e-09,1e-09,1e-09,1e-09, - 1e-10,1e-10,1e-10, - 1e-10,1e-10,1e-10, - 1e-09,1e-09,1e-10,1e-09, - 1e-10,1e-10,1e-10, - 1e-10,1e-10,1e-10, - 1e-09,5e-09,1e-09,1e-09, - 1e-10,1e-10,1e-10, - 1e-10,1e-10,1e-10] -field_values=[md.results.TransientSolution[0].Vx, - md.results.TransientSolution[0].Vy, - md.results.TransientSolution[0].Vz, - md.results.TransientSolution[0].Vel, - md.results.TransientSolution[0].Base, - md.results.TransientSolution[0].Surface, - md.results.TransientSolution[0].Thickness, - md.results.TransientSolution[0].Temperature, - md.results.TransientSolution[0].SmbMassBalance, - md.results.TransientSolution[0].TotalSmb, - md.results.TransientSolution[1].Vx, - md.results.TransientSolution[1].Vy, - md.results.TransientSolution[1].Vz, - md.results.TransientSolution[1].Vel, - md.results.TransientSolution[1].Base, - md.results.TransientSolution[1].Surface, - md.results.TransientSolution[1].Thickness, - md.results.TransientSolution[1].Temperature, - md.results.TransientSolution[1].SmbMassBalance, - md.results.TransientSolution[1].TotalSmb, - md.results.TransientSolution[2].Vx, - md.results.TransientSolution[2].Vy, - md.results.TransientSolution[2].Vz, - md.results.TransientSolution[2].Vel, - md.results.TransientSolution[2].Base, - md.results.TransientSolution[2].Surface, - md.results.TransientSolution[2].Thickness, - md.results.TransientSolution[2].Temperature, - md.results.TransientSolution[2].SmbMassBalance, - md.results.TransientSolution[2].TotalSmb] +field_names = ['Vx1', 'Vy1', 'Vz1', 'Vel1', + 'Bed1', 'Surface1', 'Thickness1', + 'Temperature1', 'SMB1', 'TotalSmb1', + 'Vx2', 'Vy2', 'Vz2', 'Vel2', + 'Bed2', 'Surface2', 'Thickness2', + 'Temperature2', 'SMB2', 'TotalSmb2', + 'Vx3', 'Vy3', 'Vz3', 'Vel3', + 'Bed3', 'Surface3', 'Thickness3', + 'Temperature3', 'SMB3', 'TotalSmb3'] +field_tolerances = [1e-09, 1e-09, 1e-09, 1e-09, + 1e-10, 1e-10, 1e-10, + 1e-10, 1e-10, 1e-10, + 1e-09, 1e-09, 1e-10, 1e-09, + 1e-10, 1e-10, 1e-10, + 1e-10, 1e-10, 1e-10, + 1e-09, 5e-09, 1e-09, 1e-09, + 1e-10, 1e-10, 1e-10, + 1e-10, 1e-10, 1e-10] +field_values = [md.results.TransientSolution[0].Vx, + md.results.TransientSolution[0].Vy, + md.results.TransientSolution[0].Vz, + md.results.TransientSolution[0].Vel, + md.results.TransientSolution[0].Base, + md.results.TransientSolution[0].Surface, + md.results.TransientSolution[0].Thickness, + md.results.TransientSolution[0].Temperature, + md.results.TransientSolution[0].SmbMassBalance, + md.results.TransientSolution[0].TotalSmb, + md.results.TransientSolution[1].Vx, + md.results.TransientSolution[1].Vy, + md.results.TransientSolution[1].Vz, + md.results.TransientSolution[1].Vel, + md.results.TransientSolution[1].Base, + md.results.TransientSolution[1].Surface, + md.results.TransientSolution[1].Thickness, + md.results.TransientSolution[1].Temperature, + md.results.TransientSolution[1].SmbMassBalance, + md.results.TransientSolution[1].TotalSmb, + md.results.TransientSolution[2].Vx, + md.results.TransientSolution[2].Vy, + md.results.TransientSolution[2].Vz, + md.results.TransientSolution[2].Vel, + md.results.TransientSolution[2].Base, + md.results.TransientSolution[2].Surface, + md.results.TransientSolution[2].Thickness, + md.results.TransientSolution[2].Temperature, + md.results.TransientSolution[2].SmbMassBalance, + md.results.TransientSolution[2].TotalSmb] Index: /issm/trunk-jpl/test/NightlyRun/test330.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test330.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test330.py (revision 23793) @@ -1,5 +1,4 @@ #Test Name:UnConfinedHydroDC import numpy as np -import inspect from model import * from setmask import * @@ -12,48 +11,45 @@ from generic import generic -md=triangle(model(),'../Exp/Strip.exp',10000.) -md=setmask(md,'','') +md = triangle(model(), '../Exp/Strip.exp', 10000.) +md = setmask(md, '', '') #reduced slab (20m long) -md.mesh.x=md.mesh.x/5.0e3 -md.mesh.y=md.mesh.y/5.0e3 -md=parameterize(md,'../Par/IceCube.py') -md.transient=transient.setallnullparameters(md.transient) -md.transient.ishydrology=True -md=setflowequation(md,'SSA','all') -md.cluster=generic('name',gethostname(),'np',1) -md.hydrology=hydrologydc() -md.hydrology=md.hydrology.initialize(md) +md.mesh.x = md.mesh.x / 5.0e3 +md.mesh.y = md.mesh.y / 5.0e3 +md = parameterize(md, '../Par/IceCube.py') +md.transient = transient.setallnullparameters(md.transient) +md.transient.ishydrology = True +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 1) +md.hydrology = hydrologydc() +md.hydrology = md.hydrology.initialize(md) #Hydro Model Parameters -md.hydrology.isefficientlayer=0 -md.hydrology.sedimentlimit_flag=0 -md.hydrology.mask_thawed_node=np.ones((md.mesh.numberofvertices)) -md.hydrology.rel_tol=1.0e-6 -md.hydrology.penalty_lock=0 -md.hydrology.max_iter=200 -md.hydrology.transfer_flag=0 -md.hydrology.unconfined_flag=1 -md.hydrology.sediment_porosity=0.1 +md.hydrology.isefficientlayer = 0 +md.hydrology.sedimentlimit_flag = 0 +md.hydrology.mask_thawed_node = np.ones((md.mesh.numberofvertices)) +md.hydrology.rel_tol = 1.0e-6 +md.hydrology.penalty_lock = 0 +md.hydrology.max_iter = 200 +md.hydrology.transfer_flag = 0 +md.hydrology.unconfined_flag = 1 +md.hydrology.sediment_porosity = 0.1 #Sediment -md.hydrology.sediment_thickness=10.0 -md.hydrology.sediment_transmitivity=(1.0e-3*md.hydrology.sediment_thickness)*np.ones((md.mesh.numberofvertices)) +md.hydrology.sediment_thickness = 10.0 +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)) -md.hydrology.spcsediment_head[np.where(md.mesh.x==0)]=0.5 +md.hydrology.spcsediment_head = np.nan * np.ones((md.mesh.numberofvertices)) +md.hydrology.spcsediment_head[np.where(md.mesh.x == 0)] = 0.5 -md.timestepping.time_step=5/md.constants.yts #5s steppin -md.settings.output_frequency=2 -md.timestepping.final_time=300/md.constants.yts #500s run +md.timestepping.time_step = 5 / md.constants.yts #5s steppin +md.settings.output_frequency = 2 +md.timestepping.final_time = 300 / md.constants.yts #500s run -md=solve(md,'Transient') +md = solve(md, 'Transient') #fields to track, results can also be found in #Wang 2009 Fig 6b (jouranl of Hydrology) -field_names=['SedimentWaterHead1', - 'SedimentWaterHead2'] -field_tolerances=[1e-13, - 1e-13] -field_values=[md.results.TransientSolution[10].SedimentHeadHydrostep, - md.results.TransientSolution[30].SedimentHeadHydrostep] +field_names = ['SedimentWaterHead1', 'SedimentWaterHead2'] +field_tolerances = [1e-13, 1e-13] +field_values = [md.results.TransientSolution[10].SedimentHeadHydrostep, md.results.TransientSolution[30].SedimentHeadHydrostep] Index: /issm/trunk-jpl/test/NightlyRun/test3300.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test3300.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test3300.py (revision 23793) @@ -12,66 +12,66 @@ from generic import generic -md=triangle(model(),'../Exp/Square.exp',100000.) -md=setmask(md,'','') -md=parameterize(md,'../Par/SquareSheetConstrained.py') -md.transient=transient.setallnullparameters(md.transient) -md.transient.ishydrology=True -md.transient.issmb=True -md=setflowequation(md,'SSA','all') -md.cluster=generic('name',gethostname(),'np',1) -md.hydrology=hydrologydc() -md.hydrology=md.hydrology.initialize(md) +md = triangle(model(), '../Exp/Square.exp', 100000.) +md = setmask(md, '', '') +md = parameterize(md, '../Par/SquareSheetConstrained.py') +md.transient = transient.setallnullparameters(md.transient) +md.transient.ishydrology = True +md.transient.issmb = True +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 1) +md.hydrology = hydrologydc() +md.hydrology = md.hydrology.initialize(md) -md.hydrology.isefficientlayer=1 -md.hydrology.sedimentlimit_flag=1 -md.hydrology.sedimentlimit=400.0 -md.hydrology.mask_thawed_node=np.ones((md.mesh.numberofvertices)) -md.hydrology.sediment_thickness=20.0 -md.initialization.sediment_head=np.zeros((md.mesh.numberofvertices)) -md.hydrology.spcsediment_head=np.nan*np.ones((md.mesh.numberofvertices)) -md.basalforcings.groundedice_melting_rate = 2.0*np.ones((md.mesh.numberofvertices)) -md.hydrology.sediment_transmitivity=1.5e-4*np.ones((md.mesh.numberofvertices)) +md.hydrology.isefficientlayer = 1 +md.hydrology.sedimentlimit_flag = 1 +md.hydrology.sedimentlimit = 400.0 +md.hydrology.mask_thawed_node = np.ones((md.mesh.numberofvertices)) +md.hydrology.sediment_thickness = 20.0 +md.initialization.sediment_head = np.zeros((md.mesh.numberofvertices)) +md.hydrology.spcsediment_head = np.nan * np.ones((md.mesh.numberofvertices)) +md.basalforcings.groundedice_melting_rate = 2.0 * np.ones((md.mesh.numberofvertices)) +md.hydrology.sediment_transmitivity = 1.5e-4 * np.ones((md.mesh.numberofvertices)) -md.initialization.epl_head=np.zeros((md.mesh.numberofvertices)) -md.initialization.epl_thickness=np.ones((md.mesh.numberofvertices)) -md.hydrology.spcepl_head=np.nan*np.ones((md.mesh.numberofvertices)) -md.hydrology.mask_eplactive_node=np.zeros((md.mesh.numberofvertices)) +md.initialization.epl_head = np.zeros((md.mesh.numberofvertices)) +md.initialization.epl_thickness = np.ones((md.mesh.numberofvertices)) +md.hydrology.spcepl_head = np.nan * np.ones((md.mesh.numberofvertices)) +md.hydrology.mask_eplactive_node = np.zeros((md.mesh.numberofvertices)) -md.hydrology.epl_conductivity=1.5e-2 -md.hydrology.epl_initial_thickness=1.0 -md.hydrology.epl_colapse_thickness=1.0e-6 -md.hydrology.epl_thick_comp=1 -md.hydrology.epl_max_thickness=5.0 +md.hydrology.epl_conductivity = 1.5e-2 +md.hydrology.epl_initial_thickness = 1.0 +md.hydrology.epl_colapse_thickness = 1.0e-6 +md.hydrology.epl_thick_comp = 1 +md.hydrology.epl_max_thickness = 5.0 -md.hydrology.transfer_flag=1.0 -md.hydrology.leakage_factor=3.9e-13 +md.hydrology.transfer_flag = 1.0 +md.hydrology.leakage_factor = 3.9e-13 -times=np.arange(0,8.001,0.002) -md.basalforcings.groundedice_melting_rate=np.zeros((md.mesh.numberofvertices+1,len(times))) +times = np.arange(0, 8.001, 0.002) +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<=1.0)]=1.0 -md.basalforcings.groundedice_melting_rate[-1,:]=times +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 -md.timestepping.time_step=0.002 -md.timestepping.final_time=8.0 +md.timestepping.time_step = 0.002 +md.timestepping.final_time = 8.0 -md=solve(md,'Transient') +md = solve(md, 'Transient') -# sedvol=np.zeros(4000) -# eplvol=np.zeros(4000) -# 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 -# 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 = np.zeros(4000) +# eplvol = np.zeros(4000) +# 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 +# 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 -field_names =['SedimentWaterHead5','EplWaterHead5','SedimentWaterHead40','EplWaterHead40'] -field_tolerances=[1e-13, 1e-13, 1e-13, 1e-13, 1e-13] -field_values=[md.results.TransientSolution[5].SedimentHeadHydrostep, - md.results.TransientSolution[5].EplHeadHydrostep, - md.results.TransientSolution[40].SedimentHeadHydrostep, - md.results.TransientSolution[40].EplHeadHydrostep] +field_names = ['SedimentWaterHead5', 'EplWaterHead5', 'SedimentWaterHead40', 'EplWaterHead40'] +field_tolerances = [1e-13, 1e-13, 1e-13, 1e-13, 1e-13] +field_values = [md.results.TransientSolution[5].SedimentHeadHydrostep, + md.results.TransientSolution[5].EplHeadHydrostep, + md.results.TransientSolution[40].SedimentHeadHydrostep, + md.results.TransientSolution[40].EplHeadHydrostep] Index: /issm/trunk-jpl/test/NightlyRun/test332.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test332.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test332.py (revision 23793) @@ -13,30 +13,30 @@ from generic import generic -md=triangle(model(),'../Exp/Square.exp',100000.) -md=setmask(md,'','') -md=parameterize(md,'../Par/IceCube.py') +md = triangle(model(), '../Exp/Square.exp', 100000.) +md = setmask(md, '', '') +md = parameterize(md, '../Par/IceCube.py') -md.transient=transient.setallnullparameters(md.transient) -md.transient.ishydrology=True +md.transient = transient.setallnullparameters(md.transient) +md.transient.ishydrology = True -md=setflowequation(md,'SSA','all') -md.cluster=generic('name',gethostname(),'np',1) -md.hydrology=hydrologydc() -md.hydrology=md.hydrology.initialize(md) +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 1) +md.hydrology = hydrologydc() +md.hydrology = md.hydrology.initialize(md) -md.hydrology.isefficientlayer=0 -md.hydrology.mask_thawed_node=np.ones((md.mesh.numberofvertices)) -md.hydrology.sedimentlimit_flag=1 -md.hydrology.sedimentlimit=8000.0 -md.initialization.sediment_head=np.zeros((md.mesh.numberofvertices)) -md.hydrology.spcsediment_head=np.nan*np.ones((md.mesh.numberofvertices)) -pos=np.nonzero(md.mesh.y==0.)[0] -md.hydrology.spcsediment_head[pos]=0.0 -md.basalforcings.groundedice_melting_rate = 2.0*np.ones((md.mesh.numberofvertices)) -md.basalforcings.floatingice_melting_rate = 0.0*np.ones((md.mesh.numberofvertices)) -md.hydrology.sediment_transmitivity= 3.0*np.ones((md.mesh.numberofvertices)) -md.timestepping.time_step=0 -md.timestepping.final_time=1.0 -md=solve(md,'Hydrology') +md.hydrology.isefficientlayer = 0 +md.hydrology.mask_thawed_node = np.ones((md.mesh.numberofvertices)) +md.hydrology.sedimentlimit_flag = 1 +md.hydrology.sedimentlimit = 8000.0 +md.initialization.sediment_head = np.zeros((md.mesh.numberofvertices)) +md.hydrology.spcsediment_head = np.nan * np.ones((md.mesh.numberofvertices)) +pos = np.nonzero(md.mesh.y == 0.)[0] +md.hydrology.spcsediment_head[pos] = 0.0 +md.basalforcings.groundedice_melting_rate = 2.0 * np.ones((md.mesh.numberofvertices)) +md.basalforcings.floatingice_melting_rate = 0.0 * np.ones((md.mesh.numberofvertices)) +md.hydrology.sediment_transmitivity = 3.0 * np.ones((md.mesh.numberofvertices)) +md.timestepping.time_step = 0 +md.timestepping.final_time = 1.0 +md = solve(md, 'Hydrology') #Fields and tolerances to track changes @@ -44,5 +44,5 @@ #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)) -field_names =['SedimentWaterHead','SedimentHeadResidual'] -field_tolerances=[1e-13, 3e-10] -field_values=[md.results.HydrologySolution.SedimentHeadHydrostep,md.results.HydrologySolution.SedimentHeadResidual] +field_names = ['SedimentWaterHead', 'SedimentHeadResidual'] +field_tolerances = [1e-13, 3e-10] +field_values = [md.results.HydrologySolution.SedimentHeadHydrostep, md.results.HydrologySolution.SedimentHeadResidual] Index: /issm/trunk-jpl/test/NightlyRun/test333.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test333.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test333.py (revision 23793) @@ -11,78 +11,78 @@ from generic import generic -md=triangle(model(),'../Exp/Square.exp',100000.) -md=setmask(md,'','') -md=parameterize(md,'../Par/IceCube.py') +md = triangle(model(), '../Exp/Square.exp', 100000.) +md = setmask(md, '', '') +md = parameterize(md, '../Par/IceCube.py') -md.transient=transient.setallnullparameters(md.transient) -md.transient.ishydrology=True -#md.transient.issmb=True -md=setflowequation(md,'SSA','all') -md.cluster=generic('name',gethostname(),'np',1) -md.hydrology=hydrologydc() -md.hydrology=md.hydrology.initialize(md) +md.transient = transient.setallnullparameters(md.transient) +md.transient.ishydrology = True +#md.transient.issmb = True +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 1) +md.hydrology = hydrologydc() +md.hydrology = md.hydrology.initialize(md) -md.hydrology.isefficientlayer=1 -md.hydrology.sedimentlimit_flag=1 -md.hydrology.sedimentlimit=800.0 -md.hydrology.mask_thawed_node=np.ones((md.mesh.numberofvertices)) -md.initialization.sediment_head=np.zeros((md.mesh.numberofvertices)) -md.hydrology.spcsediment_head=np.nan*np.ones((md.mesh.numberofvertices)) +md.hydrology.isefficientlayer = 1 +md.hydrology.sedimentlimit_flag = 1 +md.hydrology.sedimentlimit = 800.0 +md.hydrology.mask_thawed_node = np.ones((md.mesh.numberofvertices)) +md.initialization.sediment_head = np.zeros((md.mesh.numberofvertices)) +md.hydrology.spcsediment_head = np.nan * np.ones((md.mesh.numberofvertices)) -md.basalforcings.groundedice_melting_rate = 2.0*np.ones((md.mesh.numberofvertices)) -md.basalforcings.floatingice_melting_rate = 0.0*np.ones((md.mesh.numberofvertices)) -md.hydrology.sediment_transmitivity= 3.0*np.ones((md.mesh.numberofvertices)) +md.basalforcings.groundedice_melting_rate = 2.0 * np.ones((md.mesh.numberofvertices)) +md.basalforcings.floatingice_melting_rate = 0.0 * np.ones((md.mesh.numberofvertices)) +md.hydrology.sediment_transmitivity = 3.0 * np.ones((md.mesh.numberofvertices)) -md.initialization.epl_head=np.zeros((md.mesh.numberofvertices)) -md.initialization.epl_thickness=np.ones((md.mesh.numberofvertices)) -md.hydrology.spcepl_head=np.nan*np.ones((md.mesh.numberofvertices)) -md.hydrology.mask_eplactive_node=np.zeros((md.mesh.numberofvertices)) -md.hydrology.epl_conductivity=30 -md.hydrology.epl_initial_thickness=1 -md.hydrology.epl_colapse_thickness=1.0e-3 -md.hydrology.epl_thick_comp=1 -md.hydrology.epl_max_thickness=1 -md.hydrology.steps_per_step=10 -md.timestepping.time_step=2.0 -md.timestepping.final_time=2.0 +md.initialization.epl_head = np.zeros((md.mesh.numberofvertices)) +md.initialization.epl_thickness = np.ones((md.mesh.numberofvertices)) +md.hydrology.spcepl_head = np.nan * np.ones((md.mesh.numberofvertices)) +md.hydrology.mask_eplactive_node = np.zeros((md.mesh.numberofvertices)) +md.hydrology.epl_conductivity = 30 +md.hydrology.epl_initial_thickness = 1 +md.hydrology.epl_colapse_thickness = 1.0e-3 +md.hydrology.epl_thick_comp = 1 +md.hydrology.epl_max_thickness = 1 +md.hydrology.steps_per_step = 10 +md.timestepping.time_step = 2.0 +md.timestepping.final_time = 2.0 -#md.debug.valgrind=True -md=solve(md,'Transient') +#md.debug.valgrind = True +md = solve(md, 'Transient') #re-run with no substeps -mdfine=copy.deepcopy(md) -mdfine.result=[] -mdfine.hydrology.steps_per_step=1 -mdfine.timestepping.time_step=0.2 -mdfine=solve(mdfine,'Transient') +mdfine = copy.deepcopy(md) +mdfine.result = [] +mdfine.hydrology.steps_per_step = 1 +mdfine.timestepping.time_step = 0.2 +mdfine = solve(mdfine, 'Transient') -sedmean=mdfine.results.TransientSolution[0].SedimentHeadHydrostep -eplmean=mdfine.results.TransientSolution[0].EplHeadHydrostep -for i in range(1,10): - sedmean=sedmean+(mdfine.results.TransientSolution[i].SedimentHeadHydrostep) - eplmean=eplmean+(mdfine.results.TransientSolution[i].EplHeadHydrostep) +sedmean = mdfine.results.TransientSolution[0].SedimentHeadHydrostep +eplmean = mdfine.results.TransientSolution[0].EplHeadHydrostep +for i in range(1, 10): + sedmean = sedmean + (mdfine.results.TransientSolution[i].SedimentHeadHydrostep) + eplmean = eplmean + (mdfine.results.TransientSolution[i].EplHeadHydrostep) -field_names=['SedimentWaterHead1','EplWaterHead1','SedimentHeadResidual1', - 'SedimentWaterHead4','EplWaterHead4','SedimentHeadResidual4', - 'SedimentWaterHead5','EplWaterHead5','SedimentHeadResidual5', - 'SedimentWaterHead9','EplWaterHead9','SedimentHeadResidual9', - 'EplWaterHead10'] -field_tolerances=[1e-13, 1e-13, 1e-13, - 1e-13, 1e-13, 1e-13, - 1e-13, 5e-12, 1e-11, - 1e-13, 5e-12, 1e-11, - 1e-13] -field_values=[mdfine.results.TransientSolution[0].SedimentHeadHydrostep, - mdfine.results.TransientSolution[0].EplHeadHydrostep, - mdfine.results.TransientSolution[0].SedimentHeadResidual, - mdfine.results.TransientSolution[3].SedimentHeadHydrostep, - mdfine.results.TransientSolution[3].EplHeadHydrostep, - mdfine.results.TransientSolution[3].SedimentHeadResidual, - mdfine.results.TransientSolution[4].SedimentHeadHydrostep, - mdfine.results.TransientSolution[4].EplHeadHydrostep, - mdfine.results.TransientSolution[4].SedimentHeadResidual, - mdfine.results.TransientSolution[8].SedimentHeadHydrostep, - mdfine.results.TransientSolution[8].EplHeadHydrostep, - mdfine.results.TransientSolution[8].SedimentHeadResidual, - md.results.TransientSolution[-1].EplHead] +field_names = ['SedimentWaterHead1', 'EplWaterHead1', 'SedimentHeadResidual1', + 'SedimentWaterHead4', 'EplWaterHead4', 'SedimentHeadResidual4', + 'SedimentWaterHead5', 'EplWaterHead5', 'SedimentHeadResidual5', + 'SedimentWaterHead9', 'EplWaterHead9', 'SedimentHeadResidual9', + 'EplWaterHead10'] +field_tolerances = [1e-13, 1e-13, 1e-13, + 1e-13, 1e-13, 1e-13, + 1e-13, 5e-12, 1e-11, + 1e-13, 5e-12, 1e-11, + 1e-13] +field_values = [mdfine.results.TransientSolution[0].SedimentHeadHydrostep, + mdfine.results.TransientSolution[0].EplHeadHydrostep, + mdfine.results.TransientSolution[0].SedimentHeadResidual, + mdfine.results.TransientSolution[3].SedimentHeadHydrostep, + mdfine.results.TransientSolution[3].EplHeadHydrostep, + mdfine.results.TransientSolution[3].SedimentHeadResidual, + mdfine.results.TransientSolution[4].SedimentHeadHydrostep, + mdfine.results.TransientSolution[4].EplHeadHydrostep, + mdfine.results.TransientSolution[4].SedimentHeadResidual, + mdfine.results.TransientSolution[8].SedimentHeadHydrostep, + mdfine.results.TransientSolution[8].EplHeadHydrostep, + mdfine.results.TransientSolution[8].SedimentHeadResidual, + md.results.TransientSolution[-1].EplHead] Index: /issm/trunk-jpl/test/NightlyRun/test334.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test334.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test334.py (revision 23793) @@ -13,30 +13,30 @@ from generic import generic -md=triangle(model(),'../Exp/Square.exp',100000.) -md=setmask(md,'','') -md=parameterize(md,'../Par/IceCube.py') -md.transient=transient.setallnullparameters(md.transient) -md.transient.ishydrology=True -md=setflowequation(md,'SSA','all') -md.cluster=generic('name',gethostname(),'np',1) -md.hydrology=hydrologydc() -md.hydrology=md.hydrology.initialize(md) +md = triangle(model(), '../Exp/Square.exp', 100000.) +md = setmask(md, '', '') +md = parameterize(md, '../Par/IceCube.py') +md.transient = transient.setallnullparameters(md.transient) +md.transient.ishydrology = True +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 1) +md.hydrology = hydrologydc() +md.hydrology = md.hydrology.initialize(md) -md.hydrology.isefficientlayer=0 -md.hydrology.sedimentlimit_flag=1 -md.hydrology.sedimentlimit=8000.0 -md.hydrology.mask_thawed_node=np.ones((md.mesh.numberofvertices)) -md.initialization.sediment_head=np.zeros((md.mesh.numberofvertices)) -md.hydrology.spcsediment_head=np.nan*np.ones((md.mesh.numberofvertices)) -md.hydrology.spcsediment_head[np.where(md.mesh.y==0)]=0.0 +md.hydrology.isefficientlayer = 0 +md.hydrology.sedimentlimit_flag = 1 +md.hydrology.sedimentlimit = 8000.0 +md.hydrology.mask_thawed_node = np.ones((md.mesh.numberofvertices)) +md.initialization.sediment_head = np.zeros((md.mesh.numberofvertices)) +md.hydrology.spcsediment_head = np.nan * np.ones((md.mesh.numberofvertices)) +md.hydrology.spcsediment_head[np.where(md.mesh.y == 0)] = 0.0 -md.basalforcings.groundedice_melting_rate = 2.0*np.ones((md.mesh.numberofvertices)) -md.basalforcings.floatingice_melting_rate = 0.0*np.ones((md.mesh.numberofvertices)) -md.hydrology.sediment_transmitivity= 3.0*np.ones((md.mesh.numberofvertices)) +md.basalforcings.groundedice_melting_rate = 2.0 * np.ones((md.mesh.numberofvertices)) +md.basalforcings.floatingice_melting_rate = 0.0 * np.ones((md.mesh.numberofvertices)) +md.hydrology.sediment_transmitivity = 3.0 * np.ones((md.mesh.numberofvertices)) -md.timestepping.time_step=0 -md.timestepping.final_time=1.0 -md.extrude(3,1.) -md=solve(md,'Hydrology') +md.timestepping.time_step = 0 +md.timestepping.final_time = 1.0 +md.extrude(3, 1.) +md = solve(md, 'Hydrology') #Fields and tolerances to track changes @@ -44,6 +44,5 @@ #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)) -field_names =['SedimentWaterHead','SedimentHeadResidual'] -field_tolerances=[1e-13, 3e-10] -field_values=[md.results.HydrologySolution.SedimentHeadHydrostep, - md.results.HydrologySolution.SedimentHeadResidual] +field_names = ['SedimentWaterHead', 'SedimentHeadResidual'] +field_tolerances = [1e-13, 3e-10] +field_values = [md.results.HydrologySolution.SedimentHeadHydrostep, md.results.HydrologySolution.SedimentHeadResidual] Index: /issm/trunk-jpl/test/NightlyRun/test335.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test335.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test335.py (revision 23793) @@ -13,59 +13,59 @@ from generic import generic -md=triangle(model(),'../Exp/Square.exp',100000.) -md=setmask(md,'','') -md=parameterize(md,'../Par/IceCube.py') -md.transient=transient.setallnullparameters(md.transient) -md.transient.ishydrology=True -md.transient.issmb=True -md=setflowequation(md,'SSA','all') -md.cluster=generic('name',gethostname(),'np',1) -md.hydrology=hydrologydc() -md.hydrology=md.hydrology.initialize(md) +md = triangle(model(), '../Exp/Square.exp', 100000.) +md = setmask(md, '', '') +md = parameterize(md, '../Par/IceCube.py') +md.transient = transient.setallnullparameters(md.transient) +md.transient.ishydrology = True +md.transient.issmb = True +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 1) +md.hydrology = hydrologydc() +md.hydrology = md.hydrology.initialize(md) -md.hydrology.isefficientlayer=1 -md.hydrology.sedimentlimit_flag=1 -md.hydrology.sedimentlimit=800.0 -md.hydrology.mask_thawed_node=np.ones((md.mesh.numberofvertices)) -md.initialization.sediment_head=np.zeros((md.mesh.numberofvertices)) -md.hydrology.spcsediment_head=np.nan*np.ones((md.mesh.numberofvertices)) -md.basalforcings.groundedice_melting_rate = 2.0*np.ones((md.mesh.numberofvertices)) +md.hydrology.isefficientlayer = 1 +md.hydrology.sedimentlimit_flag = 1 +md.hydrology.sedimentlimit = 800.0 +md.hydrology.mask_thawed_node = np.ones((md.mesh.numberofvertices)) +md.initialization.sediment_head = np.zeros((md.mesh.numberofvertices)) +md.hydrology.spcsediment_head = np.nan * np.ones((md.mesh.numberofvertices)) +md.basalforcings.groundedice_melting_rate = 2.0 * np.ones((md.mesh.numberofvertices)) md.basalforcings.floatingice_melting_rate = np.zeros((md.mesh.numberofvertices)) -md.hydrology.sediment_transmitivity=3*np.ones((md.mesh.numberofvertices)) +md.hydrology.sediment_transmitivity = 3 * np.ones((md.mesh.numberofvertices)) -md.initialization.epl_head=np.zeros((md.mesh.numberofvertices)) -md.initialization.epl_thickness=np.ones((md.mesh.numberofvertices)) -md.hydrology.spcepl_head=np.nan*np.ones((md.mesh.numberofvertices)) -md.hydrology.mask_eplactive_node=np.zeros((md.mesh.numberofvertices)) -md.hydrology.epl_conductivity=30 -md.hydrology.epl_initial_thickness=1 -md.hydrology.epl_colapse_thickness=1.0e-3 -md.hydrology.epl_thick_comp=1 -md.hydrology.epl_max_thickness=1 -md.timestepping.time_step=0.2 -md.timestepping.final_time=2.0 +md.initialization.epl_head = np.zeros((md.mesh.numberofvertices)) +md.initialization.epl_thickness = np.ones((md.mesh.numberofvertices)) +md.hydrology.spcepl_head = np.nan * np.ones((md.mesh.numberofvertices)) +md.hydrology.mask_eplactive_node = np.zeros((md.mesh.numberofvertices)) +md.hydrology.epl_conductivity = 30 +md.hydrology.epl_initial_thickness = 1 +md.hydrology.epl_colapse_thickness = 1.0e-3 +md.hydrology.epl_thick_comp = 1 +md.hydrology.epl_max_thickness = 1 +md.timestepping.time_step = 0.2 +md.timestepping.final_time = 2.0 -md.extrude(3,1.) -md=solve(md,'Transient') +md.extrude(3, 1.) +md = solve(md, 'Transient') #Fields and tolerances to track changes -field_names=['SedimentWaterHead1','EplWaterHead1','SedimentHeadResidual1', - 'SedimentWaterHead4','EplWaterHead4','SedimentHeadResidual4', - 'SedimentWaterHead5','EplWaterHead5','SedimentHeadResidual5', - 'SedimentWaterHead9','EplWaterHead9','SedimentHeadResidual9'] -field_tolerances=[1e-13, 1e-13, 1e-13, - 1e-13, 1e-13, 1e-13, - 1e-13, 5e-12, 2e-11, - 1e-13, 5e-12, 2e-11] -field_values=[md.results.TransientSolution[0].SedimentHeadHydrostep, - md.results.TransientSolution[0].EplHeadHydrostep, - md.results.TransientSolution[0].SedimentHeadResidual, - md.results.TransientSolution[3].SedimentHeadHydrostep, - md.results.TransientSolution[3].EplHeadHydrostep, - md.results.TransientSolution[3].SedimentHeadResidual, - md.results.TransientSolution[4].SedimentHeadHydrostep, - md.results.TransientSolution[4].EplHeadHydrostep, - md.results.TransientSolution[4].SedimentHeadResidual, - md.results.TransientSolution[8].SedimentHeadHydrostep, - md.results.TransientSolution[8].EplHeadHydrostep, - md.results.TransientSolution[8].SedimentHeadResidual] +field_names = ['SedimentWaterHead1', 'EplWaterHead1', 'SedimentHeadResidual1', + 'SedimentWaterHead4', 'EplWaterHead4', 'SedimentHeadResidual4', + 'SedimentWaterHead5', 'EplWaterHead5', 'SedimentHeadResidual5', + 'SedimentWaterHead9', 'EplWaterHead9', 'SedimentHeadResidual9'] +field_tolerances = [1e-13, 1e-13, 1e-13, + 1e-13, 1e-13, 1e-13, + 1e-13, 5e-12, 2e-11, + 1e-13, 5e-12, 2e-11] +field_values = [md.results.TransientSolution[0].SedimentHeadHydrostep, + md.results.TransientSolution[0].EplHeadHydrostep, + md.results.TransientSolution[0].SedimentHeadResidual, + md.results.TransientSolution[3].SedimentHeadHydrostep, + md.results.TransientSolution[3].EplHeadHydrostep, + md.results.TransientSolution[3].SedimentHeadResidual, + md.results.TransientSolution[4].SedimentHeadHydrostep, + md.results.TransientSolution[4].EplHeadHydrostep, + md.results.TransientSolution[4].SedimentHeadResidual, + md.results.TransientSolution[8].SedimentHeadHydrostep, + md.results.TransientSolution[8].EplHeadHydrostep, + md.results.TransientSolution[8].SedimentHeadResidual] Index: /issm/trunk-jpl/test/NightlyRun/test336.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test336.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test336.py (revision 23793) @@ -10,65 +10,65 @@ -md=triangle(model(),'../Exp/Square.exp',150000.) -md=setmask(md,'all','') -md=parameterize(md,'../Par/SquareShelf.py') -md=setflowequation(md,'SSA','all') -md.cluster=generic('name',gethostname(),'np',3) +md = triangle(model(), '../Exp/Square.exp', 150000.) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelf.py') +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) -md.timestepping.time_step=1. -md.settings.output_frequency=1 -md.timestepping.final_time=4. +md.timestepping.time_step = 1. +md.settings.output_frequency = 1 +md.timestepping.final_time = 4. #Set up transient -smb=np.ones((md.mesh.numberofvertices))*3.6 -smb=np.vstack((smb,smb*-1.)).T +smb = np.ones((md.mesh.numberofvertices)) * 3.6 +smb = np.vstack((smb, smb * -1.)).T -md.smb=SMBcomponents() -md.smb.accumulation=np.vstack((smb*2, [1.5,3.])) -md.smb.runoff=np.vstack((smb/2, [1.5,3.])) -md.smb.evaporation=np.vstack((smb/2, [1.5,3.])) -md.transient.isthermal=False +md.smb = SMBcomponents() +md.smb.accumulation = np.vstack((smb * 2, [1.5, 3.])) +md.smb.runoff = np.vstack((smb / 2, [1.5, 3.])) +md.smb.evaporation = np.vstack((smb / 2, [1.5, 3.])) +md.transient.isthermal = False -md=solve(md,'Transient') +md = solve(md, 'Transient') #Fields and tolerances to track changes -field_names=['Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','SmbMassBalance1', - 'Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2','SmbMassBalance2', - 'Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3','SmbMassBalance3', - 'Vx4','Vy4','Vel4','Pressure4','Bed4','Surface4','Thickness4','SmbMassBalance4'] -field_tolerances=[1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10, - 1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10, - 1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10, - 1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10] -field_values=[md.results.TransientSolution[0].Vx, - md.results.TransientSolution[0].Vy, - md.results.TransientSolution[0].Vel, - md.results.TransientSolution[0].Pressure, - md.results.TransientSolution[0].Base, - md.results.TransientSolution[0].Surface, - md.results.TransientSolution[0].Thickness, - md.results.TransientSolution[0].SmbMassBalance, - md.results.TransientSolution[1].Vx, - md.results.TransientSolution[1].Vy, - md.results.TransientSolution[1].Vel, - md.results.TransientSolution[1].Pressure, - md.results.TransientSolution[1].Base, - md.results.TransientSolution[1].Surface, - md.results.TransientSolution[1].Thickness, - md.results.TransientSolution[1].SmbMassBalance, - md.results.TransientSolution[2].Vx, - md.results.TransientSolution[2].Vy, - md.results.TransientSolution[2].Vel, - md.results.TransientSolution[2].Pressure, - md.results.TransientSolution[2].Base, - md.results.TransientSolution[2].Surface, - md.results.TransientSolution[2].Thickness, - md.results.TransientSolution[2].SmbMassBalance, - md.results.TransientSolution[3].Vx, - md.results.TransientSolution[3].Vy, - md.results.TransientSolution[3].Vel, - md.results.TransientSolution[3].Pressure, - md.results.TransientSolution[3].Base, - md.results.TransientSolution[3].Surface, - md.results.TransientSolution[3].Thickness, - md.results.TransientSolution[3].SmbMassBalance] +field_names = ['Vx1', 'Vy1', 'Vel1', 'Pressure1', 'Bed1', 'Surface1', 'Thickness1', 'SmbMassBalance1', + 'Vx2', 'Vy2', 'Vel2', 'Pressure2', 'Bed2', 'Surface2', 'Thickness2', 'SmbMassBalance2', + 'Vx3', 'Vy3', 'Vel3', 'Pressure3', 'Bed3', 'Surface3', 'Thickness3', 'SmbMassBalance3', + 'Vx4', 'Vy4', 'Vel4', 'Pressure4', 'Bed4', 'Surface4', 'Thickness4', 'SmbMassBalance4'] +field_tolerances = [1e-09, 1e-09, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10, + 1e-09, 1e-09, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10, + 1e-09, 1e-09, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10, + 1e-09, 1e-09, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10] +field_values = [md.results.TransientSolution[0].Vx, + md.results.TransientSolution[0].Vy, + md.results.TransientSolution[0].Vel, + md.results.TransientSolution[0].Pressure, + md.results.TransientSolution[0].Base, + md.results.TransientSolution[0].Surface, + md.results.TransientSolution[0].Thickness, + md.results.TransientSolution[0].SmbMassBalance, + md.results.TransientSolution[1].Vx, + md.results.TransientSolution[1].Vy, + md.results.TransientSolution[1].Vel, + md.results.TransientSolution[1].Pressure, + md.results.TransientSolution[1].Base, + md.results.TransientSolution[1].Surface, + md.results.TransientSolution[1].Thickness, + md.results.TransientSolution[1].SmbMassBalance, + md.results.TransientSolution[2].Vx, + md.results.TransientSolution[2].Vy, + md.results.TransientSolution[2].Vel, + md.results.TransientSolution[2].Pressure, + md.results.TransientSolution[2].Base, + md.results.TransientSolution[2].Surface, + md.results.TransientSolution[2].Thickness, + md.results.TransientSolution[2].SmbMassBalance, + md.results.TransientSolution[3].Vx, + md.results.TransientSolution[3].Vy, + md.results.TransientSolution[3].Vel, + md.results.TransientSolution[3].Pressure, + md.results.TransientSolution[3].Base, + md.results.TransientSolution[3].Surface, + md.results.TransientSolution[3].Thickness, + md.results.TransientSolution[3].SmbMassBalance] Index: /issm/trunk-jpl/test/NightlyRun/test337.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test337.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test337.py (revision 23793) @@ -10,66 +10,66 @@ -md=triangle(model(),'../Exp/Square.exp',150000.) -md=setmask(md,'all','') -md=parameterize(md,'../Par/SquareShelf.py') -md.extrude(3,1.) -md=setflowequation(md,'HO','all') -md.cluster=generic('name',gethostname(),'np',3) +md = triangle(model(), '../Exp/Square.exp', 150000.) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelf.py') +md.extrude(3, 1.) +md = setflowequation(md, 'HO', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) -md.timestepping.time_step=1. -md.settings.output_frequency=1 -md.timestepping.final_time=4. +md.timestepping.time_step = 1. +md.settings.output_frequency = 1 +md.timestepping.final_time = 4. #Set up transient -smb=np.ones((md.mesh.numberofvertices))*3.6 -smb=np.vstack((smb,smb*-1.)).T +smb = np.ones((md.mesh.numberofvertices)) * 3.6 +smb = np.vstack((smb, smb * -1.)).T -md.smb=SMBcomponents() -md.smb.accumulation=np.vstack((smb*2, [1.5,3.])) -md.smb.runoff=np.vstack((smb/2, [1.5,3.])) -md.smb.evaporation=np.vstack((smb/2, [1.5,3.])) -md.transient.isthermal=False +md.smb = SMBcomponents() +md.smb.accumulation = np.vstack((smb * 2, [1.5, 3.])) +md.smb.runoff = np.vstack((smb / 2, [1.5, 3.])) +md.smb.evaporation = np.vstack((smb / 2, [1.5, 3.])) +md.transient.isthermal = False -md=solve(md,'Transient') +md = solve(md, 'Transient') #Fields and tolerances to track changes -field_names=['Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','SmbMassBalance1', - 'Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2','SmbMassBalance2', - 'Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3','SmbMassBalance3', - 'Vx4','Vy4','Vel4','Pressure4','Bed4','Surface4','Thickness4','SmbMassBalance4'] -field_tolerances=[5e-09,1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10, - 5e-09,1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10, - 5e-09,1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10, - 5e-09,1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10] -field_values=[md.results.TransientSolution[0].Vx, - md.results.TransientSolution[0].Vy, - md.results.TransientSolution[0].Vel, - md.results.TransientSolution[0].Pressure, - md.results.TransientSolution[0].Base, - md.results.TransientSolution[0].Surface, - md.results.TransientSolution[0].Thickness, - md.results.TransientSolution[0].SmbMassBalance, - md.results.TransientSolution[1].Vx, - md.results.TransientSolution[1].Vy, - md.results.TransientSolution[1].Vel, - md.results.TransientSolution[1].Pressure, - md.results.TransientSolution[1].Base, - md.results.TransientSolution[1].Surface, - md.results.TransientSolution[1].Thickness, - md.results.TransientSolution[1].SmbMassBalance, - md.results.TransientSolution[2].Vx, - md.results.TransientSolution[2].Vy, - md.results.TransientSolution[2].Vel, - md.results.TransientSolution[2].Pressure, - md.results.TransientSolution[2].Base, - md.results.TransientSolution[2].Surface, - md.results.TransientSolution[2].Thickness, - md.results.TransientSolution[2].SmbMassBalance, - md.results.TransientSolution[3].Vx, - md.results.TransientSolution[3].Vy, - md.results.TransientSolution[3].Vel, - md.results.TransientSolution[3].Pressure, - md.results.TransientSolution[3].Base, - md.results.TransientSolution[3].Surface, - md.results.TransientSolution[3].Thickness, - md.results.TransientSolution[3].SmbMassBalance] +field_names = ['Vx1', 'Vy1', 'Vel1', 'Pressure1', 'Bed1', 'Surface1', 'Thickness1', 'SmbMassBalance1', + 'Vx2', 'Vy2', 'Vel2', 'Pressure2', 'Bed2', 'Surface2', 'Thickness2', 'SmbMassBalance2', + 'Vx3', 'Vy3', 'Vel3', 'Pressure3', 'Bed3', 'Surface3', 'Thickness3', 'SmbMassBalance3', + 'Vx4', 'Vy4', 'Vel4', 'Pressure4', 'Bed4', 'Surface4', 'Thickness4', 'SmbMassBalance4'] +field_tolerances = [5e-09, 1e-09, 1e-09, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10, + 5e-09, 1e-09, 1e-09, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10, + 5e-09, 1e-09, 1e-09, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10, + 5e-09, 1e-09, 1e-09, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10] +field_values = [md.results.TransientSolution[0].Vx, + md.results.TransientSolution[0].Vy, + md.results.TransientSolution[0].Vel, + md.results.TransientSolution[0].Pressure, + md.results.TransientSolution[0].Base, + md.results.TransientSolution[0].Surface, + md.results.TransientSolution[0].Thickness, + md.results.TransientSolution[0].SmbMassBalance, + md.results.TransientSolution[1].Vx, + md.results.TransientSolution[1].Vy, + md.results.TransientSolution[1].Vel, + md.results.TransientSolution[1].Pressure, + md.results.TransientSolution[1].Base, + md.results.TransientSolution[1].Surface, + md.results.TransientSolution[1].Thickness, + md.results.TransientSolution[1].SmbMassBalance, + md.results.TransientSolution[2].Vx, + md.results.TransientSolution[2].Vy, + md.results.TransientSolution[2].Vel, + md.results.TransientSolution[2].Pressure, + md.results.TransientSolution[2].Base, + md.results.TransientSolution[2].Surface, + md.results.TransientSolution[2].Thickness, + md.results.TransientSolution[2].SmbMassBalance, + md.results.TransientSolution[3].Vx, + md.results.TransientSolution[3].Vy, + md.results.TransientSolution[3].Vel, + md.results.TransientSolution[3].Pressure, + md.results.TransientSolution[3].Base, + md.results.TransientSolution[3].Surface, + md.results.TransientSolution[3].Thickness, + md.results.TransientSolution[3].SmbMassBalance] Index: /issm/trunk-jpl/test/NightlyRun/test338.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test338.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test338.py (revision 23793) @@ -10,66 +10,66 @@ -md=triangle(model(),'../Exp/Square.exp',150000.) -md=setmask(md,'all','') -md=parameterize(md,'../Par/SquareShelf.py') -md=setflowequation(md,'SSA','all') -md.cluster=generic('name',gethostname(),'np',3) +md = triangle(model(), '../Exp/Square.exp', 150000.) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelf.py') +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) -md.timestepping.time_step=1. -md.settings.output_frequency=1 -md.timestepping.final_time=400. +md.timestepping.time_step = 1. +md.settings.output_frequency = 1 +md.timestepping.final_time = 400. #Set up transient -smb=np.ones((md.mesh.numberofvertices))*3.6 -smb=np.vstack((smb,smb*-1.)).T +smb = np.ones((md.mesh.numberofvertices)) * 3.6 +smb = np.vstack((smb, smb * -1.)).T -md.smb=SMBmeltcomponents() -md.smb.accumulation=np.vstack((smb, [1.5,3.])) -md.smb.evaporation=np.vstack((smb/2, [1.5,3.])) -md.smb.melt=np.vstack((smb/2, [1.5,3.])) -md.smb.refreeze=np.vstack((smb, [1.5,3.])) -md.transient.isthermal=False +md.smb = SMBmeltcomponents() +md.smb.accumulation = np.vstack((smb, [1.5, 3.])) +md.smb.evaporation = np.vstack((smb / 2, [1.5, 3.])) +md.smb.melt = np.vstack((smb / 2, [1.5, 3.])) +md.smb.refreeze = np.vstack((smb, [1.5, 3.])) +md.transient.isthermal = False -md=solve(md,'Transient') +md = solve(md, 'Transient') #Fields and tolerances to track changes -field_names=['Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','SmbMassBalance1', - 'Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2','SmbMassBalance2', - 'Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3','SmbMassBalance3', - 'Vx4','Vy4','Vel4','Pressure4','Bed4','Surface4','Thickness4','SmbMassBalance4'] -field_tolerances=[1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10, - 1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10, - 1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10, - 1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10] -field_values=[md.results.TransientSolution[0].Vx, - md.results.TransientSolution[0].Vy, - md.results.TransientSolution[0].Vel, - md.results.TransientSolution[0].Pressure, - md.results.TransientSolution[0].Base, - md.results.TransientSolution[0].Surface, - md.results.TransientSolution[0].Thickness, - md.results.TransientSolution[0].SmbMassBalance, - md.results.TransientSolution[1].Vx, - md.results.TransientSolution[1].Vy, - md.results.TransientSolution[1].Vel, - md.results.TransientSolution[1].Pressure, - md.results.TransientSolution[1].Base, - md.results.TransientSolution[1].Surface, - md.results.TransientSolution[1].Thickness, - md.results.TransientSolution[1].SmbMassBalance, - md.results.TransientSolution[2].Vx, - md.results.TransientSolution[2].Vy, - md.results.TransientSolution[2].Vel, - md.results.TransientSolution[2].Pressure, - md.results.TransientSolution[2].Base, - md.results.TransientSolution[2].Surface, - md.results.TransientSolution[2].Thickness, - md.results.TransientSolution[2].SmbMassBalance, - md.results.TransientSolution[3].Vx, - md.results.TransientSolution[3].Vy, - md.results.TransientSolution[3].Vel, - md.results.TransientSolution[3].Pressure, - md.results.TransientSolution[3].Base, - md.results.TransientSolution[3].Surface, - md.results.TransientSolution[3].Thickness, - md.results.TransientSolution[3].SmbMassBalance] +field_names = ['Vx1', 'Vy1', 'Vel1', 'Pressure1', 'Bed1', 'Surface1', 'Thickness1', 'SmbMassBalance1', + 'Vx2', 'Vy2', 'Vel2', 'Pressure2', 'Bed2', 'Surface2', 'Thickness2', 'SmbMassBalance2', + 'Vx3', 'Vy3', 'Vel3', 'Pressure3', 'Bed3', 'Surface3', 'Thickness3', 'SmbMassBalance3', + 'Vx4', 'Vy4', 'Vel4', 'Pressure4', 'Bed4', 'Surface4', 'Thickness4', 'SmbMassBalance4'] +field_tolerances = [1e-09, 1e-09, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10, + 1e-09, 1e-09, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10, + 1e-09, 1e-09, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10, + 1e-09, 1e-09, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10] +field_values = [md.results.TransientSolution[0].Vx, + md.results.TransientSolution[0].Vy, + md.results.TransientSolution[0].Vel, + md.results.TransientSolution[0].Pressure, + md.results.TransientSolution[0].Base, + md.results.TransientSolution[0].Surface, + md.results.TransientSolution[0].Thickness, + md.results.TransientSolution[0].SmbMassBalance, + md.results.TransientSolution[1].Vx, + md.results.TransientSolution[1].Vy, + md.results.TransientSolution[1].Vel, + md.results.TransientSolution[1].Pressure, + md.results.TransientSolution[1].Base, + md.results.TransientSolution[1].Surface, + md.results.TransientSolution[1].Thickness, + md.results.TransientSolution[1].SmbMassBalance, + md.results.TransientSolution[2].Vx, + md.results.TransientSolution[2].Vy, + md.results.TransientSolution[2].Vel, + md.results.TransientSolution[2].Pressure, + md.results.TransientSolution[2].Base, + md.results.TransientSolution[2].Surface, + md.results.TransientSolution[2].Thickness, + md.results.TransientSolution[2].SmbMassBalance, + md.results.TransientSolution[3].Vx, + md.results.TransientSolution[3].Vy, + md.results.TransientSolution[3].Vel, + md.results.TransientSolution[3].Pressure, + md.results.TransientSolution[3].Base, + md.results.TransientSolution[3].Surface, + md.results.TransientSolution[3].Thickness, + md.results.TransientSolution[3].SmbMassBalance] Index: /issm/trunk-jpl/test/NightlyRun/test339.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test339.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test339.py (revision 23793) @@ -10,67 +10,67 @@ -md=triangle(model(),'../Exp/Square.exp',150000.) -md=setmask(md,'all','') -md=parameterize(md,'../Par/SquareShelf.py') -md.extrude(3,1.) -md=setflowequation(md,'HO','all') -md.cluster=generic('name',gethostname(),'np',3) +md = triangle(model(), '../Exp/Square.exp', 150000.) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelf.py') +md.extrude(3, 1.) +md = setflowequation(md, 'HO', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) -md.timestepping.time_step=1. -md.settings.output_frequency=1 -md.timestepping.final_time=4. +md.timestepping.time_step = 1. +md.settings.output_frequency = 1 +md.timestepping.final_time = 4. #Set up transient -smb=np.ones((md.mesh.numberofvertices))*3.6 -smb=np.vstack((smb,smb*-1.)).T +smb = np.ones((md.mesh.numberofvertices)) * 3.6 +smb = np.vstack((smb, smb * - 1.)).T -md.smb=SMBmeltcomponents() -md.smb.accumulation=np.vstack((smb, [1.5,3.])) -md.smb.evaporation=np.vstack((smb/2, [1.5,3.])) -md.smb.melt=np.vstack((smb/2, [1.5,3.])) -md.smb.refreeze=np.vstack((smb, [1.5,3.])) -md.transient.isthermal=False +md.smb = SMBmeltcomponents() +md.smb.accumulation = np.vstack((smb, [1.5, 3.])) +md.smb.evaporation = np.vstack((smb / 2, [1.5, 3.])) +md.smb.melt = np.vstack((smb / 2, [1.5, 3.])) +md.smb.refreeze = np.vstack((smb, [1.5, 3.])) +md.transient.isthermal = False -md=solve(md,'Transient') +md = solve(md, 'Transient') #Fields and tolerances to track changes -field_names=['Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','SmbMassBalance1', - 'Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2','SmbMassBalance2', - 'Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3','SmbMassBalance3', - 'Vx4','Vy4','Vel4','Pressure4','Bed4','Surface4','Thickness4','SmbMassBalance4'] -field_tolerances=[2e-09,1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10, - 2e-09,1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10, - 1e-09,1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10, - 1e-09,1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10] -field_values=[md.results.TransientSolution[0].Vx, - md.results.TransientSolution[0].Vy, - md.results.TransientSolution[0].Vel, - md.results.TransientSolution[0].Pressure, - md.results.TransientSolution[0].Base, - md.results.TransientSolution[0].Surface, - md.results.TransientSolution[0].Thickness, - md.results.TransientSolution[0].SmbMassBalance, - md.results.TransientSolution[1].Vx, - md.results.TransientSolution[1].Vy, - md.results.TransientSolution[1].Vel, - md.results.TransientSolution[1].Pressure, - md.results.TransientSolution[1].Base, - md.results.TransientSolution[1].Surface, - md.results.TransientSolution[1].Thickness, - md.results.TransientSolution[1].SmbMassBalance, - md.results.TransientSolution[2].Vx, - md.results.TransientSolution[2].Vy, - md.results.TransientSolution[2].Vel, - md.results.TransientSolution[2].Pressure, - md.results.TransientSolution[2].Base, - md.results.TransientSolution[2].Surface, - md.results.TransientSolution[2].Thickness, - md.results.TransientSolution[2].SmbMassBalance, - md.results.TransientSolution[3].Vx, - md.results.TransientSolution[3].Vy, - md.results.TransientSolution[3].Vel, - md.results.TransientSolution[3].Pressure, - md.results.TransientSolution[3].Base, - md.results.TransientSolution[3].Surface, - md.results.TransientSolution[3].Thickness, - md.results.TransientSolution[3].SmbMassBalance] +field_names = ['Vx1', 'Vy1', 'Vel1', 'Pressure1', 'Bed1', 'Surface1', 'Thickness1', 'SmbMassBalance1', + 'Vx2', 'Vy2', 'Vel2', 'Pressure2', 'Bed2', 'Surface2', 'Thickness2', 'SmbMassBalance2', + 'Vx3', 'Vy3', 'Vel3', 'Pressure3', 'Bed3', 'Surface3', 'Thickness3', 'SmbMassBalance3', + 'Vx4', 'Vy4', 'Vel4', 'Pressure4', 'Bed4', 'Surface4', 'Thickness4', 'SmbMassBalance4'] +field_tolerances = [2e-09, 1e-09, 1e-09, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10, + 2e-09, 1e-09, 1e-09, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10, + 1e-09, 1e-09, 1e-09, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10, + 1e-09, 1e-09, 1e-09, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10] +field_values = [md.results.TransientSolution[0].Vx, + md.results.TransientSolution[0].Vy, + md.results.TransientSolution[0].Vel, + md.results.TransientSolution[0].Pressure, + md.results.TransientSolution[0].Base, + md.results.TransientSolution[0].Surface, + md.results.TransientSolution[0].Thickness, + md.results.TransientSolution[0].SmbMassBalance, + md.results.TransientSolution[1].Vx, + md.results.TransientSolution[1].Vy, + md.results.TransientSolution[1].Vel, + md.results.TransientSolution[1].Pressure, + md.results.TransientSolution[1].Base, + md.results.TransientSolution[1].Surface, + md.results.TransientSolution[1].Thickness, + md.results.TransientSolution[1].SmbMassBalance, + md.results.TransientSolution[2].Vx, + md.results.TransientSolution[2].Vy, + md.results.TransientSolution[2].Vel, + md.results.TransientSolution[2].Pressure, + md.results.TransientSolution[2].Base, + md.results.TransientSolution[2].Surface, + md.results.TransientSolution[2].Thickness, + md.results.TransientSolution[2].SmbMassBalance, + md.results.TransientSolution[3].Vx, + md.results.TransientSolution[3].Vy, + md.results.TransientSolution[3].Vel, + md.results.TransientSolution[3].Pressure, + md.results.TransientSolution[3].Base, + md.results.TransientSolution[3].Surface, + md.results.TransientSolution[3].Thickness, + md.results.TransientSolution[3].SmbMassBalance] Index: /issm/trunk-jpl/test/NightlyRun/test340.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test340.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test340.py (revision 23793) @@ -10,9 +10,9 @@ from taoinversion import * -md = triangle(model(),'../Exp/Square.exp',200000.) -md = setmask(md,'','') -md = parameterize(md,'../Par/SquareSheetConstrained.py') -md.extrude(3,1.) -md = setflowequation(md,'HO','all') +md = triangle(model(), '../Exp/Square.exp', 200000.) +md = setmask(md, '', '') +md = parameterize(md, '../Par/SquareSheetConstrained.py') +md.extrude(3, 1.) +md = setflowequation(md, 'HO', 'all') #control parameters @@ -20,27 +20,25 @@ md.inversion.iscontrol = 1 md.inversion.control_parameters = ['FrictionCoefficient'] -md.inversion.min_parameters = 1. * np.ones((md.mesh.numberofvertices,len(md.inversion.control_parameters))) -md.inversion.max_parameters = 200. * np.ones((md.mesh.numberofvertices,len(md.inversion.control_parameters))) +md.inversion.min_parameters = 1. * np.ones((md.mesh.numberofvertices, len(md.inversion.control_parameters))) +md.inversion.max_parameters = 200. * np.ones((md.mesh.numberofvertices, len(md.inversion.control_parameters))) md.inversion.maxsteps = 2 md.inversion.maxiter = 6 -md.inversion.cost_functions = [102,501] -md.inversion.cost_functions_coefficients = np.ones((md.mesh.numberofvertices,2)) -md.inversion.cost_functions_coefficients[:,1] = 2. * 1e-7 +md.inversion.cost_functions = [102, 501] +md.inversion.cost_functions_coefficients = np.ones((md.mesh.numberofvertices, 2)) +md.inversion.cost_functions_coefficients[:, 1] = 2. * 1e-7 md.inversion.vx_obs = md.initialization.vx md.inversion.vy_obs = md.initialization.vy -md.cluster = generic('name',gethostname(),'np',3) -md = solve(md,'Stressbalance') +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'Stressbalance') #Fields and tolerances to track changes -field_names = ['Gradient','Misfits','FrictionCoefficient','Pressure','Vel','Vx','Vy'] -field_tolerances = [3e-08,1e-07,5e-10,1e-10,1e-09,1e-09,1e-09] -field_values = [ - md.results.StressbalanceSolution.Gradient1, - md.results.StressbalanceSolution.J, - md.results.StressbalanceSolution.FrictionCoefficient, - md.results.StressbalanceSolution.Pressure, - md.results.StressbalanceSolution.Vel, - md.results.StressbalanceSolution.Vx, - md.results.StressbalanceSolution.Vy -] +field_names = ['Gradient', 'Misfits', 'FrictionCoefficient', 'Pressure', 'Vel', 'Vx', 'Vy'] +field_tolerances = [3e-08, 1e-07, 5e-10, 1e-10, 1e-09, 1e-09, 1e-09] +field_values = [md.results.StressbalanceSolution.Gradient1, + md.results.StressbalanceSolution.J, + md.results.StressbalanceSolution.FrictionCoefficient, + md.results.StressbalanceSolution.Pressure, + md.results.StressbalanceSolution.Vel, + md.results.StressbalanceSolution.Vx, + md.results.StressbalanceSolution.Vy] Index: /issm/trunk-jpl/test/NightlyRun/test341.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test341.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test341.py (revision 23793) @@ -11,36 +11,34 @@ -md=triangle(model(),'../Exp/Square.exp',200000.) -md=setmask(md,'','') -md=parameterize(md,'../Par/SquareSheetConstrained.py') -md.extrude(3,1.) -md=setflowequation(md,'HO','all') +md = triangle(model(), '../Exp/Square.exp', 200000.) +md = setmask(md, '', '') +md = parameterize(md, '../Par/SquareSheetConstrained.py') +md.extrude(3, 1.) +md = setflowequation(md, 'HO', 'all') #control parameters -md.inversion=m1qn3inversion(md.inversion) -md.inversion.iscontrol=1 -md.inversion.control_parameters=['FrictionCoefficient'] -md.inversion.min_parameters=1.*np.ones((md.mesh.numberofvertices,len(md.inversion.control_parameters))) -md.inversion.max_parameters=200.*np.ones((md.mesh.numberofvertices,len(md.inversion.control_parameters))) -md.inversion.maxsteps=2 -md.inversion.maxiter=6 -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.vx_obs=md.initialization.vx -md.inversion.vy_obs=md.initialization.vy +md.inversion = m1qn3inversion(md.inversion) +md.inversion.iscontrol = 1 +md.inversion.control_parameters = ['FrictionCoefficient'] +md.inversion.min_parameters = 1. * np.ones((md.mesh.numberofvertices, len(md.inversion.control_parameters))) +md.inversion.max_parameters = 200. * np.ones((md.mesh.numberofvertices, len(md.inversion.control_parameters))) +md.inversion.maxsteps = 2 +md.inversion.maxiter = 6 +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.vx_obs = md.initialization.vx +md.inversion.vy_obs = md.initialization.vy -md.cluster=generic('name',gethostname(),'np',3) -md=solve(md,'Stressbalance') +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'Stressbalance') #Fields and tolerances to track changes -field_names =['Gradient','FrictionCoefficient','Pressure','Vel','Vx','Vy'] -field_tolerances=[1e-08,1e-9,1e-10,1e-09,1e-09,1e-09] -field_values=[\ - md.results.StressbalanceSolution.Gradient1,\ - md.results.StressbalanceSolution.FrictionCoefficient,\ - md.results.StressbalanceSolution.Pressure,\ - md.results.StressbalanceSolution.Vel,\ - md.results.StressbalanceSolution.Vx,\ - md.results.StressbalanceSolution.Vy,\ -] +field_names = ['Gradient', 'FrictionCoefficient', 'Pressure', 'Vel', 'Vx', 'Vy'] +field_tolerances = [1e-08, 1e-9, 1e-10, 1e-09, 1e-09, 1e-09] +field_values = [md.results.StressbalanceSolution.Gradient1, + md.results.StressbalanceSolution.FrictionCoefficient, + md.results.StressbalanceSolution.Pressure, + md.results.StressbalanceSolution.Vel, + md.results.StressbalanceSolution.Vx, + md.results.StressbalanceSolution.Vy] Index: /issm/trunk-jpl/test/NightlyRun/test342.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test342.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test342.py (revision 23793) @@ -10,7 +10,7 @@ from plumebasalforcings import * -md = triangle(model(),'../Exp/Square.exp',180000.) -md = setmask(md,'','') -md = parameterize(md,'../Par/SquareSheetConstrained.py') +md = triangle(model(), '../Exp/Square.exp', 180000.) +md = setmask(md, '', '') +md = parameterize(md, '../Par/SquareSheetConstrained.py') md.basalforcings = plumebasalforcings() md.basalforcings = md.basalforcings.setdefaultparameters() @@ -19,17 +19,15 @@ md.basalforcings.plumex = 500000 md.basalforcings.plumey = 500000 -md.extrude(3,1.) -md = setflowequation(md,'SSA','all') +md.extrude(3, 1.) +md = setflowequation(md, 'SSA', 'all') md.timestepping.time_step = 0. -md.thermal.requested_outputs = ['default','BasalforcingsGeothermalflux'] -md.cluster = generic('name',gethostname(),'np',3) -md = solve(md,'Thermal') +md.thermal.requested_outputs = ['default', 'BasalforcingsGeothermalflux'] +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'Thermal') #Fields and tolerances to track changes -field_names = ['Temperature','BasalforcingsGroundediceMeltingRate','BasalforcingsGeothermalflux'] -field_tolerances = [1e-13,1e-8,1e-13] -field_values = [ - md.results.ThermalSolution.Temperature, - md.results.ThermalSolution.BasalforcingsGroundediceMeltingRate, - md.results.ThermalSolution.BasalforcingsGeothermalflux, - ] +field_names = ['Temperature', 'BasalforcingsGroundediceMeltingRate', 'BasalforcingsGeothermalflux'] +field_tolerances = [1e-13, 1e-8, 1e-13] +field_values = [md.results.ThermalSolution.Temperature, + md.results.ThermalSolution.BasalforcingsGroundediceMeltingRate, + md.results.ThermalSolution.BasalforcingsGeothermalflux] Index: /issm/trunk-jpl/test/NightlyRun/test343.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test343.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test343.py (revision 23793) @@ -10,14 +10,14 @@ from SMBgradientsela import * -md = triangle(model(),'../Exp/Square.exp',150000.) -md = setmask(md,'','') -md = parameterize(md,'../Par/SquareSheetConstrained.py') -md = setflowequation(md,'SSA','all') +md = triangle(model(), '../Exp/Square.exp', 150000.) +md = setmask(md, '', '') +md = parameterize(md, '../Par/SquareSheetConstrained.py') +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 @@ -26,41 +26,37 @@ #Transient options -md.transient.requested_outputs = ['default','TotalSmb'] -md.cluster = generic('name',gethostname(),'np',3) -md = solve(md,'Transient') +md.transient.requested_outputs = ['default', 'TotalSmb'] +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'Transient') #Fields and tolerances to track changes -field_names = [ - 'Vx1','Vy1','Vel1','Bed1','Surface1','Thickness1','SMB1','TotalSmb1', - 'Vx2','Vy2','Vel2','Bed2','Surface2','Thickness2','SMB2','TotalSmb2', - 'Vx3','Vy3','Vel3','Bed3','Surface3','Thickness3','SMB3','TotalSmb3'] -field_tolerances = [ - 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13, - 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13, - 1e-12,1e-12,1e-12,1e-13,1e-13,1e-13,1.5e-13,1e-13] -field_values = [ - md.results.TransientSolution[0].Vx, - md.results.TransientSolution[0].Vy, - md.results.TransientSolution[0].Vel, - md.results.TransientSolution[0].Base, - md.results.TransientSolution[0].Surface, - md.results.TransientSolution[0].Thickness, - md.results.TransientSolution[0].SmbMassBalance, - md.results.TransientSolution[0].TotalSmb, - md.results.TransientSolution[1].Vx, - md.results.TransientSolution[1].Vy, - md.results.TransientSolution[1].Vel, - md.results.TransientSolution[1].Base, - md.results.TransientSolution[1].Surface, - md.results.TransientSolution[1].Thickness, - md.results.TransientSolution[1].TotalSmb, - md.results.TransientSolution[1].SmbMassBalance, - md.results.TransientSolution[2].Vx, - md.results.TransientSolution[2].Vy, - md.results.TransientSolution[2].Vel, - md.results.TransientSolution[2].Base, - md.results.TransientSolution[2].Surface, - md.results.TransientSolution[2].Thickness, - md.results.TransientSolution[2].SmbMassBalance, - md.results.TransientSolution[2].TotalSmb - ] +field_names = ['Vx1', 'Vy1', 'Vel1', 'Bed1', 'Surface1', 'Thickness1', 'SMB1', 'TotalSmb1', + 'Vx2', 'Vy2', 'Vel2', 'Bed2', 'Surface2', 'Thickness2', 'SMB2', 'TotalSmb2', + 'Vx3', 'Vy3', 'Vel3', 'Bed3', 'Surface3', 'Thickness3', 'SMB3', 'TotalSmb3'] +field_tolerances = [1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, + 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, + 1e-12, 1e-12, 1e-12, 1e-13, 1e-13, 1e-13, 1.5e-13, 1e-13] +field_values = [md.results.TransientSolution[0].Vx, + md.results.TransientSolution[0].Vy, + md.results.TransientSolution[0].Vel, + md.results.TransientSolution[0].Base, + md.results.TransientSolution[0].Surface, + md.results.TransientSolution[0].Thickness, + md.results.TransientSolution[0].SmbMassBalance, + md.results.TransientSolution[0].TotalSmb, + md.results.TransientSolution[1].Vx, + md.results.TransientSolution[1].Vy, + md.results.TransientSolution[1].Vel, + md.results.TransientSolution[1].Base, + md.results.TransientSolution[1].Surface, + md.results.TransientSolution[1].Thickness, + md.results.TransientSolution[1].TotalSmb, + md.results.TransientSolution[1].SmbMassBalance, + md.results.TransientSolution[2].Vx, + md.results.TransientSolution[2].Vy, + md.results.TransientSolution[2].Vel, + md.results.TransientSolution[2].Base, + md.results.TransientSolution[2].Surface, + md.results.TransientSolution[2].Thickness, + md.results.TransientSolution[2].SmbMassBalance, + md.results.TransientSolution[2].TotalSmb] Index: /issm/trunk-jpl/test/NightlyRun/test344.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test344.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test344.py (revision 23793) @@ -10,7 +10,7 @@ from SMBgradientsela import * -md = triangle(model(),'../Exp/Square.exp',150000.) -md = setmask(md,'','') -md = parameterize(md,'../Par/SquareSheetConstrained.py') +md = triangle(model(), '../Exp/Square.exp', 150000.) +md = setmask(md, '', '') +md = parameterize(md, '../Par/SquareSheetConstrained.py') #Change geometry @@ -18,56 +18,54 @@ md.geometry.surface = md.geometry.base + md.geometry.thickness -md = md.extrude(3,1.) -md = setflowequation(md,'HO','all') +md = md.extrude(3, 1.) +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,)) #Transient options -md.transient.requested_outputs = ['default','TotalSmb'] -md.cluster = generic('name',gethostname(),'np',3) -md = solve(md,'Transient') +md.transient.requested_outputs = ['default', 'TotalSmb'] +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'Transient') #Fields and tolerances to track changes -field_names = ['Vx1','Vy1','Vz1','Vel1','Bed1','Surface1','Thickness1','Temperature1','SMB1','TotalSmb1', - 'Vx2','Vy2','Vz2','Vel2','Bed2','Surface2','Thickness2','Temperature2','SMB2','TotalSmb2', - 'Vx3','Vy3','Vz3','Vel3','Bed3','Surface3','Thickness3','Temperature3','SMB3','TotalSmb3'] -field_tolerances = [1e-09,1e-09,1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10, - 1e-09,1e-09,1e-10,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10, - 1e-09,5e-09,1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10] -field_values = [ - md.results.TransientSolution[0].Vx, - md.results.TransientSolution[0].Vy, - md.results.TransientSolution[0].Vz, - md.results.TransientSolution[0].Vel, - md.results.TransientSolution[0].Base, - md.results.TransientSolution[0].Surface, - md.results.TransientSolution[0].Thickness, - md.results.TransientSolution[0].Temperature, - md.results.TransientSolution[0].SmbMassBalance, - md.results.TransientSolution[0].TotalSmb, - md.results.TransientSolution[1].Vx, - md.results.TransientSolution[1].Vy, - md.results.TransientSolution[1].Vz, - md.results.TransientSolution[1].Vel, - md.results.TransientSolution[1].Base, - md.results.TransientSolution[1].Surface, - md.results.TransientSolution[1].Thickness, - md.results.TransientSolution[1].Temperature, - md.results.TransientSolution[1].SmbMassBalance, - md.results.TransientSolution[1].TotalSmb, - md.results.TransientSolution[2].Vx, - md.results.TransientSolution[2].Vy, - md.results.TransientSolution[2].Vz, - md.results.TransientSolution[2].Vel, - md.results.TransientSolution[2].Base, - md.results.TransientSolution[2].Surface, - md.results.TransientSolution[2].Thickness, - md.results.TransientSolution[2].Temperature, - md.results.TransientSolution[2].SmbMassBalance, - md.results.TransientSolution[2].TotalSmb, - ] +field_names = ['Vx1', 'Vy1', 'Vz1', 'Vel1', 'Bed1', 'Surface1', 'Thickness1', 'Temperature1', 'SMB1', 'TotalSmb1', + 'Vx2', 'Vy2', 'Vz2', 'Vel2', 'Bed2', 'Surface2', 'Thickness2', 'Temperature2', 'SMB2', 'TotalSmb2', + 'Vx3', 'Vy3', 'Vz3', 'Vel3', 'Bed3', 'Surface3', 'Thickness3', 'Temperature3', 'SMB3', 'TotalSmb3'] +field_tolerances = [1e-09, 1e-09, 1e-09, 1e-09, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10, + 1e-09, 1e-09, 1e-10, 1e-09, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10, + 1e-09, 5e-09, 1e-09, 1e-09, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10] +field_values = [md.results.TransientSolution[0].Vx, + md.results.TransientSolution[0].Vy, + md.results.TransientSolution[0].Vz, + md.results.TransientSolution[0].Vel, + md.results.TransientSolution[0].Base, + md.results.TransientSolution[0].Surface, + md.results.TransientSolution[0].Thickness, + md.results.TransientSolution[0].Temperature, + md.results.TransientSolution[0].SmbMassBalance, + md.results.TransientSolution[0].TotalSmb, + md.results.TransientSolution[1].Vx, + md.results.TransientSolution[1].Vy, + md.results.TransientSolution[1].Vz, + md.results.TransientSolution[1].Vel, + md.results.TransientSolution[1].Base, + md.results.TransientSolution[1].Surface, + md.results.TransientSolution[1].Thickness, + md.results.TransientSolution[1].Temperature, + md.results.TransientSolution[1].SmbMassBalance, + md.results.TransientSolution[1].TotalSmb, + md.results.TransientSolution[2].Vx, + md.results.TransientSolution[2].Vy, + md.results.TransientSolution[2].Vz, + md.results.TransientSolution[2].Vel, + md.results.TransientSolution[2].Base, + md.results.TransientSolution[2].Surface, + md.results.TransientSolution[2].Thickness, + md.results.TransientSolution[2].Temperature, + md.results.TransientSolution[2].SmbMassBalance, + md.results.TransientSolution[2].TotalSmb] Index: /issm/trunk-jpl/test/NightlyRun/test350.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test350.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test350.py (revision 23793) @@ -13,13 +13,13 @@ from transient import * -md = triangle(model(),'../Exp/Square.exp',50000.) +md = triangle(model(), '../Exp/Square.exp', 50000.) md.mesh.x = md.mesh.x / 1000 md.mesh.y = md.mesh.y / 1000 -md = setmask(md,'','') -md = parameterize(md,'../Par/SquareSheetConstrained.py') +md = setmask(md, '', '') +md = parameterize(md, '../Par/SquareSheetConstrained.py') md.transient = transient().deactivateall() md.transient.ishydrology = 1 -md = setflowequation(md,'SSA','all') -md.cluster = generic('name',gethostname(),'np',2) +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 2) #Use hydroogy coupled friciton law @@ -41,5 +41,5 @@ 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.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))) @@ -57,38 +57,33 @@ a = np.sqrt((md.mesh.x - 500.)**2 + (md.mesh.y - 500.)**2) pos = min(enumerate(a), key=itemgetter(1))[0] -time = np.arange(0,md.timestepping.final_time+1,md.timestepping.time_step) -md.hydrology.moulin_input = np.zeros((md.mesh.numberofvertices+1,np.size(time))) -md.hydrology.moulin_input[-1,:] = time -md.hydrology.moulin_input[pos,:] = 5. * (1. - np.sin(2. * np.pi / (1. / 365.) * time)) -md.hydrology.neumannflux = np.zeros((md.mesh.numberofelements+1,np.size(time))) -md.hydrology.neumannflux[-1,:] = time -segx = md.mesh.x[md.mesh.segments[:,0]-1] -segy = md.mesh.y[md.mesh.segments[:,0]-1] -posA = np.intersect1d(np.intersect1d(np.array(np.where(segx < 1.)),np.array(np.where(segy > 400.))), np.array(np.where(segy < 600.))) -pos = (md.mesh.segments[posA]-1)[:,2] -md.hydrology.neumannflux[pos,:] = np.tile(0.05*(1.-np.sin(2.*np.pi/(1./365.)*time)),(len(pos),1)) +time = np.arange(0, md.timestepping.final_time + 1, md.timestepping.time_step) +md.hydrology.moulin_input = np.zeros((md.mesh.numberofvertices + 1, np.size(time))) +md.hydrology.moulin_input[-1, :] = time +md.hydrology.moulin_input[pos, :] = 5. * (1. - np.sin(2. * np.pi / (1. / 365.) * time)) +md.hydrology.neumannflux = np.zeros((md.mesh.numberofelements + 1, np.size(time))) +md.hydrology.neumannflux[-1, :] = time +segx = md.mesh.x[md.mesh.segments[:, 0] - 1] +segy = md.mesh.y[md.mesh.segments[:, 0] - 1] +posA = np.intersect1d(np.intersect1d(np.array(np.where(segx < 1.)), np.array(np.where(segy > 400.))), np.array(np.where(segy < 600.))) +pos = (md.mesh.segments[posA] - 1)[:, 2] +md.hydrology.neumannflux[pos, :] = np.tile(0.05 * (1. - np.sin(2. * np.pi / (1. / 365.) * time)), (len(pos), 1)) -md = solve(md,'Transient') +md = solve(md, 'Transient') #Fields and tolerances to track changes -field_names = [ - 'HydrologyHead1','HydrologyGapHeight1', - 'HydrologyHead2','HydrologyGapHeight2', - 'HydrologyHead3','HydrologyGapHeight3', - 'HydrologyHead4','HydrologyGapHeight4'] -field_tolerances = [ - 1e-13, 1e-13, - 1e-13, 1e-13, - 1e-13, 1e-13, - 1e-13, 1e-12] -field_values = [ - md.results.TransientSolution[0].HydrologyHead, - md.results.TransientSolution[0].HydrologyGapHeight, - md.results.TransientSolution[1].HydrologyHead, - md.results.TransientSolution[1].HydrologyGapHeight, - md.results.TransientSolution[2].HydrologyHead, - md.results.TransientSolution[2].HydrologyGapHeight, - md.results.TransientSolution[3].HydrologyHead, - md.results.TransientSolution[3].HydrologyGapHeight - ] - +field_names = ['HydrologyHead1', 'HydrologyGapHeight1', + 'HydrologyHead2', 'HydrologyGapHeight2', + 'HydrologyHead3', 'HydrologyGapHeight3', + 'HydrologyHead4', 'HydrologyGapHeight4'] +field_tolerances = [1e-13, 1e-13, + 1e-13, 1e-13, + 1e-13, 1e-13, + 1e-13, 1e-12] +field_values = [md.results.TransientSolution[0].HydrologyHead, + md.results.TransientSolution[0].HydrologyGapHeight, + md.results.TransientSolution[1].HydrologyHead, + md.results.TransientSolution[1].HydrologyGapHeight, + md.results.TransientSolution[2].HydrologyHead, + md.results.TransientSolution[2].HydrologyGapHeight, + md.results.TransientSolution[3].HydrologyHead, + md.results.TransientSolution[3].HydrologyGapHeight] Index: /issm/trunk-jpl/test/NightlyRun/test401.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test401.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test401.py (revision 23793) @@ -1,4 +1,3 @@ #Test Name: SquareSheetShelfStressSSA2d -import numpy as np from model import * from socket import gethostname @@ -10,18 +9,16 @@ from solve import * -md=triangle(model(),'../Exp/Square.exp',150000.) -md=setmask(md,'../Exp/SquareShelf.exp','') -md=parameterize(md,'../Par/SquareSheetShelf.py') -md=setflowequation(md,'SSA','all') -md.cluster=generic('name',gethostname(),'np',3) -md=solve(md,'Stressbalance') +md = triangle(model(), '../Exp/Square.exp', 150000.) +md = setmask(md, '../Exp/SquareShelf.exp', '') +md = parameterize(md, '../Par/SquareSheetShelf.py') +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'Stressbalance') #Fields and tolerances to track changes -field_names =['Vx','Vy','Vel','Pressure'] -field_tolerances=[1e-13,1e-13,1e-13,1e-13] -field_values=[\ - md.results.StressbalanceSolution.Vx,\ - md.results.StressbalanceSolution.Vy,\ - md.results.StressbalanceSolution.Vel,\ - md.results.StressbalanceSolution.Pressure,\ - ] +field_names = ['Vx', 'Vy', 'Vel', 'Pressure'] +field_tolerances = [1e-13, 1e-13, 1e-13, 1e-13] +field_values = [md.results.StressbalanceSolution.Vx, + md.results.StressbalanceSolution.Vy, + md.results.StressbalanceSolution.Vel, + md.results.StressbalanceSolution.Pressure] Index: /issm/trunk-jpl/test/NightlyRun/test402.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test402.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test402.py (revision 23793) @@ -1,4 +1,3 @@ #Test Name: SquareSheetShelfStressSSA3d -import numpy as np from model import * from socket import gethostname @@ -10,20 +9,18 @@ from solve import * -md=triangle(model(),'../Exp/Square.exp',150000.) -md=setmask(md,'../Exp/SquareShelf.exp','') -md=parameterize(md,'../Par/SquareSheetShelf.py') -md.extrude(4,1.) -md=setflowequation(md,'SSA','all') -md.cluster=generic('name',gethostname(),'np',3) -md=solve(md,'Stressbalance') +md = triangle(model(), '../Exp/Square.exp', 150000.) +md = setmask(md, '../Exp/SquareShelf.exp', '') +md = parameterize(md, '../Par/SquareSheetShelf.py') +md.extrude(4, 1.) +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'Stressbalance') #Fields and tolerances to track changes -field_names =['Vx','Vy','Vz','Vel','Pressure'] -field_tolerances=[1e-13,1e-13,1e-13,1e-13,1e-13] -field_values=[\ - md.results.StressbalanceSolution.Vx,\ - md.results.StressbalanceSolution.Vy,\ - md.results.StressbalanceSolution.Vz,\ - md.results.StressbalanceSolution.Vel,\ - md.results.StressbalanceSolution.Pressure,\ - ] +field_names = ['Vx', 'Vy', 'Vz', 'Vel', 'Pressure'] +field_tolerances = [1e-13, 1e-13, 1e-13, 1e-13, 1e-13] +field_values = [md.results.StressbalanceSolution.Vx, + md.results.StressbalanceSolution.Vy, + md.results.StressbalanceSolution.Vz, + md.results.StressbalanceSolution.Vel, + md.results.StressbalanceSolution.Pressure] Index: /issm/trunk-jpl/test/NightlyRun/test403.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test403.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test403.py (revision 23793) @@ -1,4 +1,3 @@ #Test Name: SquareSheetShelfStressHO -import numpy as np from model import * from socket import gethostname @@ -10,20 +9,18 @@ from solve import * -md=triangle(model(),'../Exp/Square.exp',180000.) -md=setmask(md,'../Exp/SquareShelf.exp','') -md=parameterize(md,'../Par/SquareSheetShelf.py') -md.extrude(5,1.) -md=setflowequation(md,'HO','all') -md.cluster=generic('name',gethostname(),'np',3) -md=solve(md,'Stressbalance') +md = triangle(model(), '../Exp/Square.exp', 180000.) +md = setmask(md, '../Exp/SquareShelf.exp', '') +md = parameterize(md, '../Par/SquareSheetShelf.py') +md.extrude(5, 1.) +md = setflowequation(md, 'HO', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'Stressbalance') #Fields and tolerances to track changes -field_names =['Vx','Vy','Vz','Vel','Pressure'] -field_tolerances=[3e-09,3e-09,3e-09,3e-09,3e-09] -field_values=[\ - md.results.StressbalanceSolution.Vx,\ - md.results.StressbalanceSolution.Vy,\ - md.results.StressbalanceSolution.Vz,\ - md.results.StressbalanceSolution.Vel,\ - md.results.StressbalanceSolution.Pressure,\ - ] +field_names = ['Vx', 'Vy', 'Vz', 'Vel', 'Pressure'] +field_tolerances = [3e-09, 3e-09, 3e-09, 3e-09, 3e-09] +field_values = [md.results.StressbalanceSolution.Vx, + md.results.StressbalanceSolution.Vy, + md.results.StressbalanceSolution.Vz, + md.results.StressbalanceSolution.Vel, + md.results.StressbalanceSolution.Pressure] Index: /issm/trunk-jpl/test/NightlyRun/test404.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test404.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test404.py (revision 23793) @@ -1,4 +1,3 @@ #Test Name: SquareSheetShelfStressFS -import numpy as np from model import * from socket import gethostname @@ -10,20 +9,18 @@ from solve import * -md=triangle(model(),'../Exp/Square.exp',180000.) -md=setmask(md,'../Exp/SquareShelf.exp','') -md=parameterize(md,'../Par/SquareSheetShelf.py') -md.extrude(3,1.) -md=setflowequation(md,'FS','all') -md.cluster=generic('name',gethostname(),'np',3) -md=solve(md,'Stressbalance') +md = triangle(model(), '../Exp/Square.exp', 180000.) +md = setmask(md, '../Exp/SquareShelf.exp', '') +md = parameterize(md, '../Par/SquareSheetShelf.py') +md.extrude(3, 1.) +md = setflowequation(md, 'FS', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'Stressbalance') #Fields and tolerances to track changes -field_names =['Vx','Vy','Vz','Vel','Pressure'] -field_tolerances=[2e-06,2e-06,2e-06,1e-06,6e-07] -field_values=[\ - md.results.StressbalanceSolution.Vx,\ - md.results.StressbalanceSolution.Vy,\ - md.results.StressbalanceSolution.Vz,\ - md.results.StressbalanceSolution.Vel,\ - md.results.StressbalanceSolution.Pressure,\ - ] +field_names = ['Vx', 'Vy', 'Vz', 'Vel', 'Pressure'] +field_tolerances = [2e-06, 2e-06, 2e-06, 1e-06, 6e-07] +field_values = [md.results.StressbalanceSolution.Vx, + md.results.StressbalanceSolution.Vy, + md.results.StressbalanceSolution.Vz, + md.results.StressbalanceSolution.Vel, + md.results.StressbalanceSolution.Pressure] Index: /issm/trunk-jpl/test/NightlyRun/test405.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test405.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test405.py (revision 23793) @@ -1,4 +1,3 @@ #Test Name: SquareSheetShelfStressMHOPenalties -import numpy as np from model import * from socket import gethostname @@ -10,20 +9,18 @@ from solve import * -md=triangle(model(),'../Exp/Square.exp',180000.) -md=setmask(md,'../Exp/SquareShelf.exp','') -md=parameterize(md,'../Par/SquareSheetShelf.py') -md.extrude(5,1.) -md=setflowequation(md,'SSA','../Exp/SquareHalfRight.exp','fill','HO','coupling','penalties') -md.cluster=generic('name',gethostname(),'np',3) -md=solve(md,'Stressbalance') +md = triangle(model(), '../Exp/Square.exp', 180000.) +md = setmask(md, '../Exp/SquareShelf.exp', '') +md = parameterize(md, '../Par/SquareSheetShelf.py') +md.extrude(5, 1.) +md = setflowequation(md, 'SSA', '../Exp/SquareHalfRight.exp', 'fill', 'HO', 'coupling', 'penalties') +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'Stressbalance') #Fields and tolerances to track changes -field_names =['Vx','Vy','Vz','Vel','Pressure'] -field_tolerances=[5e-05,5e-05,5e-05,5e-05,1e-05] -field_values=[\ - md.results.StressbalanceSolution.Vx,\ - md.results.StressbalanceSolution.Vy,\ - md.results.StressbalanceSolution.Vz,\ - md.results.StressbalanceSolution.Vel,\ - md.results.StressbalanceSolution.Pressure,\ - ] +field_names = ['Vx', 'Vy', 'Vz', 'Vel', 'Pressure'] +field_tolerances = [5e-05, 5e-05, 5e-05, 5e-05, 1e-05] +field_values = [md.results.StressbalanceSolution.Vx, + md.results.StressbalanceSolution.Vy, + md.results.StressbalanceSolution.Vz, + md.results.StressbalanceSolution.Vel, + md.results.StressbalanceSolution.Pressure] Index: /issm/trunk-jpl/test/NightlyRun/test406.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test406.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test406.py (revision 23793) @@ -1,7 +1,5 @@ #Test Name: SquareSheetShelfTherStea -import numpy as np from model import * from socket import gethostname - from triangle import * from setmask import * @@ -10,18 +8,16 @@ from solve import * -md=triangle(model(),'../Exp/Square.exp',150000.) -md=setmask(md,'../Exp/SquareShelf.exp','') -md=parameterize(md,'../Par/SquareSheetShelf.py') -md.extrude(4,1.) -md=setflowequation(md,'HO','all') -md.cluster=generic('name',gethostname(),'np',3) -md.timestepping.time_step=0. -md=solve(md,'Thermal') +md = triangle(model(), '../Exp/Square.exp', 150000.) +md = setmask(md, '../Exp/SquareShelf.exp', '') +md = parameterize(md, '../Par/SquareSheetShelf.py') +md.extrude(4, 1.) +md = setflowequation(md, 'HO', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) +md.timestepping.time_step = 0. +md = solve(md, 'Thermal') #Fields and tolerances to track changes -field_names =['Temperature','BasalforcingsGroundediceMeltingRate'] -field_tolerances=[1e-13,1e-5] -field_values=[\ - md.results.ThermalSolution.Temperature,\ - md.results.ThermalSolution.BasalforcingsGroundediceMeltingRate,\ - ] +field_names = ['Temperature', 'BasalforcingsGroundediceMeltingRate'] +field_tolerances = [1e-13, 1e-5] +field_values = [md.results.ThermalSolution.Temperature, + md.results.ThermalSolution.BasalforcingsGroundediceMeltingRate] Index: /issm/trunk-jpl/test/NightlyRun/test407.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test407.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test407.py (revision 23793) @@ -1,7 +1,5 @@ #Test Name: SquareSheetShelfTherTran -import numpy as np from model import * from socket import gethostname - from triangle import * from setmask import * @@ -10,22 +8,20 @@ from solve import * -md=triangle(model(),'../Exp/Square.exp',150000.) -md=setmask(md,'../Exp/SquareShelf.exp','') -md=parameterize(md,'../Par/SquareSheetShelf.py') -md.extrude(4,1.) -md=setflowequation(md,'HO','all') -md.cluster=generic('name',gethostname(),'np',3) -md.transient.isstressbalance=False -md.transient.ismasstransport=False -md.transient.issmb=True -md.transient.isthermal=True -md.transient.isgroundingline=False -md=solve(md,'Transient') +md = triangle(model(), '../Exp/Square.exp', 150000.) +md = setmask(md, '../Exp/SquareShelf.exp', '') +md = parameterize(md, '../Par/SquareSheetShelf.py') +md.extrude(4, 1.) +md = setflowequation(md, 'HO', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) +md.transient.isstressbalance = False +md.transient.ismasstransport = False +md.transient.issmb = True +md.transient.isthermal = True +md.transient.isgroundingline = False +md = solve(md, 'Transient') #Fields and tolerances to track changes -field_names =['Temperature','BasalforcingsGroundediceMeltingRate'] -field_tolerances=[1e-13,1e-13] -field_values=[\ - md.results.TransientSolution[0].Temperature,\ - md.results.TransientSolution[0].BasalforcingsGroundediceMeltingRate,\ - ] +field_names = ['Temperature', 'BasalforcingsGroundediceMeltingRate'] +field_tolerances = [1e-13, 1e-13] +field_values = [md.results.TransientSolution[0].Temperature, + md.results.TransientSolution[0].BasalforcingsGroundediceMeltingRate] Index: /issm/trunk-jpl/test/NightlyRun/test408.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test408.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test408.py (revision 23793) @@ -11,62 +11,60 @@ from frictioncoulomb import frictioncoulomb -md=triangle(model(),'../Exp/Square.exp',150000.) -md=setmask(md,'../Exp/SquareShelf.exp','') -md=parameterize(md,'../Par/SquareSheetShelf.py') -md.geometry.bed=copy.deepcopy(md.geometry.base) -pos=np.nonzero(md.mask.groundedice_levelset<0.) -md.geometry.bed[pos]=md.geometry.bed[pos]-10 -md.friction=frictioncoulomb() -md.friction.coefficient=20*np.ones(md.mesh.numberofvertices) -md.friction.p=1*np.ones(md.mesh.numberofelements) -md.friction.q=1*np.ones(md.mesh.numberofelements) -md.friction.coefficientcoulomb=0.02*np.ones(md.mesh.numberofvertices) -md.transient.isthermal=False -md.transient.isgroundingline=True -md=setflowequation(md,'SSA','all') -md.cluster=generic('name',gethostname(),'np',3) -md.transient.requested_outputs=['default','GroundedArea','FloatingArea','TotalFloatingBmb','TotalGroundedBmb','TotalSmb'] -md.extrude(3,1.) -md=solve(md,'Transient') +md = triangle(model(), '../Exp/Square.exp', 150000.) +md = setmask(md, '../Exp/SquareShelf.exp', '') +md = parameterize(md, '../Par/SquareSheetShelf.py') +md.geometry.bed = copy.deepcopy(md.geometry.base) +pos = np.nonzero(md.mask.groundedice_levelset < 0.) +md.geometry.bed[pos] = md.geometry.bed[pos] - 10 +md.friction = frictioncoulomb() +md.friction.coefficient = 20 * np.ones(md.mesh.numberofvertices) +md.friction.p = 1 * np.ones(md.mesh.numberofelements) +md.friction.q = 1 * np.ones(md.mesh.numberofelements) +md.friction.coefficientcoulomb = 0.02 * np.ones(md.mesh.numberofvertices) +md.transient.isthermal = False +md.transient.isgroundingline = True +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) +md.transient.requested_outputs = ['default', 'GroundedArea', 'FloatingArea', 'TotalFloatingBmb', 'TotalGroundedBmb', 'TotalSmb'] +md.extrude(3, 1.) +md = solve(md, 'Transient') #Fields and tolerances to track changes -field_names =['Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','GroundedArea1','FloatingArea1','TotalFloatingBmb1','TotalGroundedBmb1','TotalSmb1','Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2','GroundedArea2','FloatingArea2','TotalFloatingBmb2','TotalGroundedBmb2','TotalSmb2','Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3','GroundedArea3','FloatingArea3','TotalFloatingBmb3','TotalGroundedBmb3','TotalSmb3'] -field_tolerances=[1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13] -field_values=[\ - md.results.TransientSolution[0].Vx,\ - md.results.TransientSolution[0].Vy,\ - md.results.TransientSolution[0].Vel,\ - md.results.TransientSolution[0].Pressure,\ - md.results.TransientSolution[0].Base,\ - md.results.TransientSolution[0].Surface,\ - md.results.TransientSolution[0].Thickness,\ - md.results.TransientSolution[0].GroundedArea,\ - md.results.TransientSolution[0].FloatingArea,\ - md.results.TransientSolution[0].TotalFloatingBmb,\ - md.results.TransientSolution[0].TotalGroundedBmb,\ - md.results.TransientSolution[0].TotalSmb,\ - md.results.TransientSolution[1].Vx,\ - md.results.TransientSolution[1].Vy,\ - md.results.TransientSolution[1].Vel,\ - md.results.TransientSolution[1].Pressure,\ - md.results.TransientSolution[1].Base,\ - md.results.TransientSolution[1].Surface,\ - md.results.TransientSolution[1].Thickness,\ - md.results.TransientSolution[1].GroundedArea,\ - md.results.TransientSolution[1].FloatingArea,\ - md.results.TransientSolution[1].TotalFloatingBmb,\ - md.results.TransientSolution[1].TotalGroundedBmb,\ - md.results.TransientSolution[1].TotalSmb,\ - md.results.TransientSolution[2].Vx,\ - md.results.TransientSolution[2].Vy,\ - md.results.TransientSolution[2].Vel,\ - md.results.TransientSolution[2].Pressure,\ - md.results.TransientSolution[2].Base,\ - md.results.TransientSolution[2].Surface,\ - md.results.TransientSolution[2].Thickness,\ - md.results.TransientSolution[2].GroundedArea,\ - md.results.TransientSolution[2].FloatingArea,\ - md.results.TransientSolution[2].TotalFloatingBmb,\ - md.results.TransientSolution[2].TotalGroundedBmb,\ - md.results.TransientSolution[2].TotalSmb,\ - ] +field_names = ['Vx1', 'Vy1', 'Vel1', 'Pressure1', 'Bed1', 'Surface1', 'Thickness1', 'GroundedArea1', 'FloatingArea1', 'TotalFloatingBmb1', 'TotalGroundedBmb1', 'TotalSmb1', 'Vx2', 'Vy2', 'Vel2', 'Pressure2', 'Bed2', 'Surface2', 'Thickness2', 'GroundedArea2', 'FloatingArea2', 'TotalFloatingBmb2', 'TotalGroundedBmb2', 'TotalSmb2', 'Vx3', 'Vy3', 'Vel3', 'Pressure3', 'Bed3', 'Surface3', 'Thickness3', 'GroundedArea3', 'FloatingArea3', 'TotalFloatingBmb3', 'TotalGroundedBmb3', 'TotalSmb3'] +field_tolerances = [1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13] +field_values = [md.results.TransientSolution[0].Vx, + md.results.TransientSolution[0].Vy, + md.results.TransientSolution[0].Vel, + md.results.TransientSolution[0].Pressure, + md.results.TransientSolution[0].Base, + md.results.TransientSolution[0].Surface, + md.results.TransientSolution[0].Thickness, + md.results.TransientSolution[0].GroundedArea, + md.results.TransientSolution[0].FloatingArea, + md.results.TransientSolution[0].TotalFloatingBmb, + md.results.TransientSolution[0].TotalGroundedBmb, + md.results.TransientSolution[0].TotalSmb, + md.results.TransientSolution[1].Vx, + md.results.TransientSolution[1].Vy, + md.results.TransientSolution[1].Vel, + md.results.TransientSolution[1].Pressure, + md.results.TransientSolution[1].Base, + md.results.TransientSolution[1].Surface, + md.results.TransientSolution[1].Thickness, + md.results.TransientSolution[1].GroundedArea, + md.results.TransientSolution[1].FloatingArea, + md.results.TransientSolution[1].TotalFloatingBmb, + md.results.TransientSolution[1].TotalGroundedBmb, + md.results.TransientSolution[1].TotalSmb, + md.results.TransientSolution[2].Vx, + md.results.TransientSolution[2].Vy, + md.results.TransientSolution[2].Vel, + md.results.TransientSolution[2].Pressure, + md.results.TransientSolution[2].Base, + md.results.TransientSolution[2].Surface, + md.results.TransientSolution[2].Thickness, + md.results.TransientSolution[2].GroundedArea, + md.results.TransientSolution[2].FloatingArea, + md.results.TransientSolution[2].TotalFloatingBmb, + md.results.TransientSolution[2].TotalGroundedBmb, + md.results.TransientSolution[2].TotalSmb] Index: /issm/trunk-jpl/test/NightlyRun/test409.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test409.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test409.py (revision 23793) @@ -1,4 +1,3 @@ #Test Name: SquareSheetShelfTranMHOPenalties -import numpy as np from model import * from socket import gethostname @@ -10,55 +9,52 @@ from solve import * -md=triangle(model(),'../Exp/Square.exp',180000.) -md=setmask(md,'../Exp/SquareShelf.exp','') -md=parameterize(md,'../Par/SquareSheetShelf.py') -md.extrude(3,1.) -md=setflowequation(md,'SSA','../Exp/SquareHalfRight.exp','fill','HO','coupling','penalties') -md.cluster=generic('name',gethostname(),'np',3) -md.transient.requested_outputs=['default','GroundedArea'] -md.groundingline.melt_interpolation='SubelementMelt1' -md=solve(md,'Transient') +md = triangle(model(), '../Exp/Square.exp', 180000.) +md = setmask(md, '../Exp/SquareShelf.exp', '') +md = parameterize(md, '../Par/SquareSheetShelf.py') +md.extrude(3, 1.) +md = setflowequation(md, 'SSA', '../Exp/SquareHalfRight.exp', 'fill', 'HO', 'coupling', 'penalties') +md.cluster = generic('name', gethostname(), 'np', 3) +md.transient.requested_outputs = ['default', 'GroundedArea'] +md.groundingline.melt_interpolation = 'SubelementMelt1' +md = solve(md, 'Transient') #Fields and tolerances to track changes -field_names =['Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsGroundediceMeltingRate1','GroundedArea1', \ - 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsGroundediceMeltingRate2','GroundedArea2', \ - 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsGroundediceMeltingRate3','GroundedArea3'] -field_tolerances=[\ - 1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-6,\ - 1e-03,1e-03,1e-02,1e-03,1e-02,1e-04,1e-01,1e-03,1e-01,1e-01,1e-6,\ - 1e-02,1e-02,1e-01,1e-02,1e-01,1e-04,1e-04,1e-04,1e-04,1e-01,1e-6] -field_values=[\ - md.results.TransientSolution[0].Vx,\ - md.results.TransientSolution[0].Vy,\ - md.results.TransientSolution[0].Vz,\ - md.results.TransientSolution[0].Vel,\ - md.results.TransientSolution[0].Pressure,\ - md.results.TransientSolution[0].Base,\ - md.results.TransientSolution[0].Surface,\ - md.results.TransientSolution[0].Thickness,\ - md.results.TransientSolution[0].Temperature,\ - md.results.TransientSolution[0].BasalforcingsGroundediceMeltingRate,\ - md.results.TransientSolution[0].GroundedArea,\ - md.results.TransientSolution[1].Vx,\ - md.results.TransientSolution[1].Vy,\ - md.results.TransientSolution[1].Vz,\ - md.results.TransientSolution[1].Vel,\ - md.results.TransientSolution[1].Pressure,\ - md.results.TransientSolution[1].Base,\ - md.results.TransientSolution[1].Surface,\ - md.results.TransientSolution[1].Thickness,\ - md.results.TransientSolution[1].Temperature,\ - md.results.TransientSolution[1].BasalforcingsGroundediceMeltingRate,\ - md.results.TransientSolution[1].GroundedArea,\ - md.results.TransientSolution[2].Vx,\ - md.results.TransientSolution[2].Vy,\ - md.results.TransientSolution[2].Vz,\ - md.results.TransientSolution[2].Vel,\ - md.results.TransientSolution[2].Pressure,\ - md.results.TransientSolution[2].Base,\ - md.results.TransientSolution[2].Surface,\ - md.results.TransientSolution[2].Thickness,\ - md.results.TransientSolution[2].Temperature,\ - md.results.TransientSolution[2].BasalforcingsGroundediceMeltingRate,\ - md.results.TransientSolution[2].GroundedArea,\ - ] +field_names = ['Vx1', 'Vy1', 'Vz1', 'Vel1', 'Pressure1', 'Bed1', 'Surface1', 'Thickness1', 'Temperature1', 'BasalforcingsGroundediceMeltingRate1', 'GroundedArea1', + 'Vx2', 'Vy2', 'Vz2', 'Vel2', 'Pressure2', 'Bed2', 'Surface2', 'Thickness2', 'Temperature2', 'BasalforcingsGroundediceMeltingRate2', 'GroundedArea2', + 'Vx3', 'Vy3', 'Vz3', 'Vel3', 'Pressure3', 'Bed3', 'Surface3', 'Thickness3', 'Temperature3', 'BasalforcingsGroundediceMeltingRate3', 'GroundedArea3'] +field_tolerances = [1e-05, 1e-05, 1e-05, 1e-05, 1e-05, 1e-05, 1e-05, 1e-05, 1e-05, 1e-05, 1e-6, + 1e-03, 1e-03, 1e-02, 1e-03, 1e-02, 1e-04, 1e-01, 1e-03, 1e-01, 1e-01, 1e-6, + 1e-02, 1e-02, 1e-01, 1e-02, 1e-01, 1e-04, 1e-04, 1e-04, 1e-04, 1e-01, 1e-6] +field_values = [md.results.TransientSolution[0].Vx, + md.results.TransientSolution[0].Vy, + md.results.TransientSolution[0].Vz, + md.results.TransientSolution[0].Vel, + md.results.TransientSolution[0].Pressure, + md.results.TransientSolution[0].Base, + md.results.TransientSolution[0].Surface, + md.results.TransientSolution[0].Thickness, + md.results.TransientSolution[0].Temperature, + md.results.TransientSolution[0].BasalforcingsGroundediceMeltingRate, + md.results.TransientSolution[0].GroundedArea, + md.results.TransientSolution[1].Vx, + md.results.TransientSolution[1].Vy, + md.results.TransientSolution[1].Vz, + md.results.TransientSolution[1].Vel, + md.results.TransientSolution[1].Pressure, + md.results.TransientSolution[1].Base, + md.results.TransientSolution[1].Surface, + md.results.TransientSolution[1].Thickness, + md.results.TransientSolution[1].Temperature, + md.results.TransientSolution[1].BasalforcingsGroundediceMeltingRate, + md.results.TransientSolution[1].GroundedArea, + md.results.TransientSolution[2].Vx, + md.results.TransientSolution[2].Vy, + md.results.TransientSolution[2].Vz, + md.results.TransientSolution[2].Vel, + md.results.TransientSolution[2].Pressure, + md.results.TransientSolution[2].Base, + md.results.TransientSolution[2].Surface, + md.results.TransientSolution[2].Thickness, + md.results.TransientSolution[2].Temperature, + md.results.TransientSolution[2].BasalforcingsGroundediceMeltingRate, + md.results.TransientSolution[2].GroundedArea] Index: /issm/trunk-jpl/test/NightlyRun/test410.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test410.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test410.py (revision 23793) @@ -1,4 +1,3 @@ #Test Name: SquareSheetShelfSteaSSA3d -import numpy as np from model import * from socket import gethostname @@ -10,23 +9,21 @@ from solve import * -md=triangle(model(),'../Exp/Square.exp',150000.) -md=setmask(md,'../Exp/SquareShelf.exp','') -md=parameterize(md,'../Par/SquareSheetShelf.py') -md.extrude(3,2.) -md=setflowequation(md,'SSA','all') -md.cluster=generic('name',gethostname(),'np',3) -md.timestepping.time_step=0 -md=solve(md,'Steadystate') +md = triangle(model(), '../Exp/Square.exp', 150000.) +md = setmask(md, '../Exp/SquareShelf.exp', '') +md = parameterize(md, '../Par/SquareSheetShelf.py') +md.extrude(3, 2.) +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) +md.timestepping.time_step = 0 +md = solve(md, 'Steadystate') #Fields and tolerances to track changes -field_names =['Vx','Vy','Vz','Vel','Pressure','Temperature','BasalforcingsGroundediceMeltingRate'] -field_tolerances=[1e-09,1e-09,1e-08,1e-09,1e-13,5e-10,1e-06] -field_values=[\ - md.results.SteadystateSolution.Vx,\ - md.results.SteadystateSolution.Vy,\ - md.results.SteadystateSolution.Vz,\ - md.results.SteadystateSolution.Vel,\ - md.results.SteadystateSolution.Pressure,\ - md.results.SteadystateSolution.Temperature,\ - md.results.SteadystateSolution.BasalforcingsGroundediceMeltingRate,\ - ] +field_names = ['Vx', 'Vy', 'Vz', 'Vel', 'Pressure', 'Temperature', 'BasalforcingsGroundediceMeltingRate'] +field_tolerances = [1e-09, 1e-09, 1e-08, 1e-09, 1e-13, 5e-10, 1e-06] +field_values = [md.results.SteadystateSolution.Vx, + md.results.SteadystateSolution.Vy, + md.results.SteadystateSolution.Vz, + md.results.SteadystateSolution.Vel, + md.results.SteadystateSolution.Pressure, + md.results.SteadystateSolution.Temperature, + md.results.SteadystateSolution.BasalforcingsGroundediceMeltingRate] Index: /issm/trunk-jpl/test/NightlyRun/test411.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test411.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test411.py (revision 23793) @@ -1,4 +1,3 @@ #Test Name: SquareSheetShelfSteaHO -import numpy as np from model import * from socket import gethostname @@ -10,24 +9,21 @@ from solve import * -md=triangle(model(),'../Exp/Square.exp',150000.) -md=setmask(md,'../Exp/SquareShelf.exp','') -md=parameterize(md,'../Par/SquareSheetShelf.py') -md.extrude(3,2.) -md=setflowequation(md,'HO','all') -md.cluster=generic('name',gethostname(),'np',3) -md.timestepping.time_step=0. -md=solve(md,'Steadystate') +md = triangle(model(), '../Exp/Square.exp', 150000.) +md = setmask(md, '../Exp/SquareShelf.exp', '') +md = parameterize(md, '../Par/SquareSheetShelf.py') +md.extrude(3, 2.) +md = setflowequation(md, 'HO', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) +md.timestepping.time_step = 0. +md = solve(md, 'Steadystate') #Fields and tolerances to track changes -field_names =['Vx','Vy','Vz','Vel','Pressure','Temperature','BasalforcingsGroundediceMeltingRate'] -field_tolerances=[2e-09,1e-09,1e-08,1e-09,1e-09,1e-08,1e-05 -] -field_values=[\ - md.results.SteadystateSolution.Vx,\ - md.results.SteadystateSolution.Vy,\ - md.results.SteadystateSolution.Vz,\ - md.results.SteadystateSolution.Vel,\ - md.results.SteadystateSolution.Pressure,\ - md.results.SteadystateSolution.Temperature,\ - md.results.SteadystateSolution.BasalforcingsGroundediceMeltingRate,\ - ] +field_names = ['Vx', 'Vy', 'Vz', 'Vel', 'Pressure', 'Temperature', 'BasalforcingsGroundediceMeltingRate'] +field_tolerances = [2e-09, 1e-09, 1e-08, 1e-09, 1e-09, 1e-08, 1e-05] +field_values = [md.results.SteadystateSolution.Vx, + md.results.SteadystateSolution.Vy, + md.results.SteadystateSolution.Vz, + md.results.SteadystateSolution.Vel, + md.results.SteadystateSolution.Pressure, + md.results.SteadystateSolution.Temperature, + md.results.SteadystateSolution.BasalforcingsGroundediceMeltingRate] Index: /issm/trunk-jpl/test/NightlyRun/test412.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test412.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test412.py (revision 23793) @@ -1,4 +1,3 @@ #Test Name: SquareSheetShelfDiadSSA3dDakota -import numpy as np from model import * from socket import gethostname @@ -10,18 +9,17 @@ from partitioner import * from importancefactors import * - from normal_uncertain import * from response_function import * -md = triangle(model(),'../Exp/Square.exp',300000.) -md = setmask(md,'../Exp/SquareShelf.exp','') -md = parameterize(md,'../Par/SquareSheetShelf.py') -md = setflowequation(md,'SSA','all') -md.cluster = generic('name',gethostname(),'np',3) +md = triangle(model(), '../Exp/Square.exp', 300000.) +md = setmask(md, '../Exp/SquareShelf.exp', '') +md = parameterize(md, '../Par/SquareSheetShelf.py') +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) #partitioning md.qmu.numberofpartitions = md.mesh.numberofvertices -md = partitioner(md,'package','linear','npart',md.qmu.numberofpartitions) -md.qmu.partition = md.qmu.partition-1 +md = partitioner(md, 'package', 'linear', 'npart', md.qmu.numberofpartitions) +md.qmu.partition = md.qmu.partition - 1 md.qmu.isdakota = 1 @@ -33,9 +31,9 @@ #variables -md.qmu.variables.rho_ice = normal_uncertain.normal_uncertain('MaterialsRhoIce',md.materials.rho_ice,0.01) -md.qmu.variables.drag_coefficient = normal_uncertain.normal_uncertain('scaled_FrictionCoefficient',1,0.01) +md.qmu.variables.rho_ice = normal_uncertain.normal_uncertain('MaterialsRhoIce', md.materials.rho_ice, 0.01) +md.qmu.variables.drag_coefficient = normal_uncertain.normal_uncertain('scaled_FrictionCoefficient', 1, 0.01) #responses -md.qmu.responses.MaxVel = response_function.response_function('MaxVel',[],[0.0001,0.001,0.01,0.25,0.5,0.75,0.99,0.999,0.9999]) +md.qmu.responses.MaxVel = response_function.response_function('MaxVel', [], [0.0001, 0.001, 0.01, 0.25, 0.5, 0.75, 0.99, 0.999, 0.9999]) #method @@ -47,21 +45,21 @@ if version >= 6: - md.qmu.params.analysis_driver = 'matlab' - md.qmu.params.evaluation_scheduling = 'master' - md.qmu.params.processors_per_evaluation = 2 + md.qmu.params.analysis_driver = 'matlab' + md.qmu.params.evaluation_scheduling = 'master' + md.qmu.params.processors_per_evaluation = 2 else: - md.qmu.params.analysis_driver = 'stressbalance' - md.qmu.params.evaluation_concurrency = 1 + md.qmu.params.analysis_driver = 'stressbalance' + md.qmu.params.evaluation_concurrency = 1 -#imperative! -md.stressbalance.reltol = 10**-5 #tighten for qmu analyses +#imperative! +md.stressbalance.reltol = 10**-5 #tighten for qmu analyses #solve -md.verbose = verbose('000000000') # this line is recommended -md = solve(md,'Stressbalance','overwrite','y') +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_FrictionCoefficient','MaxVel').T +md.results.dakota.importancefactors = importancefactors(md, 'scaled_FrictionCoefficient', 'MaxVel').T field_names = ['importancefactors'] field_tolerances = [1e-10] Index: /issm/trunk-jpl/test/NightlyRun/test413.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test413.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test413.py (revision 23793) @@ -1,4 +1,3 @@ #Test Name: SquareSheetShelfDiadSSA3dDakotaPart -import numpy as np from model import * from socket import gethostname @@ -11,9 +10,9 @@ from importancefactors import * -md = triangle(model(),'../Exp/Square.exp',150000.) -md = setmask(md,'../Exp/SquareShelf.exp','') -md = parameterize(md,'../Par/SquareSheetShelf.py') -md = setflowequation(md,'SSA','all') -md.cluster = generic('name',gethostname(),'np',3) +md = triangle(model(), '../Exp/Square.exp', 150000.) +md = setmask(md, '../Exp/SquareShelf.exp', '') +md = parameterize(md, '../Par/SquareSheetShelf.py') +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) #Dakota options @@ -25,13 +24,13 @@ #partitioning md.qmu.numberofpartitions = 20 -md = partitioner(md,'package','chaco','npart',md.qmu.numberofpartitions,'weighting','on') -md.qmu.partition = md.qmu.partition-1 +md = partitioner(md, 'package', 'chaco', 'npart', md.qmu.numberofpartitions, 'weighting', 'on') +md.qmu.partition = md.qmu.partition - 1 #variables -md.qmu.variables.rho_ice = normal_uncertain.normal_uncertain('MaterialsRhoIce',md.materials.rho_ice,0.01) -md.qmu.variables.drag_coefficient = normal_uncertain.normal_uncertain('scaled_FrictionCoefficient',1,0.01) +md.qmu.variables.rho_ice = normal_uncertain.normal_uncertain('MaterialsRhoIce', md.materials.rho_ice, 0.01) +md.qmu.variables.drag_coefficient = normal_uncertain.normal_uncertain('scaled_FrictionCoefficient', 1, 0.01) #responses -md.qmu.responses.MaxVel = response_function.response_function('MaxVel',[],[0.0001,0.001,0.01,0.25,0.5,0.75,0.99,0.999,0.9999]) +md.qmu.responses.MaxVel = response_function.response_function('MaxVel', [], [0.0001, 0.001, 0.01, 0.25, 0.5, 0.75, 0.99, 0.999, 0.9999]) #method @@ -43,23 +42,23 @@ if version >= 6: - md.qmu.params.analysis_driver = 'matlab' - md.qmu.params.evaluation_scheduling = 'master' - md.qmu.params.processors_per_evaluation = 2 + md.qmu.params.analysis_driver = 'matlab' + md.qmu.params.evaluation_scheduling = 'master' + md.qmu.params.processors_per_evaluation = 2 else: - md.qmu.params.analysis_driver = 'stressbalance' - md.qmu.params.evaluation_concurrency = 1 + md.qmu.params.analysis_driver = 'stressbalance' + md.qmu.params.evaluation_concurrency = 1 #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 = solve(md,'Stressbalance','overwrite','y') +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_FrictionCoefficient','MaxVel').T +md.results.dakota.importancefactors = importancefactors(md, 'scaled_FrictionCoefficient', 'MaxVel').T field_names = ['importancefactors'] field_tolerances = [1e-10] Index: /issm/trunk-jpl/test/NightlyRun/test414.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test414.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test414.py (revision 23793) @@ -11,12 +11,12 @@ from partitioner import * -md = triangle(model(),'../Exp/Square.exp',150000.) -md = setmask(md,'../Exp/SquareShelf.exp','') -md = parameterize(md,'../Par/SquareSheetShelf.py') -md = setflowequation(md,'SSA','all') -md.cluster = generic('name',gethostname(),'np',3) -md.materials.rho_ice = 10**7 #involved in the mass flux, make it easy -md.geometry.thickness[:] = 1 #make it easy -md.geometry.surface = md.geometry.base+md.geometry.thickness +md = triangle(model(), '../Exp/Square.exp', 150000.) +md = setmask(md, '../Exp/SquareShelf.exp', '') +md = parameterize(md, '../Par/SquareSheetShelf.py') +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) +md.materials.rho_ice = 10**7 #involved in the mass flux, make it easy +md.geometry.thickness[:] = 1 #make it easy +md.geometry.surface = md.geometry.base + md.geometry.thickness #constrain all velocities to 1 m/yr, in the y-direction @@ -33,22 +33,22 @@ #partitioning md.qmu.numberofpartitions = 20 -md = partitioner(md,'package','chaco','npart',md.qmu.numberofpartitions,'weighting','on') -md.qmu.partition = md.qmu.partition-1 +md = partitioner(md, 'package', 'chaco', 'npart', md.qmu.numberofpartitions, 'weighting', 'on') +md.qmu.partition = md.qmu.partition - 1 #variables -md.qmu.variables.drag_coefficient = normal_uncertain.normal_uncertain('scaled_FrictionCoefficient',1,0.01) +md.qmu.variables.drag_coefficient = normal_uncertain.normal_uncertain('scaled_FrictionCoefficient', 1, 0.01) #responses -md.qmu.responses.MaxVel = response_function.response_function('MaxVel',[],[0.0001,0.001,0.01,0.25,0.5,0.75,0.99,0.999,0.9999]) -md.qmu.responses.MassFlux1 = response_function.response_function('indexed_MassFlux_1',[],[0.0001,0.001,0.01,0.25,0.5,0.75,0.99,0.999,0.9999]) -md.qmu.responses.MassFlux2 = response_function.response_function('indexed_MassFlux_2',[],[0.0001,0.001,0.01,0.25,0.5,0.75,0.99,0.999,0.9999]) -md.qmu.responses.MassFlux3 = response_function.response_function('indexed_MassFlux_3',[],[0.0001,0.001,0.01,0.25,0.5,0.75,0.99,0.999,0.9999]) -md.qmu.responses.MassFlux4 = response_function.response_function('indexed_MassFlux_4',[],[0.0001,0.001,0.01,0.25,0.5,0.75,0.99,0.999,0.9999]) -md.qmu.responses.MassFlux5 = response_function.response_function('indexed_MassFlux_5',[],[0.0001,0.001,0.01,0.25,0.5,0.75,0.99,0.999,0.9999]) -md.qmu.responses.MassFlux6 = response_function.response_function('indexed_MassFlux_6',[],[0.0001,0.001,0.01,0.25,0.5,0.75,0.99,0.999,0.9999]) -md.qmu.responses.MassFlux7 = response_function.response_function('indexed_MassFlux_7',[],[0.0001,0.001,0.01,0.25,0.5,0.75,0.99,0.999,0.9999]) +md.qmu.responses.MaxVel = response_function.response_function('MaxVel', [], [0.0001, 0.001, 0.01, 0.25, 0.5, 0.75, 0.99, 0.999, 0.9999]) +md.qmu.responses.MassFlux1 = response_function.response_function('indexed_MassFlux_1', [], [0.0001, 0.001, 0.01, 0.25, 0.5, 0.75, 0.99, 0.999, 0.9999]) +md.qmu.responses.MassFlux2 = response_function.response_function('indexed_MassFlux_2', [], [0.0001, 0.001, 0.01, 0.25, 0.5, 0.75, 0.99, 0.999, 0.9999]) +md.qmu.responses.MassFlux3 = response_function.response_function('indexed_MassFlux_3', [], [0.0001, 0.001, 0.01, 0.25, 0.5, 0.75, 0.99, 0.999, 0.9999]) +md.qmu.responses.MassFlux4 = response_function.response_function('indexed_MassFlux_4', [], [0.0001, 0.001, 0.01, 0.25, 0.5, 0.75, 0.99, 0.999, 0.9999]) +md.qmu.responses.MassFlux5 = response_function.response_function('indexed_MassFlux_5', [], [0.0001, 0.001, 0.01, 0.25, 0.5, 0.75, 0.99, 0.999, 0.9999]) +md.qmu.responses.MassFlux6 = response_function.response_function('indexed_MassFlux_6', [], [0.0001, 0.001, 0.01, 0.25, 0.5, 0.75, 0.99, 0.999, 0.9999]) +md.qmu.responses.MassFlux7 = response_function.response_function('indexed_MassFlux_7', [], [0.0001, 0.001, 0.01, 0.25, 0.5, 0.75, 0.99, 0.999, 0.9999]) #mass flux profiles -md.qmu.mass_flux_profiles = ['../Exp/MassFlux1.exp','../Exp/MassFlux2.exp','../Exp/MassFlux3.exp','../Exp/MassFlux4.exp','../Exp/MassFlux5.exp','../Exp/MassFlux6.exp','../Exp/Square.exp'] +md.qmu.mass_flux_profiles = ['../Exp/MassFlux1.exp', '../Exp/MassFlux2.exp', '../Exp/MassFlux3.exp', '../Exp/MassFlux4.exp', '../Exp/MassFlux5.exp', '../Exp/MassFlux6.exp', '../Exp/Square.exp'] md.qmu.mass_flux_profile_directory = getcwd() @@ -60,17 +60,17 @@ 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: - md.qmu.params.analysis_driver = 'matlab' - md.qmu.params.evaluation_scheduling = 'master' - md.qmu.params.processors_per_evaluation = 2 + md.qmu.params.analysis_driver = 'matlab' + md.qmu.params.evaluation_scheduling = 'master' + md.qmu.params.processors_per_evaluation = 2 else: - md.qmu.params.analysis_driver = 'stressbalance' - md.qmu.params.evaluation_concurrency = 1 + md.qmu.params.analysis_driver = 'stressbalance' + md.qmu.params.evaluation_concurrency = 1 #solve -md.verbose = verbose('000000000') # this line is recommended -md = solve(md,'Stressbalance','overwrite','y') +md.verbose = verbose('000000000') # this line is recommended +md = solve(md, 'Stressbalance', 'overwrite', 'y') md.qmu.results = md.results.dakota @@ -78,15 +78,15 @@ #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. md.results.dakota.moments = [] for i in range(8): - md.results.dakota.moments.append(md.results.dakota.dresp_out[i].mean) + md.results.dakota.moments.append(md.results.dakota.dresp_out[i].mean) for i in range(8): - md.results.dakota.moments.append(md.results.dakota.dresp_out[i].stddev) + md.results.dakota.moments.append(md.results.dakota.dresp_out[i].stddev) -field_names = ['moments'] +field_names = ['moments'] field_tolerances = [1e-11] field_values = [md.results.dakota.moments] Index: /issm/trunk-jpl/test/NightlyRun/test415.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test415.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test415.py (revision 23793) @@ -10,42 +10,40 @@ from solve import * -md=triangle(model(),'../Exp/Square.exp',170000.) -md=setmask(md,'../Exp/SquareShelf.exp','') -md=parameterize(md,'../Par/SquareSheetShelf.py') -md.extrude(3,1.) -md=setflowequation(md,'SSA','all') +md = triangle(model(), '../Exp/Square.exp', 170000.) +md = setmask(md, '../Exp/SquareShelf.exp', '') +md = parameterize(md, '../Par/SquareSheetShelf.py') +md.extrude(3, 1.) +md = setflowequation(md, 'SSA', 'all') #control parameters -md.inversion.iscontrol=1 -md.inversion.control_parameters=['FrictionCoefficient'] -md.inversion.min_parameters=1.*np.ones((md.mesh.numberofvertices,len(md.inversion.control_parameters))) -md.inversion.max_parameters=200.*np.ones((md.mesh.numberofvertices,len(md.inversion.control_parameters))) -md.inversion.nsteps=2 -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.gradient_scaling=3.*np.ones((md.inversion.nsteps,len(md.inversion.control_parameters))) -md.inversion.maxiter_per_step=2*np.ones((md.inversion.nsteps)) -md.inversion.step_threshold=0.3*np.ones((md.inversion.nsteps)) -md.timestepping.time_step=0. -md.inversion.vx_obs=md.initialization.vx -md.inversion.vy_obs=md.initialization.vy +md.inversion.iscontrol = 1 +md.inversion.control_parameters = ['FrictionCoefficient'] +md.inversion.min_parameters = 1. * np.ones((md.mesh.numberofvertices, len(md.inversion.control_parameters))) +md.inversion.max_parameters = 200. * np.ones((md.mesh.numberofvertices, len(md.inversion.control_parameters))) +md.inversion.nsteps = 2 +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.gradient_scaling = 3. * np.ones((md.inversion.nsteps, len(md.inversion.control_parameters))) +md.inversion.maxiter_per_step = 2 * np.ones((md.inversion.nsteps)) +md.inversion.step_threshold = 0.3 * np.ones((md.inversion.nsteps)) +md.timestepping.time_step = 0. +md.inversion.vx_obs = md.initialization.vx +md.inversion.vy_obs = md.initialization.vy -md.cluster=generic('name',gethostname(),'np',3) -md=solve(md,'Steadystate') +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'Steadystate') #Fields and tolerances to track changes -field_names =['Gradient','Misfits','FrictionCoefficient','Pressure','Vel','Vx','Vy','Vz','Temperature','BasalforcingsGroundediceMeltingRate'] -field_tolerances=[1e-9,1e-9,2e-10,1e-13,1e-09,1e-09,1e-09,1e-8,1e-09,1e-6] -field_values=[\ - md.results.SteadystateSolution.Gradient1,\ - md.results.SteadystateSolution.J,\ - md.results.SteadystateSolution.FrictionCoefficient,\ - md.results.SteadystateSolution.Pressure,\ - md.results.SteadystateSolution.Vel,\ - md.results.SteadystateSolution.Vx,\ - md.results.SteadystateSolution.Vy,\ - md.results.SteadystateSolution.Vz,\ - md.results.SteadystateSolution.Temperature,\ - md.results.SteadystateSolution.BasalforcingsGroundediceMeltingRate -] +field_names = ['Gradient', 'Misfits', 'FrictionCoefficient', 'Pressure', 'Vel', 'Vx', 'Vy', 'Vz', 'Temperature', 'BasalforcingsGroundediceMeltingRate'] +field_tolerances = [1e-9, 1e-9, 2e-10, 1e-13, 1e-09, 1e-09, 1e-09, 1e-8, 1e-09, 1e-6] +field_values = [md.results.SteadystateSolution.Gradient1, + md.results.SteadystateSolution.J, + md.results.SteadystateSolution.FrictionCoefficient, + md.results.SteadystateSolution.Pressure, + md.results.SteadystateSolution.Vel, + md.results.SteadystateSolution.Vx, + md.results.SteadystateSolution.Vy, + md.results.SteadystateSolution.Vz, + md.results.SteadystateSolution.Temperature, + md.results.SteadystateSolution.BasalforcingsGroundediceMeltingRate] Index: /issm/trunk-jpl/test/NightlyRun/test416.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test416.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test416.py (revision 23793) @@ -10,42 +10,41 @@ from solve import * -md=triangle(model(),'../Exp/Square.exp',170000.) -md=setmask(md,'../Exp/SquareShelf.exp','') -md=parameterize(md,'../Par/SquareSheetShelf.py') -md.extrude(3,1.) -md=setflowequation(md,'HO','all') +md = triangle(model(), '../Exp/Square.exp', 170000.) +md = setmask(md, '../Exp/SquareShelf.exp', '') +md = parameterize(md, '../Par/SquareSheetShelf.py') +md.extrude(3, 1.) +md = setflowequation(md, 'HO', 'all') #control parameters -md.inversion.iscontrol=1 -md.inversion.control_parameters=['FrictionCoefficient'] -md.inversion.min_parameters=1.*np.ones((md.mesh.numberofvertices,len(md.inversion.control_parameters))) -md.inversion.max_parameters=200.*np.ones((md.mesh.numberofvertices,len(md.inversion.control_parameters))) -md.inversion.nsteps=2 -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.gradient_scaling=3.*np.ones((md.inversion.nsteps,len(md.inversion.control_parameters))) -md.inversion.maxiter_per_step=2*np.ones((md.inversion.nsteps)) -md.inversion.step_threshold=0.3*np.ones((md.inversion.nsteps)) -md.timestepping.time_step=0. -md.inversion.vx_obs=md.initialization.vx -md.inversion.vy_obs=md.initialization.vy +md.inversion.iscontrol = 1 +md.inversion.control_parameters = ['FrictionCoefficient'] +md.inversion.min_parameters = 1. * np.ones((md.mesh.numberofvertices, len(md.inversion.control_parameters))) +md.inversion.max_parameters = 200. * np.ones((md.mesh.numberofvertices, len(md.inversion.control_parameters))) +md.inversion.nsteps = 2 +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.gradient_scaling = 3. * np.ones((md.inversion.nsteps, len(md.inversion.control_parameters))) +md.inversion.maxiter_per_step = 2 * np.ones((md.inversion.nsteps)) +md.inversion.step_threshold = 0.3 * np.ones((md.inversion.nsteps)) +md.timestepping.time_step = 0. +md.inversion.vx_obs = md.initialization.vx +md.inversion.vy_obs = md.initialization.vy -md.cluster=generic('name',gethostname(),'np',3) -md=solve(md,'Steadystate') + +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'Steadystate') #Fields and tolerances to track changes -field_names =['Gradient','Misfits','FrictionCoefficient','Pressure','Vel','Vx','Vy','Vz','Temperature','BasalforcingsGroundediceMeltingRate'] -field_tolerances=[1e-08,1e-07,1e-08,1e-08,1e-08,1e-08,1e-08,1e-07,1e-08,1e-05] -field_values=[\ - md.results.SteadystateSolution.Gradient1,\ - md.results.SteadystateSolution.J,\ - md.results.SteadystateSolution.FrictionCoefficient,\ - md.results.SteadystateSolution.Pressure,\ - md.results.SteadystateSolution.Vel,\ - md.results.SteadystateSolution.Vx,\ - md.results.SteadystateSolution.Vy,\ - md.results.SteadystateSolution.Vz,\ - md.results.SteadystateSolution.Temperature,\ - md.results.SteadystateSolution.BasalforcingsGroundediceMeltingRate -] +field_names = ['Gradient', 'Misfits', 'FrictionCoefficient', 'Pressure', 'Vel', 'Vx', 'Vy', 'Vz', 'Temperature', 'BasalforcingsGroundediceMeltingRate'] +field_tolerances = [1e-08, 1e-07, 1e-08, 1e-08, 1e-08, 1e-08, 1e-08, 1e-07, 1e-08, 1e-05] +field_values = [md.results.SteadystateSolution.Gradient1, + md.results.SteadystateSolution.J, + md.results.SteadystateSolution.FrictionCoefficient, + md.results.SteadystateSolution.Pressure, + md.results.SteadystateSolution.Vel, + md.results.SteadystateSolution.Vx, + md.results.SteadystateSolution.Vy, + md.results.SteadystateSolution.Vz, + md.results.SteadystateSolution.Temperature, + md.results.SteadystateSolution.BasalforcingsGroundediceMeltingRate] Index: /issm/trunk-jpl/test/NightlyRun/test417.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test417.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test417.py (revision 23793) @@ -1,4 +1,3 @@ #Test Name: SquareSheetShelfDiadSSA3dDakotaSamp -import numpy as np from os import getcwd from model import * @@ -12,12 +11,12 @@ from dmeth_params_set import * -md = triangle(model(),'../Exp/Square.exp',150000.) -md = setmask(md,'../Exp/SquareShelf.exp','') -md = parameterize(md,'../Par/SquareSheetShelf.py') -md = setflowequation(md,'SSA','all') -md.cluster = generic('name',gethostname(),'np',3) -md.materials.rho_ice = 10**7 #involved in the mass flux, make it easy -md.geometry.thickness[:] = 1 #make it easy -md.geometry.surface = md.geometry.base+md.geometry.thickness +md = triangle(model(), '../Exp/Square.exp', 150000.) +md = setmask(md, '../Exp/SquareShelf.exp', '') +md = parameterize(md, '../Par/SquareSheetShelf.py') +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) +md.materials.rho_ice = 10**7 #involved in the mass flux, make it easy +md.geometry.thickness[:] = 1 #make it easy +md.geometry.surface = md.geometry.base + md.geometry.thickness #constrain all velocities to 1 m/yr, in the y-direction @@ -34,56 +33,56 @@ #partitioning md.qmu.numberofpartitions = 20 -md = partitioner(md,'package','chaco','npart',md.qmu.numberofpartitions,'weighting','on') -md.qmu.partition = md.qmu.partition-1 +md = partitioner(md, 'package', 'chaco', 'npart', md.qmu.numberofpartitions, 'weighting', 'on') +md.qmu.partition = md.qmu.partition - 1 #variables -md.qmu.variables.drag_coefficient = normal_uncertain.normal_uncertain('scaled_FrictionCoefficient',1,0.01) +md.qmu.variables.drag_coefficient = normal_uncertain.normal_uncertain('scaled_FrictionCoefficient', 1, 0.01) #responses -md.qmu.responses.MaxVel = response_function.response_function('MaxVel',[],[0.0001,0.001,0.01,0.25,0.5,0.75,0.99,0.999,0.9999]) -md.qmu.responses.MassFlux1 = response_function.response_function('indexed_MassFlux_1',[],[0.0001,0.001,0.01,0.25,0.5,0.75,0.99,0.999,0.9999]) -md.qmu.responses.MassFlux2 = response_function.response_function('indexed_MassFlux_2',[],[0.0001,0.001,0.01,0.25,0.5,0.75,0.99,0.999,0.9999]) -md.qmu.responses.MassFlux3 = response_function.response_function('indexed_MassFlux_3',[],[0.0001,0.001,0.01,0.25,0.5,0.75,0.99,0.999,0.9999]) -md.qmu.responses.MassFlux4 = response_function.response_function('indexed_MassFlux_4',[],[0.0001,0.001,0.01,0.25,0.5,0.75,0.99,0.999,0.9999]) -md.qmu.responses.MassFlux5 = response_function.response_function('indexed_MassFlux_5',[],[0.0001,0.001,0.01,0.25,0.5,0.75,0.99,0.999,0.9999]) -md.qmu.responses.MassFlux6 = response_function.response_function('indexed_MassFlux_6',[],[0.0001,0.001,0.01,0.25,0.5,0.75,0.99,0.999,0.9999]) -md.qmu.responses.MassFlux7 = response_function.response_function('indexed_MassFlux_7',[],[0.0001,0.001,0.01,0.25,0.5,0.75,0.99,0.999,0.9999]) +md.qmu.responses.MaxVel = response_function.response_function('MaxVel', [], [0.0001, 0.001, 0.01, 0.25, 0.5, 0.75, 0.99, 0.999, 0.9999]) +md.qmu.responses.MassFlux1 = response_function.response_function('indexed_MassFlux_1', [], [0.0001, 0.001, 0.01, 0.25, 0.5, 0.75, 0.99, 0.999, 0.9999]) +md.qmu.responses.MassFlux2 = response_function.response_function('indexed_MassFlux_2', [], [0.0001, 0.001, 0.01, 0.25, 0.5, 0.75, 0.99, 0.999, 0.9999]) +md.qmu.responses.MassFlux3 = response_function.response_function('indexed_MassFlux_3', [], [0.0001, 0.001, 0.01, 0.25, 0.5, 0.75, 0.99, 0.999, 0.9999]) +md.qmu.responses.MassFlux4 = response_function.response_function('indexed_MassFlux_4', [], [0.0001, 0.001, 0.01, 0.25, 0.5, 0.75, 0.99, 0.999, 0.9999]) +md.qmu.responses.MassFlux5 = response_function.response_function('indexed_MassFlux_5', [], [0.0001, 0.001, 0.01, 0.25, 0.5, 0.75, 0.99, 0.999, 0.9999]) +md.qmu.responses.MassFlux6 = response_function.response_function('indexed_MassFlux_6', [], [0.0001, 0.001, 0.01, 0.25, 0.5, 0.75, 0.99, 0.999, 0.9999]) +md.qmu.responses.MassFlux7 = response_function.response_function('indexed_MassFlux_7', [], [0.0001, 0.001, 0.01, 0.25, 0.5, 0.75, 0.99, 0.999, 0.9999]) #mass flux profiles -md.qmu.mass_flux_profiles = ['../Exp/MassFlux1.exp','../Exp/MassFlux2.exp','../Exp/MassFlux3.exp','../Exp/MassFlux4.exp','../Exp/MassFlux5.exp','../Exp/MassFlux6.exp','../Exp/Square.exp'] +md.qmu.mass_flux_profiles = ['../Exp/MassFlux1.exp', '../Exp/MassFlux2.exp', '../Exp/MassFlux3.exp', '../Exp/MassFlux4.exp', '../Exp/MassFlux5.exp', '../Exp/MassFlux6.exp', '../Exp/Square.exp'] md.qmu.mass_flux_profile_directory = getcwd() #method md.qmu.method = dakota_method.dakota_method('nond_samp') -md.qmu.method = dmeth_params_set(md.qmu.method,'seed',1234,'samples',20,'sample_type','lhs') +md.qmu.method = dmeth_params_set(md.qmu.method, 'seed', 1234, 'samples', 20, 'sample_type', 'lhs') #parameters md.qmu.params.direct = True md.qmu.params.analysis_components = '' -md.qmu.params.tabular_graphics_data = True; +md.qmu.params.tabular_graphics_data = True if version >= 6: - md.qmu.params.analysis_driver = 'matlab' - md.qmu.params.evaluation_scheduling = 'master' - md.qmu.params.processors_per_evaluation = 2 + md.qmu.params.analysis_driver = 'matlab' + md.qmu.params.evaluation_scheduling = 'master' + md.qmu.params.processors_per_evaluation = 2 else: - md.qmu.params.analysis_driver = 'stressbalance' - md.qmu.params.evaluation_concurrency = 1 + md.qmu.params.analysis_driver = 'stressbalance' + md.qmu.params.evaluation_concurrency = 1 #partitioning md.qmu.numberofpartitions = 20 -md = partitioner(md,'package','chaco','npart',md.qmu.numberofpartitions,'weighting','on') -md.qmu.partition = md.qmu.partition-1 +md = partitioner(md, 'package', 'chaco', 'npart', md.qmu.numberofpartitions, 'weighting', 'on') +md.qmu.partition = md.qmu.partition - 1 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 -md = solve(md,'Stressbalance','overwrite','y') +# this is normal and will not affect the results +# See src/m/qmu/dakota_out_parse.py, function "dak_tab_out" for details +md = solve(md, 'Stressbalance', 'overwrite', 'y') #Fields and tolerances to track changes @@ -92,15 +91,15 @@ #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. md.results.dakota.montecarlo = [] for i in range(8): - md.results.dakota.montecarlo.append(md.results.dakota.dresp_out[i].mean) + md.results.dakota.montecarlo.append(md.results.dakota.dresp_out[i].mean) for i in range(8): - md.results.dakota.montecarlo.append(md.results.dakota.dresp_out[i].stddev) + md.results.dakota.montecarlo.append(md.results.dakota.dresp_out[i].stddev) -field_names = ['moments'] +field_names = ['moments'] field_tolerances = [1e-11] -field_values = [md.results.dakota.montecarlo] +field_values = [md.results.dakota.montecarlo] Index: /issm/trunk-jpl/test/NightlyRun/test418.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test418.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test418.py (revision 23793) @@ -16,10 +16,10 @@ #test partitioning, and partition averaging # python cannot handle resolutions greater than 30010 -md = triangle(model(),'../Exp/Square.exp',30000.) +md = triangle(model(), '../Exp/Square.exp', 30000.) #print md.mesh.numberofvertices -md = setmask(md,'../Exp/SquareShelf.exp','') -md = parameterize(md,'../Par/SquareSheetShelf.py') -md = setflowequation(md,'SSA','all') -md.cluster = generic('name',gethostname(),'np',3) +md = setmask(md, '../Exp/SquareShelf.exp', '') +md = parameterize(md, '../Par/SquareSheetShelf.py') +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) #partitioning @@ -28,16 +28,15 @@ #corrupted size vs. prev_size #Aborted (core dumped) -md = partitioner(md,'package','chaco','npart',md.qmu.numberofpartitions) +md = partitioner(md, 'package', 'chaco', 'npart', md.qmu.numberofpartitions) +md.qmu.partition = md.qmu.partition - 1 -md.qmu.partition=md.qmu.partition-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_partition = AreaAverageOntoPartition(md, vector) vector_on_nodes = vector_on_partition[md.qmu.partition] -field_names = ['vector_on_nodes'] +field_names = ['vector_on_nodes'] field_tolerances = [1e-11] -field_values = [vector_on_nodes] +field_values = [vector_on_nodes] Index: /issm/trunk-jpl/test/NightlyRun/test419.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test419.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test419.py (revision 23793) @@ -1,4 +1,3 @@ #Test Name: SquareSheetShelfStressSSAHOTiling -import numpy as np from model import * from socket import gethostname @@ -10,20 +9,18 @@ from solve import * -md=triangle(model(),'../Exp/Square.exp',180000.) -md=setmask(md,'../Exp/SquareShelf.exp','') -md=parameterize(md,'../Par/SquareSheetShelf.py') -md.extrude(5,1.) -md=setflowequation(md,'SSA','../Exp/SquareHalfRight.exp','fill','HO') -md.cluster=generic('name',gethostname(),'np',3) -md=solve(md,'Stressbalance') +md = triangle(model(), '../Exp/Square.exp', 180000.) +md = setmask(md, '../Exp/SquareShelf.exp', '') +md = parameterize(md, '../Par/SquareSheetShelf.py') +md.extrude(5, 1.) +md = setflowequation(md, 'SSA', '../Exp/SquareHalfRight.exp', 'fill', 'HO') +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'Stressbalance') #Fields and tolerances to track changes -field_names =['Vx','Vy','Vz','Vel','Pressure'] -field_tolerances=[2e-09,1e-09,1e-09,1e-09,1e-09] -field_values=[\ - md.results.StressbalanceSolution.Vx,\ - md.results.StressbalanceSolution.Vy,\ - md.results.StressbalanceSolution.Vz,\ - md.results.StressbalanceSolution.Vel,\ - md.results.StressbalanceSolution.Pressure,\ - ] +field_names = ['Vx', 'Vy', 'Vz', 'Vel', 'Pressure'] +field_tolerances = [2e-09, 1e-09, 1e-09, 1e-09, 1e-09] +field_values = [md.results.StressbalanceSolution.Vx, + md.results.StressbalanceSolution.Vy, + md.results.StressbalanceSolution.Vz, + md.results.StressbalanceSolution.Vel, + md.results.StressbalanceSolution.Pressure] Index: /issm/trunk-jpl/test/NightlyRun/test420.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test420.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test420.py (revision 23793) @@ -1,4 +1,3 @@ #Test Name: SquareSheetShelfDakotaScaledResponse - import numpy as np from model import * @@ -11,14 +10,14 @@ from partitioner import * -md = triangle(model(),'../Exp/Square.exp',200000.) -md = setmask(md,'../Exp/SquareShelf.exp','') -md = parameterize(md,'../Par/SquareSheetShelf.py') -md = setflowequation(md,'SSA','all') -md.cluster = generic('name',gethostname(),'np',3) +md = triangle(model(), '../Exp/Square.exp', 200000.) +md = setmask(md, '../Exp/SquareShelf.exp', '') +md = parameterize(md, '../Par/SquareSheetShelf.py') +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) #partitioning md.qmu.numberofpartitions = 10 -md = partitioner(md,'package','chaco','npart',md.qmu.numberofpartitions) -md.qmu.partition = md.qmu.partition-1 +md = partitioner(md, 'package', 'chaco', 'npart', md.qmu.numberofpartitions) +md.qmu.partition = md.qmu.partition - 1 md.qmu.isdakota = 1 @@ -30,8 +29,8 @@ #variables -md.qmu.variables.rho_ice = normal_uncertain.normal_uncertain('MaterialsRhoIce',md.materials.rho_ice,0.01) +md.qmu.variables.rho_ice = normal_uncertain.normal_uncertain('MaterialsRhoIce', md.materials.rho_ice, 0.01) #responses -md.qmu.responses.MaxVel = response_function.response_function('scaled_Thickness',[],[0.0001,0.001,0.01,0.25,0.5,0.75,0.99,0.999,0.9999]) +md.qmu.responses.MaxVel = response_function.response_function('scaled_Thickness', [], [0.0001, 0.001, 0.01, 0.25, 0.5, 0.75, 0.99, 0.999, 0.9999]) #method @@ -43,17 +42,17 @@ if version >= 6: - md.qmu.params.analysis_driver = 'matlab' - md.qmu.params.evaluation_scheduling = 'master' - md.qmu.params.processors_per_evaluation = 2 + md.qmu.params.analysis_driver = 'matlab' + md.qmu.params.evaluation_scheduling = 'master' + md.qmu.params.processors_per_evaluation = 2 else: - md.qmu.params.analysis_driver = 'stressbalance' - md.qmu.params.evaluation_concurrency = 1 + md.qmu.params.analysis_driver = 'stressbalance' + md.qmu.params.evaluation_concurrency = 1 -#imperative! -md.stressbalance.reltol = 10**-5 #tighten for qmu analysese +#imperative! +md.stressbalance.reltol = 10**-5 #tighten for qmu analysese #solve -md.verbose = verbose('000000000') # this line is recommended -md = solve(md,'Stressbalance','overwrite','y') +md.verbose = verbose('000000000') # this line is recommended +md = solve(md, 'Stressbalance', 'overwrite', 'y') md.qmu.results = md.results.dakota @@ -61,5 +60,5 @@ h = np.zeros((md.qmu.numberofpartitions,)) for i in range(md.qmu.numberofpartitions): - h[i] = md.qmu.results.dresp_out[i].mean + h[i] = md.qmu.results.dresp_out[i].mean #project onto grid @@ -67,5 +66,5 @@ #Fields and tolerances to track changes -field_names = ['Thickness'] +field_names = ['Thickness'] field_tolerances = [1e-10] -field_values = [thickness] +field_values = [thickness] Index: /issm/trunk-jpl/test/NightlyRun/test421.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test421.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test421.py (revision 23793) @@ -1,4 +1,3 @@ #Test Name: SquareSheetShelfStressHOFS3dTiling -import numpy as np from model import * from socket import gethostname @@ -10,20 +9,18 @@ from solve import * -md=triangle(model(),'../Exp/Square.exp',180000.) -md=setmask(md,'../Exp/SquareShelf.exp','') -md=parameterize(md,'../Par/SquareSheetShelf.py') -md.extrude(5,1.) -md=setflowequation(md,'FS','../Exp/SquareHalfRight.exp','fill','HO') -md.cluster=generic('name',gethostname(),'np',3) -md=solve(md,'Stressbalance') +md = triangle(model(), '../Exp/Square.exp', 180000.) +md = setmask(md, '../Exp/SquareShelf.exp', '') +md = parameterize(md, '../Par/SquareSheetShelf.py') +md.extrude(5, 1.) +md = setflowequation(md, 'FS', '../Exp/SquareHalfRight.exp', 'fill', 'HO') +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'Stressbalance') #Fields and tolerances to track changes -field_names =['Vx','Vy','Vz','Vel','Pressure'] -field_tolerances=[2e-06,2e-06,2e-05,2e-06,2e-06] -field_values=[\ - md.results.StressbalanceSolution.Vx,\ - md.results.StressbalanceSolution.Vy,\ - md.results.StressbalanceSolution.Vz,\ - md.results.StressbalanceSolution.Vel,\ - md.results.StressbalanceSolution.Pressure,\ - ] +field_names = ['Vx', 'Vy', 'Vz', 'Vel', 'Pressure'] +field_tolerances = [2e-06, 2e-06, 2e-05, 2e-06, 2e-06] +field_values = [md.results.StressbalanceSolution.Vx, + md.results.StressbalanceSolution.Vy, + md.results.StressbalanceSolution.Vz, + md.results.StressbalanceSolution.Vel, + md.results.StressbalanceSolution.Pressure] Index: /issm/trunk-jpl/test/NightlyRun/test422.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test422.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test422.py (revision 23793) @@ -1,4 +1,3 @@ #Test Name: SquareSheetShelfStressSSAFS3dTiling -import numpy as np from model import * from socket import gethostname @@ -10,21 +9,19 @@ from solve import * -md=triangle(model(),'../Exp/Square.exp',180000.) -md=setmask(md,'../Exp/SquareShelf.exp','') -md=parameterize(md,'../Par/SquareSheetShelf.py') -md.extrude(5,1.) -md=setflowequation(md,'FS','../Exp/SquareHalfRight.exp','fill','SSA') -md.cluster=generic('name',gethostname(),'np',3) -md.stressbalance.reltol=0.4 -md=solve(md,'Stressbalance') +md = triangle(model(), '../Exp/Square.exp', 180000.) +md = setmask(md, '../Exp/SquareShelf.exp', '') +md = parameterize(md, '../Par/SquareSheetShelf.py') +md.extrude(5, 1.) +md = setflowequation(md, 'FS', '../Exp/SquareHalfRight.exp', 'fill', 'SSA') +md.cluster = generic('name', gethostname(), 'np', 3) +md.stressbalance.reltol = 0.4 +md = solve(md, 'Stressbalance') #Fields and tolerances to track changes -field_names =['Vx','Vy','Vz','Vel','Pressure'] -field_tolerances=[4e-07,4e-07,2e-06,4e-07,5e-07] -field_values=[\ - md.results.StressbalanceSolution.Vx,\ - md.results.StressbalanceSolution.Vy,\ - md.results.StressbalanceSolution.Vz,\ - md.results.StressbalanceSolution.Vel,\ - md.results.StressbalanceSolution.Pressure,\ - ] +field_names = ['Vx', 'Vy', 'Vz', 'Vel', 'Pressure'] +field_tolerances = [4e-07, 4e-07, 2e-06, 4e-07, 5e-07] +field_values = [md.results.StressbalanceSolution.Vx, + md.results.StressbalanceSolution.Vy, + md.results.StressbalanceSolution.Vz, + md.results.StressbalanceSolution.Vel, + md.results.StressbalanceSolution.Pressure] Index: /issm/trunk-jpl/test/NightlyRun/test423.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test423.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test423.py (revision 23793) @@ -10,55 +10,55 @@ -radius=1.e6 -shelfextent=2.e5 +radius = 1.e6 +shelfextent = 2.e5 -md=roundmesh(model(),radius,50000.) -#fix center node to 0,0 -rad=np.sqrt(md.mesh.x**2+md.mesh.y**2) -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 -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)) -flags[pos]=1 -md=setmask(md,flags,'') -md=parameterize(md,'../Par/RoundSheetShelf.py') -md=setflowequation(md,'SSA','all') -md.cluster=generic('name',gethostname(),'np',3) +md = roundmesh(model(), radius, 50000.) +#fix center node to 0, 0 +rad = np.sqrt(md.mesh.x**2 + md.mesh.y**2) +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 +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)) +flags[pos] = 1 +md = setmask(md, flags, '') +md = parameterize(md, '../Par/RoundSheetShelf.py') +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) -md.transient.isthermal=False -md.transient.ismasstransport=False -md.transient.issmb=True -md.transient.isstressbalance=True -md.transient.isgroundingline=True +md.transient.isthermal = False +md.transient.ismasstransport = False +md.transient.issmb = True +md.transient.isstressbalance = True +md.transient.isgroundingline = True #test different grounding line dynamics. -md.groundingline.migration='AggressiveMigration' -md=solve(md,'Transient') -element_on_iceshelf_agressive=md.results.TransientSolution[0].MaskGroundediceLevelset -vel_agressive=md.results.TransientSolution[0].Vel +md.groundingline.migration = 'AggressiveMigration' +md = solve(md, 'Transient') +element_on_iceshelf_agressive = md.results.TransientSolution[0].MaskGroundediceLevelset +vel_agressive = md.results.TransientSolution[0].Vel -md.groundingline.migration='SoftMigration' -md=solve(md,'Transient') -element_on_iceshelf_soft=md.results.TransientSolution[0].MaskGroundediceLevelset -vel_soft=md.results.TransientSolution[0].Vel +md.groundingline.migration = 'SoftMigration' +md = solve(md, 'Transient') +element_on_iceshelf_soft = md.results.TransientSolution[0].MaskGroundediceLevelset +vel_soft = md.results.TransientSolution[0].Vel -md.mask.groundedice_levelset=md.geometry.thickness + md.materials.rho_water/md.materials.rho_ice*md.geometry.bed -md.groundingline.migration='SubelementMigration' -md.groundingline.friction_interpolation='SubelementFriction1' -md=solve(md,'Transient') -element_on_iceshelf_subelement=md.results.TransientSolution[0].MaskGroundediceLevelset -vel_subelement=md.results.TransientSolution[0].Vel +md.mask.groundedice_levelset = md.geometry.thickness + md.materials.rho_water / md.materials.rho_ice * md.geometry.bed +md.groundingline.migration = 'SubelementMigration' +md.groundingline.friction_interpolation = 'SubelementFriction1' +md = solve(md, 'Transient') +element_on_iceshelf_subelement = md.results.TransientSolution[0].MaskGroundediceLevelset +vel_subelement = md.results.TransientSolution[0].Vel -md.groundingline.friction_interpolation='SubelementFriction2' -md=solve(md,'Transient') -element_on_iceshelf_subelement2=md.results.TransientSolution[0].MaskGroundediceLevelset -vel_subelement2=md.results.TransientSolution[0].Vel +md.groundingline.friction_interpolation = 'SubelementFriction2' +md = solve(md, 'Transient') +element_on_iceshelf_subelement2 = md.results.TransientSolution[0].MaskGroundediceLevelset +vel_subelement2 = md.results.TransientSolution[0].Vel #Fields and tolerances to track changes -field_names =['ElementOnIceShelfAggressive','VelAggressive','ElementOnIceShelfSoft','VelSoft','ElementOnIceShelfSubelement','VelSubelement','ElementOnIceShelfSubelement2','VelSubelement2'] -field_tolerances=[1e-13,2e-13,1e-13,2e-13,1e-13,2e-13,1e-13,2e-13] -field_values=[element_on_iceshelf_agressive,vel_agressive,element_on_iceshelf_soft,vel_soft,element_on_iceshelf_subelement,vel_subelement,element_on_iceshelf_subelement2,vel_subelement2] +field_names = ['ElementOnIceShelfAggressive', 'VelAggressive', 'ElementOnIceShelfSoft', 'VelSoft', 'ElementOnIceShelfSubelement', 'VelSubelement', 'ElementOnIceShelfSubelement2', 'VelSubelement2'] +field_tolerances = [1e-13, 2e-13, 1e-13, 2e-13, 1e-13, 2e-13, 1e-13, 2e-13] +field_values = [element_on_iceshelf_agressive, vel_agressive, element_on_iceshelf_soft, vel_soft, element_on_iceshelf_subelement, vel_subelement, element_on_iceshelf_subelement2, vel_subelement2] Index: /issm/trunk-jpl/test/NightlyRun/test424.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test424.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test424.py (revision 23793) @@ -8,62 +8,62 @@ from solve import * -md=triangle(model(),'../Exp/Square.exp',150000.) -md=setmask(md,'../Exp/SquareShelf.exp','') -md=parameterize(md,'../Par/SquareSheetShelf.py') -md=setflowequation(md,'SSA','all') -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.thickness[:]=1000. -md.geometry.surface=md.geometry.base+md.geometry.thickness -md.smb.mass_balance[:]=100. -md.transient.isstressbalance=False -md.transient.isgroundingline=True -md.groundingline.migration='AggressiveMigration' -md.transient.requested_outputs=['IceVolume','IceVolumeAboveFloatation','IceVolumeAboveFloatationScaled','GroundedArea','FloatingArea','GroundedAreaScaled','FloatingAreaScaled'] -md.mesh.scale_factor=1.1*np.ones((md.mesh.numberofvertices)) +md = triangle(model(), '../Exp/Square.exp', 150000.) +md = setmask(md, '../Exp/SquareShelf.exp', '') +md = parameterize(md, '../Par/SquareSheetShelf.py') +md = setflowequation(md, 'SSA', 'all') +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.thickness[:] = 1000. +md.geometry.surface = md.geometry.base + md.geometry.thickness +md.smb.mass_balance[:] = 100. +md.transient.isstressbalance = False +md.transient.isgroundingline = True +md.groundingline.migration = 'AggressiveMigration' +md.transient.requested_outputs = ['IceVolume', 'IceVolumeAboveFloatation', 'IceVolumeAboveFloatationScaled', 'GroundedArea', 'FloatingArea', 'GroundedAreaScaled', 'FloatingAreaScaled'] +md.mesh.scale_factor = 1.1 * np.ones((md.mesh.numberofvertices)) -md.cluster=generic('name',gethostname(),'np',3) -md=solve(md,'Transient') +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'Transient') #Fields and tolerances to track changes -field_names =['Bed1','Surface1','Thickness1','Floatingice1','IceVolume1','IceVolumeAboveFloatation1','IceVolumeAboveFloatationScaled1','GroundedArea1','GroundedAreaScaled1','FloatingArea1','FloatingAreaScaled1', - 'Bed2','Surface2','Thickness2','Floatingice2','IceVolume2','IceVolumeAboveFloatation2','IceVolumeAboveFloatationScaled2','GroundedAred2','GroundedAreaScaled2','FloatingArea2','FloatingAreaScaled2', - 'Bed3','Surface3','Thickness3','Floatingice3','IceVolume3','IceVolumeAboveFloatation3','IceVolumeAboveFloatationScaled3','GroundedArea3','GroundedAreaScaled3','FloatingArea3','FloatingAreaScaled3'] -field_tolerances=[1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13, - 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13, - 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13] -field_values=[md.results.TransientSolution[0].Base, - md.results.TransientSolution[0].Surface, - md.results.TransientSolution[0].Thickness, - md.results.TransientSolution[0].MaskGroundediceLevelset, - md.results.TransientSolution[0].IceVolume, - md.results.TransientSolution[0].IceVolumeAboveFloatation, - md.results.TransientSolution[0].IceVolumeAboveFloatationScaled, - md.results.TransientSolution[0].GroundedArea, - md.results.TransientSolution[0].GroundedAreaScaled, - md.results.TransientSolution[0].FloatingArea, - md.results.TransientSolution[0].FloatingAreaScaled, - md.results.TransientSolution[1].Base, - md.results.TransientSolution[1].Surface, - md.results.TransientSolution[1].Thickness, - md.results.TransientSolution[1].MaskGroundediceLevelset, - md.results.TransientSolution[1].IceVolume, - md.results.TransientSolution[1].IceVolumeAboveFloatation, - md.results.TransientSolution[1].IceVolumeAboveFloatationScaled, - md.results.TransientSolution[1].GroundedArea, - md.results.TransientSolution[1].GroundedAreaScaled, - md.results.TransientSolution[1].FloatingArea, - md.results.TransientSolution[1].FloatingAreaScaled, - md.results.TransientSolution[2].Base, - md.results.TransientSolution[2].Surface, - md.results.TransientSolution[2].Thickness, - md.results.TransientSolution[2].MaskGroundediceLevelset, - md.results.TransientSolution[2].IceVolume, - md.results.TransientSolution[2].IceVolumeAboveFloatation, - md.results.TransientSolution[2].IceVolumeAboveFloatationScaled, - md.results.TransientSolution[2].GroundedArea, - md.results.TransientSolution[2].GroundedAreaScaled, - md.results.TransientSolution[2].FloatingArea, - md.results.TransientSolution[2].FloatingAreaScaled] +field_names = ['Bed1', 'Surface1', 'Thickness1', 'Floatingice1', 'IceVolume1', 'IceVolumeAboveFloatation1', 'IceVolumeAboveFloatationScaled1', 'GroundedArea1', 'GroundedAreaScaled1', 'FloatingArea1', 'FloatingAreaScaled1', + 'Bed2', 'Surface2', 'Thickness2', 'Floatingice2', 'IceVolume2', 'IceVolumeAboveFloatation2', 'IceVolumeAboveFloatationScaled2', 'GroundedAred2', 'GroundedAreaScaled2', 'FloatingArea2', 'FloatingAreaScaled2', + 'Bed3', 'Surface3', 'Thickness3', 'Floatingice3', 'IceVolume3', 'IceVolumeAboveFloatation3', 'IceVolumeAboveFloatationScaled3', 'GroundedArea3', 'GroundedAreaScaled3', 'FloatingArea3', 'FloatingAreaScaled3'] +field_tolerances = [1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, + 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, + 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13] +field_values = [md.results.TransientSolution[0].Base, + md.results.TransientSolution[0].Surface, + md.results.TransientSolution[0].Thickness, + md.results.TransientSolution[0].MaskGroundediceLevelset, + md.results.TransientSolution[0].IceVolume, + md.results.TransientSolution[0].IceVolumeAboveFloatation, + md.results.TransientSolution[0].IceVolumeAboveFloatationScaled, + md.results.TransientSolution[0].GroundedArea, + md.results.TransientSolution[0].GroundedAreaScaled, + md.results.TransientSolution[0].FloatingArea, + md.results.TransientSolution[0].FloatingAreaScaled, + md.results.TransientSolution[1].Base, + md.results.TransientSolution[1].Surface, + md.results.TransientSolution[1].Thickness, + md.results.TransientSolution[1].MaskGroundediceLevelset, + md.results.TransientSolution[1].IceVolume, + md.results.TransientSolution[1].IceVolumeAboveFloatation, + md.results.TransientSolution[1].IceVolumeAboveFloatationScaled, + md.results.TransientSolution[1].GroundedArea, + md.results.TransientSolution[1].GroundedAreaScaled, + md.results.TransientSolution[1].FloatingArea, + md.results.TransientSolution[1].FloatingAreaScaled, + md.results.TransientSolution[2].Base, + md.results.TransientSolution[2].Surface, + md.results.TransientSolution[2].Thickness, + md.results.TransientSolution[2].MaskGroundediceLevelset, + md.results.TransientSolution[2].IceVolume, + md.results.TransientSolution[2].IceVolumeAboveFloatation, + md.results.TransientSolution[2].IceVolumeAboveFloatationScaled, + md.results.TransientSolution[2].GroundedArea, + md.results.TransientSolution[2].GroundedAreaScaled, + md.results.TransientSolution[2].FloatingArea, + md.results.TransientSolution[2].FloatingAreaScaled] Index: /issm/trunk-jpl/test/NightlyRun/test425.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test425.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test425.py (revision 23793) @@ -8,39 +8,39 @@ from solve import * -md=triangle(model(),'../Exp/Square.exp',150000.) -md=setmask(md,'../Exp/SquareShelf.exp','') -md=parameterize(md,'../Par/SquareSheetShelf.py') -md=setflowequation(md,'SSA','all') -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.thickness[:]=1300. -md.geometry.surface=md.geometry.base+md.geometry.thickness -md.smb.mass_balance[:]=-150. -md.transient.isstressbalance=False -md.transient.isgroundingline=True -md.groundingline.migration='SoftMigration' +md = triangle(model(), '../Exp/Square.exp', 150000.) +md = setmask(md, '../Exp/SquareShelf.exp', '') +md = parameterize(md, '../Par/SquareSheetShelf.py') +md = setflowequation(md, 'SSA', 'all') +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.thickness[:] = 1300. +md.geometry.surface = md.geometry.base + md.geometry.thickness +md.smb.mass_balance[:] = -150. +md.transient.isstressbalance = False +md.transient.isgroundingline = True +md.groundingline.migration = 'SoftMigration' -md.cluster=generic('name',gethostname(),'np',3) -md=solve(md,'Transient') +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'Transient') #Fields and tolerances to track changes -field_names =['Bed1','Surface1','Thickness1','Floatingice1', - 'Bed2','Surface2','Thickness2','Floatingice2', - 'Bed3','Surface3','Thickness3','Floatingice3'] -field_tolerances=[1e-13,1e-13,1e-13,1e-13, - 1e-13,1e-13,1e-13,1e-13, - 1e-13,1e-13,1e-13,1e-13] -field_values=[md.results.TransientSolution[0].Base, - md.results.TransientSolution[0].Surface, - md.results.TransientSolution[0].Thickness, - md.results.TransientSolution[0].MaskGroundediceLevelset, - md.results.TransientSolution[1].Base, - md.results.TransientSolution[1].Surface, - md.results.TransientSolution[1].Thickness, - md.results.TransientSolution[1].MaskGroundediceLevelset, - md.results.TransientSolution[2].Base, - md.results.TransientSolution[2].Surface, - md.results.TransientSolution[2].Thickness, - md.results.TransientSolution[2].MaskGroundediceLevelset] +field_names = ['Bed1', 'Surface1', 'Thickness1', 'Floatingice1', + 'Bed2', 'Surface2', 'Thickness2', 'Floatingice2', + 'Bed3', 'Surface3', 'Thickness3', 'Floatingice3'] +field_tolerances = [1e-13, 1e-13, 1e-13, 1e-13, + 1e-13, 1e-13, 1e-13, 1e-13, + 1e-13, 1e-13, 1e-13, 1e-13] +field_values = [md.results.TransientSolution[0].Base, + md.results.TransientSolution[0].Surface, + md.results.TransientSolution[0].Thickness, + md.results.TransientSolution[0].MaskGroundediceLevelset, + md.results.TransientSolution[1].Base, + md.results.TransientSolution[1].Surface, + md.results.TransientSolution[1].Thickness, + md.results.TransientSolution[1].MaskGroundediceLevelset, + md.results.TransientSolution[2].Base, + md.results.TransientSolution[2].Surface, + md.results.TransientSolution[2].Thickness, + md.results.TransientSolution[2].MaskGroundediceLevelset] Index: /issm/trunk-jpl/test/NightlyRun/test426.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test426.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test426.py (revision 23793) @@ -8,69 +8,69 @@ from solve import * -md=triangle(model(),'../Exp/Square.exp',350000.) -md=setmask(md,'../Exp/SquareShelf.exp','') -md=parameterize(md,'../Par/SquareSheetShelf.py') -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.thickness[:]=1000. -md.geometry.surface=md.geometry.base+md.geometry.thickness -md.smb.mass_balance[:]=100. -md=setflowequation(md,'SSA','all') -md.transient.isstressbalance=False -md.transient.isgroundingline=True -md.groundingline.migration='AggressiveMigration' -md.groundingline.melt_interpolation='SubelementMelt1' -md.transient.requested_outputs=['IceVolume','IceVolumeAboveFloatation','IceMass','IceVolumeAboveFloatationScaled','GroundedArea','FloatingArea','GroundedAreaScaled','FloatingAreaScaled'] -md.mesh.scale_factor=1.1*np.ones((md.mesh.numberofvertices)) -md.extrude(3,1.) -md.cluster=generic('name',gethostname(),'np',3) +md = triangle(model(), '../Exp/Square.exp', 350000.) +md = setmask(md, '../Exp/SquareShelf.exp', '') +md = parameterize(md, '../Par/SquareSheetShelf.py') +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.thickness[:] = 1000. +md.geometry.surface = md.geometry.base + md.geometry.thickness +md.smb.mass_balance[:] = 100. +md = setflowequation(md, 'SSA', 'all') +md.transient.isstressbalance = False +md.transient.isgroundingline = True +md.groundingline.migration = 'AggressiveMigration' +md.groundingline.melt_interpolation = 'SubelementMelt1' +md.transient.requested_outputs = ['IceVolume', 'IceVolumeAboveFloatation', 'IceMass', 'IceVolumeAboveFloatationScaled', 'GroundedArea', 'FloatingArea', 'GroundedAreaScaled', 'FloatingAreaScaled'] +md.mesh.scale_factor = 1.1 * np.ones((md.mesh.numberofvertices)) +md.extrude(3, 1.) +md.cluster = generic('name', gethostname(), 'np', 3) -md=solve(md,'Transient') +md = solve(md, 'Transient') #Fields and tolerances to track changes -field_names =['Bed1','Surface1','Thickness1','Floatingice1','IceVolume1','IceVolumeAboveFloatation1','IceMass1','IceVolumeAboveFloatationScaled1','GroundedArea1','GroundedAreaScaled1','FloatingArea1','FloatingAreaScaled1', - 'Bed2','Surface2','Thickness2','Floatingice2','IceVolume2','IceVolumeAboveFloatation2','IceMass2','IceVolumeAboveFloatationScaled2','GroundedArea2','GroundedAreaScaled2','FloatingArea2','FloatingAreaScaled2', - 'Bed3','Surface3','Thickness3','Floatingice3','IceVolume3','IceVolumeAboveFloatation3','IceMass3','IceVolumeAboveFloatationScaled3','GroundedArea3','GroundedAreaScaled3','FloatingArea3','FloatingAreaScaled3'] +field_names = ['Bed1', 'Surface1', 'Thickness1', 'Floatingice1', 'IceVolume1', 'IceVolumeAboveFloatation1', 'IceMass1', 'IceVolumeAboveFloatationScaled1', 'GroundedArea1', 'GroundedAreaScaled1', 'FloatingArea1', 'FloatingAreaScaled1', + 'Bed2', 'Surface2', 'Thickness2', 'Floatingice2', 'IceVolume2', 'IceVolumeAboveFloatation2', 'IceMass2', 'IceVolumeAboveFloatationScaled2', 'GroundedArea2', 'GroundedAreaScaled2', 'FloatingArea2', 'FloatingAreaScaled2', + 'Bed3', 'Surface3', 'Thickness3', 'Floatingice3', 'IceVolume3', 'IceVolumeAboveFloatation3', 'IceMass3', 'IceVolumeAboveFloatationScaled3', 'GroundedArea3', 'GroundedAreaScaled3', 'FloatingArea3', 'FloatingAreaScaled3'] -field_tolerances=[1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13, - 1e-11,1e-10,2e-11,3e-11,2e-12,6e-12,2e-12,6e-12,2.5e-12,2.5e-12,8e-12,8e-12, - 1e-10,1e-10,1e-10,5e-11,2e-12,5e-12,2e-12,5e-12,5e-11,7e-12,7e-11,7e-11] +field_tolerances = [1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, + 1e-11, 1e-10, 2e-11, 3e-11, 2e-12, 6e-12, 2e-12, 6e-12, 2.5e-12, 2.5e-12, 8e-12, 8e-12, + 1e-10, 1e-10, 1e-10, 5e-11, 2e-12, 5e-12, 2e-12, 5e-12, 5e-11, 7e-12, 7e-11, 7e-11] -field_values=[md.results.TransientSolution[0].Base, - md.results.TransientSolution[0].Surface, - md.results.TransientSolution[0].Thickness, - md.results.TransientSolution[0].MaskGroundediceLevelset, - md.results.TransientSolution[0].IceVolume, - md.results.TransientSolution[0].IceVolumeAboveFloatation, - md.results.TransientSolution[0].IceMass, - md.results.TransientSolution[0].IceVolumeAboveFloatationScaled, - md.results.TransientSolution[0].GroundedArea, - md.results.TransientSolution[0].GroundedAreaScaled, - md.results.TransientSolution[0].FloatingArea, - md.results.TransientSolution[0].FloatingAreaScaled, - md.results.TransientSolution[1].Base, - md.results.TransientSolution[1].Surface, - md.results.TransientSolution[1].Thickness, - md.results.TransientSolution[1].MaskGroundediceLevelset, - md.results.TransientSolution[1].IceVolume, - md.results.TransientSolution[1].IceVolumeAboveFloatation, - md.results.TransientSolution[1].IceMass, - md.results.TransientSolution[1].IceVolumeAboveFloatationScaled, - md.results.TransientSolution[1].GroundedArea, - md.results.TransientSolution[1].GroundedAreaScaled, - md.results.TransientSolution[1].FloatingArea, - md.results.TransientSolution[1].FloatingAreaScaled, - md.results.TransientSolution[2].Base, - md.results.TransientSolution[2].Surface, - md.results.TransientSolution[2].Thickness, - md.results.TransientSolution[2].MaskGroundediceLevelset, - md.results.TransientSolution[2].IceVolume, - md.results.TransientSolution[2].IceVolumeAboveFloatation, - md.results.TransientSolution[2].IceMass, - md.results.TransientSolution[2].IceVolumeAboveFloatationScaled, - md.results.TransientSolution[2].GroundedArea, - md.results.TransientSolution[2].GroundedAreaScaled, - md.results.TransientSolution[2].FloatingArea, - md.results.TransientSolution[2].FloatingAreaScaled] +field_values = [md.results.TransientSolution[0].Base, + md.results.TransientSolution[0].Surface, + md.results.TransientSolution[0].Thickness, + md.results.TransientSolution[0].MaskGroundediceLevelset, + md.results.TransientSolution[0].IceVolume, + md.results.TransientSolution[0].IceVolumeAboveFloatation, + md.results.TransientSolution[0].IceMass, + md.results.TransientSolution[0].IceVolumeAboveFloatationScaled, + md.results.TransientSolution[0].GroundedArea, + md.results.TransientSolution[0].GroundedAreaScaled, + md.results.TransientSolution[0].FloatingArea, + md.results.TransientSolution[0].FloatingAreaScaled, + md.results.TransientSolution[1].Base, + md.results.TransientSolution[1].Surface, + md.results.TransientSolution[1].Thickness, + md.results.TransientSolution[1].MaskGroundediceLevelset, + md.results.TransientSolution[1].IceVolume, + md.results.TransientSolution[1].IceVolumeAboveFloatation, + md.results.TransientSolution[1].IceMass, + md.results.TransientSolution[1].IceVolumeAboveFloatationScaled, + md.results.TransientSolution[1].GroundedArea, + md.results.TransientSolution[1].GroundedAreaScaled, + md.results.TransientSolution[1].FloatingArea, + md.results.TransientSolution[1].FloatingAreaScaled, + md.results.TransientSolution[2].Base, + md.results.TransientSolution[2].Surface, + md.results.TransientSolution[2].Thickness, + md.results.TransientSolution[2].MaskGroundediceLevelset, + md.results.TransientSolution[2].IceVolume, + md.results.TransientSolution[2].IceVolumeAboveFloatation, + md.results.TransientSolution[2].IceMass, + md.results.TransientSolution[2].IceVolumeAboveFloatationScaled, + md.results.TransientSolution[2].GroundedArea, + md.results.TransientSolution[2].GroundedAreaScaled, + md.results.TransientSolution[2].FloatingArea, + md.results.TransientSolution[2].FloatingAreaScaled] Index: /issm/trunk-jpl/test/NightlyRun/test427.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test427.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test427.py (revision 23793) @@ -8,41 +8,41 @@ from solve import * -md=triangle(model(),'../Exp/Square.exp',150000.) -md=setmask(md,'../Exp/SquareShelf.exp','') -md=parameterize(md,'../Par/SquareSheetShelf.py') -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.thickness[:]=1300 -md.geometry.surface=md.geometry.base+md.geometry.thickness -md=setflowequation(md,'SSA','all') -md.extrude(3,1.) +md = triangle(model(), '../Exp/Square.exp', 150000.) +md = setmask(md, '../Exp/SquareShelf.exp', '') +md = parameterize(md, '../Par/SquareSheetShelf.py') +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.thickness[:] = 1300 +md.geometry.surface = md.geometry.base + md.geometry.thickness +md = setflowequation(md, 'SSA', 'all') +md.extrude(3, 1.) -md.smb.mass_balance[:]=-150 -md.transient.isstressbalance=False -md.transient.isgroundingline=True -md.groundingline.migration='SoftMigration' -md.groundingline.melt_interpolation='SubelementMelt1' -md.cluster=generic('name',gethostname(),'np',3) -md=solve(md,'Transient') +md.smb.mass_balance[:] = -150 +md.transient.isstressbalance = False +md.transient.isgroundingline = True +md.groundingline.migration = 'SoftMigration' +md.groundingline.melt_interpolation = 'SubelementMelt1' +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'Transient') #Fields and tolerances to track changes -field_names =['Bed1','Surface1','Thickness1','Floatingice1', - 'Bed2','Surface2','Thickness2','Floatingice2', - 'Bed3','Surface3','Thickness3','Floatingice3'] -field_tolerances=[1e-13,1e-13,1e-13,1e-13, - 5e-12,4e-12,7e-12,2e-11, - 1e-10,5e-11,1e-10,7e-10] -field_values=[md.results.TransientSolution[0].Base, - md.results.TransientSolution[0].Surface, - md.results.TransientSolution[0].Thickness, - md.results.TransientSolution[0].MaskGroundediceLevelset, - md.results.TransientSolution[1].Base, - md.results.TransientSolution[1].Surface, - md.results.TransientSolution[1].Thickness, - md.results.TransientSolution[1].MaskGroundediceLevelset, - md.results.TransientSolution[2].Base, - md.results.TransientSolution[2].Surface, - md.results.TransientSolution[2].Thickness, - md.results.TransientSolution[2].MaskGroundediceLevelset] +field_names = ['Bed1', 'Surface1', 'Thickness1', 'Floatingice1', + 'Bed2', 'Surface2', 'Thickness2', 'Floatingice2', + 'Bed3', 'Surface3', 'Thickness3', 'Floatingice3'] +field_tolerances = [1e-13, 1e-13, 1e-13, 1e-13, + 5e-12, 4e-12, 7e-12, 2e-11, + 1e-10, 5e-11, 1e-10, 7e-10] +field_values = [md.results.TransientSolution[0].Base, + md.results.TransientSolution[0].Surface, + md.results.TransientSolution[0].Thickness, + md.results.TransientSolution[0].MaskGroundediceLevelset, + md.results.TransientSolution[1].Base, + md.results.TransientSolution[1].Surface, + md.results.TransientSolution[1].Thickness, + md.results.TransientSolution[1].MaskGroundediceLevelset, + md.results.TransientSolution[2].Base, + md.results.TransientSolution[2].Surface, + md.results.TransientSolution[2].Thickness, + md.results.TransientSolution[2].MaskGroundediceLevelset] Index: /issm/trunk-jpl/test/NightlyRun/test428.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test428.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test428.py (revision 23793) @@ -1,4 +1,3 @@ #Test Name: SquareSheetShelfStressSSA2dNewton -import numpy as np from model import * from socket import gethostname @@ -10,20 +9,18 @@ from solve import * -md=triangle(model(),'../Exp/Square.exp',150000.) -md=setmask(md,'../Exp/SquareShelf.exp','') -md=parameterize(md,'../Par/SquareSheetShelf.py') -md=setflowequation(md,'SSA','all') -md.stressbalance.isnewton=1 -md.stressbalance.restol=0.0001 -md.cluster=generic('name',gethostname(),'np',3) -md=solve(md,'Stressbalance') +md = triangle(model(), '../Exp/Square.exp', 150000.) +md = setmask(md, '../Exp/SquareShelf.exp', '') +md = parameterize(md, '../Par/SquareSheetShelf.py') +md = setflowequation(md, 'SSA', 'all') +md.stressbalance.isnewton = 1 +md.stressbalance.restol = 0.0001 +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'Stressbalance') #Fields and tolerances to track changes -field_names =['Vx','Vy','Vel','Pressure'] -field_tolerances=[1e-13,1e-13,1e-13,1e-13] -field_values=[\ - md.results.StressbalanceSolution.Vx,\ - md.results.StressbalanceSolution.Vy,\ - md.results.StressbalanceSolution.Vel,\ - md.results.StressbalanceSolution.Pressure,\ - ] +field_names = ['Vx', 'Vy', 'Vel', 'Pressure'] +field_tolerances = [1e-13, 1e-13, 1e-13, 1e-13] +field_values = [md.results.StressbalanceSolution.Vx, + md.results.StressbalanceSolution.Vy, + md.results.StressbalanceSolution.Vel, + md.results.StressbalanceSolution.Pressure] Index: /issm/trunk-jpl/test/NightlyRun/test429.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test429.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test429.py (revision 23793) @@ -1,4 +1,3 @@ #Test Name: SquareSheetShelfStressHONewton -import numpy as np from model import * from socket import gethostname @@ -10,22 +9,20 @@ from solve import * -md=triangle(model(),'../Exp/Square.exp',180000.) -md=setmask(md,'../Exp/SquareShelf.exp','') -md=parameterize(md,'../Par/SquareSheetShelf.py') -md.extrude(5,1.) -md=setflowequation(md,'HO','all') -md.stressbalance.isnewton=1 -md.stressbalance.restol=0.0001 -md.cluster=generic('name',gethostname(),'np',3) -md=solve(md,'Stressbalance') +md = triangle(model(), '../Exp/Square.exp', 180000.) +md = setmask(md, '../Exp/SquareShelf.exp', '') +md = parameterize(md, '../Par/SquareSheetShelf.py') +md.extrude(5, 1.) +md = setflowequation(md, 'HO', 'all') +md.stressbalance.isnewton = 1 +md.stressbalance.restol = 0.0001 +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'Stressbalance') #Fields and tolerances to track changes -field_names =['Vx','Vy','Vz','Vel','Pressure'] -field_tolerances=[2e-06,2e-06,1e-06,2e-06,1e-06] -field_values=[\ - md.results.StressbalanceSolution.Vx,\ - md.results.StressbalanceSolution.Vy,\ - md.results.StressbalanceSolution.Vz,\ - md.results.StressbalanceSolution.Vel,\ - md.results.StressbalanceSolution.Pressure,\ - ] +field_names = ['Vx', 'Vy', 'Vz', 'Vel', 'Pressure'] +field_tolerances = [2e-06, 2e-06, 1e-06, 2e-06, 1e-06] +field_values = [md.results.StressbalanceSolution.Vx, + md.results.StressbalanceSolution.Vy, + md.results.StressbalanceSolution.Vz, + md.results.StressbalanceSolution.Vel, + md.results.StressbalanceSolution.Pressure] Index: /issm/trunk-jpl/test/NightlyRun/test430.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test430.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test430.py (revision 23793) @@ -9,7 +9,7 @@ from solve import * -md = triangle(model(),'../Exp/Square.exp',100000.) -md = setmask(md,'../Exp/SquareShelf.exp','') -md = parameterize(md,'../Par/SquareSheetShelf.py') +md = triangle(model(), '../Exp/Square.exp', 100000.) +md = setmask(md, '../Exp/SquareShelf.exp', '') +md = parameterize(md, '../Par/SquareSheetShelf.py') md.initialization.vx[:] = 1. md.initialization.vy[:] = 1. @@ -21,5 +21,5 @@ md.geometry.base[pos] = md.geometry.bed[pos] md.geometry.surface = md.geometry.base + md.geometry.thickness -md = setflowequation(md,'SSA','all') +md = setflowequation(md, 'SSA', 'all') #Boundary conditions: @@ -29,7 +29,7 @@ md.stressbalance.spcvy[:] = float('NaN') 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))) -pos = np.unique(np.concatenate((posA,posB))) +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))) +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))) @@ -49,12 +49,12 @@ md.transient.ismasstransport = 1 md.transient.issmb = 1 -md.transient.requested_outputs = ['default','BasalforcingsFloatingiceMeltingRate'] +md.transient.requested_outputs = ['default', 'BasalforcingsFloatingiceMeltingRate'] md.groundingline.migration = 'SubelementMigration' -md.groundingline.melt_interpolation= 'SubelementMelt1' +md.groundingline.melt_interpolation = 'SubelementMelt1' md.timestepping.final_time = 30 md.timestepping.time_step = 10 -md.cluster = generic('name',gethostname(),'np',3) -md = solve(md,'Transient') +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'Transient') #print md.results.TransientSolution[0].BasalforcingsFloatingiceMeltingRate #print md.results.TransientSolution[1].BasalforcingsFloatingiceMeltingRate @@ -62,35 +62,32 @@ #Fields and tolerances to track changes -field_names = [ - 'Bed1','Surface1','Thickness1','Floatingice1','Vx1','Vy1','Pressure1','FloatingiceMeltingrate1', - 'Bed2','Surface2','Thickness2','Floatingice2','Vx2','Vy2','Pressure2','FloatingiceMeltingrate2', - 'Bed3','Surface3','Thickness3','Floatingice3','Vx3','Vy3','Pressure3','FloatingiceMeltingrate3'] -field_tolerances = [2e-11,5e-12,2e-11,1e-11,5e-10,1e-08,1e-13,1e-13, - 3e-11,3e-11,9e-10,7e-11,1e-09,5e-08,1e-10,1e-13, - 1e-10,3e-11,1e-10,7e-11,1e-09,5e-08,1e-10,1e-13] -field_values = [ - md.results.TransientSolution[0].Base, - md.results.TransientSolution[0].Surface, - md.results.TransientSolution[0].Thickness, - md.results.TransientSolution[0].MaskGroundediceLevelset, - md.results.TransientSolution[0].Vx, - md.results.TransientSolution[0].Vy, - md.results.TransientSolution[0].Pressure, - md.results.TransientSolution[0].BasalforcingsFloatingiceMeltingRate, - md.results.TransientSolution[1].Base, - md.results.TransientSolution[1].Surface, - md.results.TransientSolution[1].Thickness, - md.results.TransientSolution[1].MaskGroundediceLevelset, - md.results.TransientSolution[1].Vx, - md.results.TransientSolution[1].Vy, - md.results.TransientSolution[1].Pressure, - md.results.TransientSolution[1].BasalforcingsFloatingiceMeltingRate, - md.results.TransientSolution[2].Base, - md.results.TransientSolution[2].Surface, - md.results.TransientSolution[2].Thickness, - md.results.TransientSolution[2].MaskGroundediceLevelset, - md.results.TransientSolution[2].Vx, - md.results.TransientSolution[2].Vy, - md.results.TransientSolution[2].Pressure, - md.results.TransientSolution[2].BasalforcingsFloatingiceMeltingRate, - ] +field_names = ['Bed1', 'Surface1', 'Thickness1', 'Floatingice1', 'Vx1', 'Vy1', 'Pressure1', 'FloatingiceMeltingrate1', + 'Bed2', 'Surface2', 'Thickness2', 'Floatingice2', 'Vx2', 'Vy2', 'Pressure2', 'FloatingiceMeltingrate2', + 'Bed3', 'Surface3', 'Thickness3', 'Floatingice3', 'Vx3', 'Vy3', 'Pressure3', 'FloatingiceMeltingrate3'] +field_tolerances = [2e-11, 5e-12, 2e-11, 1e-11, 5e-10, 1e-08, 1e-13, 1e-13, + 3e-11, 3e-11, 9e-10, 7e-11, 1e-09, 5e-08, 1e-10, 1e-13, + 1e-10, 3e-11, 1e-10, 7e-11, 1e-09, 5e-08, 1e-10, 1e-13] +field_values = [md.results.TransientSolution[0].Base, + md.results.TransientSolution[0].Surface, + md.results.TransientSolution[0].Thickness, + md.results.TransientSolution[0].MaskGroundediceLevelset, + md.results.TransientSolution[0].Vx, + md.results.TransientSolution[0].Vy, + md.results.TransientSolution[0].Pressure, + md.results.TransientSolution[0].BasalforcingsFloatingiceMeltingRate, + md.results.TransientSolution[1].Base, + md.results.TransientSolution[1].Surface, + md.results.TransientSolution[1].Thickness, + md.results.TransientSolution[1].MaskGroundediceLevelset, + md.results.TransientSolution[1].Vx, + md.results.TransientSolution[1].Vy, + md.results.TransientSolution[1].Pressure, + md.results.TransientSolution[1].BasalforcingsFloatingiceMeltingRate, + md.results.TransientSolution[2].Base, + md.results.TransientSolution[2].Surface, + md.results.TransientSolution[2].Thickness, + md.results.TransientSolution[2].MaskGroundediceLevelset, + md.results.TransientSolution[2].Vx, + md.results.TransientSolution[2].Vy, + md.results.TransientSolution[2].Pressure, + md.results.TransientSolution[2].BasalforcingsFloatingiceMeltingRate] Index: /issm/trunk-jpl/test/NightlyRun/test431.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test431.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test431.py (revision 23793) @@ -10,28 +10,26 @@ from solve import * -md=triangle(model(),'../Exp/Square.exp',150000.) -md=setmask(md,'../Exp/SquareShelf.exp','') -md=parameterize(md,'../Par/SquareSheetShelf.py') -md.extrude(3,2.) -md=setflowequation(md,'SSA','all') -md.cluster=generic('name',gethostname(),'np',3) -md.timestepping.time_step=0. -md.thermal.isenthalpy=1 -md.thermal.isdynamicbasalspc=1 -md.initialization.waterfraction=np.zeros((md.mesh.numberofvertices)) -md.initialization.watercolumn=np.zeros((md.mesh.numberofvertices)) -md=solve(md,'Steadystate') +md = triangle(model(), '../Exp/Square.exp', 150000.) +md = setmask(md, '../Exp/SquareShelf.exp', '') +md = parameterize(md, '../Par/SquareSheetShelf.py') +md.extrude(3, 2.) +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) +md.timestepping.time_step = 0. +md.thermal.isenthalpy = 1 +md.thermal.isdynamicbasalspc = 1 +md.initialization.waterfraction = np.zeros((md.mesh.numberofvertices)) +md.initialization.watercolumn = np.zeros((md.mesh.numberofvertices)) +md = solve(md, 'Steadystate') #Fields and tolerances to track changes -field_names =['Vx','Vy','Vz','Vel','Pressure','Temperature','Waterfraction','Enthalpy'] -field_tolerances=[8e-4,5e-4,5e-4,5e-4,1e-13,1e-4,5e-4,5e-4] -field_values=[\ - md.results.SteadystateSolution.Vx,\ - md.results.SteadystateSolution.Vy,\ - md.results.SteadystateSolution.Vz,\ - md.results.SteadystateSolution.Vel,\ - md.results.SteadystateSolution.Pressure,\ - md.results.SteadystateSolution.Temperature,\ - md.results.SteadystateSolution.Waterfraction,\ - md.results.SteadystateSolution.Enthalpy,\ - ] +field_names = ['Vx', 'Vy', 'Vz', 'Vel', 'Pressure', 'Temperature', 'Waterfraction', 'Enthalpy'] +field_tolerances = [8e-4, 5e-4, 5e-4, 5e-4, 1e-13, 1e-4, 5e-4, 5e-4] +field_values = [md.results.SteadystateSolution.Vx, + md.results.SteadystateSolution.Vy, + md.results.SteadystateSolution.Vz, + md.results.SteadystateSolution.Vel, + md.results.SteadystateSolution.Pressure, + md.results.SteadystateSolution.Temperature, + md.results.SteadystateSolution.Waterfraction, + md.results.SteadystateSolution.Enthalpy] Index: /issm/trunk-jpl/test/NightlyRun/test432.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test432.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test432.py (revision 23793) @@ -10,27 +10,25 @@ from solve import * -md=triangle(model(),'../Exp/Square.exp',150000.) -md=setmask(md,'../Exp/SquareShelf.exp','') -md=parameterize(md,'../Par/SquareSheetShelf.py') -md.extrude(3,2.) -md=setflowequation(md,'HO','all') -md.cluster=generic('name',gethostname(),'np',3) -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=solve(md,'Steadystate') +md = triangle(model(), '../Exp/Square.exp', 150000.) +md = setmask(md, '../Exp/SquareShelf.exp', '') +md = parameterize(md, '../Par/SquareSheetShelf.py') +md.extrude(3, 2.) +md = setflowequation(md, 'HO', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) +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 = solve(md, 'Steadystate') #Fields and tolerances to track changes -field_names =['Vx','Vy','Vz','Vel','Pressure','Temperature','Waterfraction','Enthalpy'] -field_tolerances=[3e-09,1e-09,1e-09,1e-09,1e-13,1e-10,4e-10,3e-9] -field_values=[\ - md.results.SteadystateSolution.Vx,\ - md.results.SteadystateSolution.Vy,\ - md.results.SteadystateSolution.Vz,\ - md.results.SteadystateSolution.Vel,\ - md.results.SteadystateSolution.Pressure,\ - md.results.SteadystateSolution.Temperature,\ - md.results.SteadystateSolution.Waterfraction,\ - md.results.SteadystateSolution.Enthalpy,\ - ] +field_names = ['Vx', 'Vy', 'Vz', 'Vel', 'Pressure', 'Temperature', 'Waterfraction', 'Enthalpy'] +field_tolerances = [3e-09, 1e-09, 1e-09, 1e-09, 1e-13, 1e-10, 4e-10, 3e-9] +field_values = [md.results.SteadystateSolution.Vx, + md.results.SteadystateSolution.Vy, + md.results.SteadystateSolution.Vz, + md.results.SteadystateSolution.Vel, + md.results.SteadystateSolution.Pressure, + md.results.SteadystateSolution.Temperature, + md.results.SteadystateSolution.Waterfraction, + md.results.SteadystateSolution.Enthalpy] Index: /issm/trunk-jpl/test/NightlyRun/test433.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test433.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test433.py (revision 23793) @@ -10,51 +10,51 @@ -radius=1.e6 -shelfextent=2.e5 +radius = 1.e6 +shelfextent = 2.e5 -md=roundmesh(model(),radius,50000.) -#fix center node to 0,0 -rad=np.sqrt(md.mesh.x**2+md.mesh.y**2) -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 -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)) -flags[pos]=1 -md=setmask(md,flags,'') -md=parameterize(md,'../Par/RoundSheetShelf.py') -md=setflowequation(md,'SSA','all') -md.extrude(3,1.) -md.cluster=generic('name',gethostname(),'np',3) +md = roundmesh(model(), radius, 50000.) +#fix center node to 0, 0 +rad = np.sqrt(md.mesh.x**2 + md.mesh.y**2) +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 +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)) +flags[pos] = 1 +md = setmask(md, flags, '') +md = parameterize(md, '../Par/RoundSheetShelf.py') +md = setflowequation(md, 'SSA', 'all') +md.extrude(3, 1.) +md.cluster = generic('name', gethostname(), 'np', 3) -md.transient.isthermal=False -md.transient.ismasstransport=False -md.transient.issmb=True -md.transient.isstressbalance=False -md.transient.isgroundingline=True +md.transient.isthermal = False +md.transient.ismasstransport = False +md.transient.issmb = True +md.transient.isstressbalance = False +md.transient.isgroundingline = True #test different grounding line dynamics. -md.groundingline.migration='AggressiveMigration' -md=solve(md,'Transient') -element_on_iceshelf_agressive=md.results.TransientSolution[0].MaskGroundediceLevelset +md.groundingline.migration = 'AggressiveMigration' +md = solve(md, 'Transient') +element_on_iceshelf_agressive = md.results.TransientSolution[0].MaskGroundediceLevelset -md.groundingline.migration='SoftMigration' -md=solve(md,'Transient') -element_on_iceshelf_soft=md.results.TransientSolution[0].MaskGroundediceLevelset +md.groundingline.migration = 'SoftMigration' +md = solve(md, 'Transient') +element_on_iceshelf_soft = md.results.TransientSolution[0].MaskGroundediceLevelset -md.groundingline.migration='SubelementMigration' -md=solve(md,'Transient') -element_on_iceshelf_subelement=md.results.TransientSolution[0].MaskGroundediceLevelset +md.groundingline.migration = 'SubelementMigration' +md = solve(md, 'Transient') +element_on_iceshelf_subelement = md.results.TransientSolution[0].MaskGroundediceLevelset -md.groundingline.migration='SubelementMigration' -md.groundingline.friction_interpolation='SubelementFriction2' -md=solve(md,'Transient') -element_on_iceshelf_subelement2=md.results.TransientSolution[0].MaskGroundediceLevelset +md.groundingline.migration = 'SubelementMigration' +md.groundingline.friction_interpolation = 'SubelementFriction2' +md = solve(md, 'Transient') +element_on_iceshelf_subelement2 = md.results.TransientSolution[0].MaskGroundediceLevelset #Fields and tolerances to track changes -field_names =['ElementOnIceShelfAggressive','ElementOnIceShelfSoft','ElementOnIceShelfSubelement'] -field_tolerances=[1e-13,1e-13,1e-13] -field_values=[element_on_iceshelf_agressive,element_on_iceshelf_soft,element_on_iceshelf_subelement] +field_names = ['ElementOnIceShelfAggressive', 'ElementOnIceShelfSoft', 'ElementOnIceShelfSubelement'] +field_tolerances = [1e-13, 1e-13, 1e-13] +field_values = [element_on_iceshelf_agressive, element_on_iceshelf_soft, element_on_iceshelf_subelement] Index: /issm/trunk-jpl/test/NightlyRun/test434.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test434.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test434.py (revision 23793) @@ -1,4 +1,3 @@ #Test Name: SquareSheetShelfL1L2 -import numpy as np from model import * from socket import gethostname @@ -10,20 +9,18 @@ from solve import * -md=triangle(model(),'../Exp/Square.exp',150000.) -md=setmask(md,'../Exp/SquareShelf.exp','') -md=parameterize(md,'../Par/SquareSheetShelf.py') -md.extrude(4,1.) -md=setflowequation(md,'L1L2','all') -md.cluster=generic('name',gethostname(),'np',3) -md=solve(md,'Stressbalance') +md = triangle(model(), '../Exp/Square.exp', 150000.) +md = setmask(md, '../Exp/SquareShelf.exp', '') +md = parameterize(md, '../Par/SquareSheetShelf.py') +md.extrude(4, 1.) +md = setflowequation(md, 'L1L2', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'Stressbalance') #Fields and tolerances to track changes -field_names =['Vx','Vy','Vz','Vel','Pressure'] -field_tolerances=[1e-06,1e-06,1e-06,1e-06,1e-07] -field_values=[\ - md.results.StressbalanceSolution.Vx,\ - md.results.StressbalanceSolution.Vy,\ - md.results.StressbalanceSolution.Vz,\ - md.results.StressbalanceSolution.Vel,\ - md.results.StressbalanceSolution.Pressure,\ - ] +field_names = ['Vx', 'Vy', 'Vz', 'Vel', 'Pressure'] +field_tolerances = [1e-06, 1e-06, 1e-06, 1e-06, 1e-07] +field_values = [md.results.StressbalanceSolution.Vx, + md.results.StressbalanceSolution.Vy, + md.results.StressbalanceSolution.Vz, + md.results.StressbalanceSolution.Vel, + md.results.StressbalanceSolution.Pressure] Index: /issm/trunk-jpl/test/NightlyRun/test435.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test435.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test435.py (revision 23793) @@ -9,7 +9,7 @@ from solve import * -md = triangle(model(),'../Exp/Square.exp',100000.) -md = setmask(md,'../Exp/SquareShelf.exp','') -md = parameterize(md,'../Par/SquareSheetShelf.py') +md = triangle(model(), '../Exp/Square.exp', 100000.) +md = setmask(md, '../Exp/SquareShelf.exp', '') +md = parameterize(md, '../Par/SquareSheetShelf.py') md.initialization.vx[:] = 1. md.initialization.vy[:] = 1. @@ -21,6 +21,6 @@ md.geometry.base[pos] = md.geometry.bed[pos] md.geometry.surface = md.geometry.base + md.geometry.thickness -md = md.extrude(4,1.) -md = setflowequation(md,'HO','all') +md = md.extrude(4, 1.) +md = setflowequation(md, 'HO', 'all') #Boundary conditions: @@ -30,7 +30,7 @@ md.stressbalance.spcvy[:] = float('Nan') 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))) -pos = np.unique(np.concatenate((posA,posB))) +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))) +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))) @@ -38,5 +38,5 @@ md.stressbalance.spcvy[pos2] = 0. -md.materials.rheology_B = 1. / ((10**-25)**(1./3.)) * np.ones((md.mesh.numberofvertices,)) +md.materials.rheology_B = 1. / ((10**-25)**(1. / 3.)) * np.ones((md.mesh.numberofvertices,)) md.materials.rheology_law = 'None' md.friction.coefficient[:] = np.sqrt(1e7) * np.ones((md.mesh.numberofvertices,)) @@ -50,49 +50,45 @@ md.transient.ismasstransport = 1 md.transient.issmb = 1 -md.transient.requested_outputs = ['default','BasalforcingsFloatingiceMeltingRate'] +md.transient.requested_outputs = ['default', 'BasalforcingsFloatingiceMeltingRate'] md.groundingline.migration = 'SubelementMigration' -md.groundingline.melt_interpolation= 'SubelementMelt1' +md.groundingline.melt_interpolation = 'SubelementMelt1' md.timestepping.final_time = 30 md.timestepping.time_step = 10 -md.cluster = generic('name',gethostname(),'np',3) -md = solve(md,'Transient') +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'Transient') #Fields and tolerances to track changes -field_names = [ - 'Bed1','Surface1','Thickness1','Floatingice1','Vx1','Vy1','Vz1','Pressure1','FloatingiceMeltingrate1', - 'Bed2','Surface2','Thickness2','Floatingice2','Vx2','Vy2','Vz2','Pressure2','FloatingiceMeltingrate2', - 'Bed3','Surface3','Thickness3','Floatingice3','Vx3','Vy3','Vz3','Pressure3','FloatingiceMeltingrate3'] -field_tolerances = [ - 2e-11,5e-12,2e-11,1e-11,7e-10,3e-08,6e-10,1e-13,1e-13, - 3e-11,3e-11,9e-10,7e-11,9e-09,2e-07,1e-09,1e-10,1e-13, - 1e-9,2e-08,7e-09,2e-7 ,1e-03,8e-04,2e-09,1e-10,1e-13] -field_values = [ - md.results.TransientSolution[0].Base, - md.results.TransientSolution[0].Surface, - md.results.TransientSolution[0].Thickness, - md.results.TransientSolution[0].MaskGroundediceLevelset, - md.results.TransientSolution[0].Vx, - md.results.TransientSolution[0].Vy, - md.results.TransientSolution[0].Vz, - md.results.TransientSolution[0].Pressure, - md.results.TransientSolution[0].BasalforcingsFloatingiceMeltingRate, - md.results.TransientSolution[1].Base, - md.results.TransientSolution[1].Surface, - md.results.TransientSolution[1].Thickness, - md.results.TransientSolution[1].MaskGroundediceLevelset, - md.results.TransientSolution[1].Vx, - md.results.TransientSolution[1].Vy, - md.results.TransientSolution[1].Vz, - md.results.TransientSolution[1].Pressure, - md.results.TransientSolution[1].BasalforcingsFloatingiceMeltingRate, - md.results.TransientSolution[2].Base, - md.results.TransientSolution[2].Surface, - md.results.TransientSolution[2].Thickness, - md.results.TransientSolution[2].MaskGroundediceLevelset, - md.results.TransientSolution[2].Vx, - md.results.TransientSolution[2].Vy, - md.results.TransientSolution[2].Vz, - md.results.TransientSolution[2].Pressure, - md.results.TransientSolution[2].BasalforcingsFloatingiceMeltingRate, - ] +field_names = ['Bed1', 'Surface1', 'Thickness1', 'Floatingice1', 'Vx1', 'Vy1', 'Vz1', 'Pressure1', 'FloatingiceMeltingrate1', + 'Bed2', 'Surface2', 'Thickness2', 'Floatingice2', 'Vx2', 'Vy2', 'Vz2', 'Pressure2', 'FloatingiceMeltingrate2', + 'Bed3', 'Surface3', 'Thickness3', 'Floatingice3', 'Vx3', 'Vy3', 'Vz3', 'Pressure3', 'FloatingiceMeltingrate3'] +field_tolerances = [2e-11, 5e-12, 2e-11, 1e-11, 7e-10, 3e-08, 6e-10, 1e-13, 1e-13, + 3e-11, 3e-11, 9e-10, 7e-11, 9e-09, 2e-07, 1e-09, 1e-10, 1e-13, + 1e-9, 2e-08, 7e-09, 2e-7, 1e-03, 8e-04, 2e-09, 1e-10, 1e-13] +field_values = [md.results.TransientSolution[0].Base, + md.results.TransientSolution[0].Surface, + md.results.TransientSolution[0].Thickness, + md.results.TransientSolution[0].MaskGroundediceLevelset, + md.results.TransientSolution[0].Vx, + md.results.TransientSolution[0].Vy, + md.results.TransientSolution[0].Vz, + md.results.TransientSolution[0].Pressure, + md.results.TransientSolution[0].BasalforcingsFloatingiceMeltingRate, + md.results.TransientSolution[1].Base, + md.results.TransientSolution[1].Surface, + md.results.TransientSolution[1].Thickness, + md.results.TransientSolution[1].MaskGroundediceLevelset, + md.results.TransientSolution[1].Vx, + md.results.TransientSolution[1].Vy, + md.results.TransientSolution[1].Vz, + md.results.TransientSolution[1].Pressure, + md.results.TransientSolution[1].BasalforcingsFloatingiceMeltingRate, + md.results.TransientSolution[2].Base, + md.results.TransientSolution[2].Surface, + md.results.TransientSolution[2].Thickness, + md.results.TransientSolution[2].MaskGroundediceLevelset, + md.results.TransientSolution[2].Vx, + md.results.TransientSolution[2].Vy, + md.results.TransientSolution[2].Vz, + md.results.TransientSolution[2].Pressure, + md.results.TransientSolution[2].BasalforcingsFloatingiceMeltingRate] Index: /issm/trunk-jpl/test/NightlyRun/test436.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test436.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test436.py (revision 23793) @@ -9,10 +9,10 @@ from solve import * -md = triangle(model(),'../Exp/Square.exp',150000.) -md = setmask(md,'../Exp/SquareShelf.exp','') -md = parameterize(md,'../Par/SquareSheetShelf.py') -md = md.extrude(3,2.) -md = setflowequation(md,'HO','all') -md.cluster = generic('name',gethostname(),'np',3) +md = triangle(model(), '../Exp/Square.exp', 150000.) +md = setmask(md, '../Exp/SquareShelf.exp', '') +md = parameterize(md, '../Par/SquareSheetShelf.py') +md = md.extrude(3, 2.) +md = setflowequation(md, 'HO', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) md.timestepping.time_step = 0. md.thermal.isenthalpy = 1 @@ -25,21 +25,18 @@ field_values = [] for i in ['LliboutryDuval', 'CuffeyTemperate']: - print(' ') - print('====== Testing rheology law: ' + i + ' =====') + print(' ') + print('====== Testing rheology law: ' + i + ' =') - md.materials.rheology_law = i - md = solve(md,'Steadystate') - field_names += ['Vx'+i,'Vy'+i,'Vz'+i,'Vel'+i,'Pressure'+i, - 'Temperature'+i,'Waterfraction'+i,'Enthalpy'+i] - field_tolerances += [2e-09,1e-09,1e-09,1e-09,1e-13,2e-10,6e-10,1e-9] - field_values += [ - md.results.SteadystateSolution.Vx, - md.results.SteadystateSolution.Vy, - md.results.SteadystateSolution.Vz, - md.results.SteadystateSolution.Vel, - md.results.SteadystateSolution.Pressure, - md.results.SteadystateSolution.Temperature, - md.results.SteadystateSolution.Waterfraction, - md.results.SteadystateSolution.Enthalpy, - ] - + md.materials.rheology_law = i + md = solve(md, 'Steadystate') + field_names += ['Vx' + i, 'Vy' + i, 'Vz' + i, 'Vel' + i, 'Pressure' + i, + 'Temperature' + i, 'Waterfraction' + i, 'Enthalpy' + i] + field_tolerances += [2e-09, 1e-09, 1e-09, 1e-09, 1e-13, 2e-10, 6e-10, 1e-9] + field_values += [md.results.SteadystateSolution.Vx, + md.results.SteadystateSolution.Vy, + md.results.SteadystateSolution.Vz, + md.results.SteadystateSolution.Vel, + md.results.SteadystateSolution.Pressure, + md.results.SteadystateSolution.Temperature, + md.results.SteadystateSolution.Waterfraction, + md.results.SteadystateSolution.Enthalpy] Index: /issm/trunk-jpl/test/NightlyRun/test437.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test437.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test437.py (revision 23793) @@ -9,7 +9,7 @@ from solve import * -md = triangle(model(),'../Exp/Square.exp',300000.) -md = setmask(md,'','') -md = parameterize(md,'../Par/SquareThermal.py') +md = triangle(model(), '../Exp/Square.exp', 300000.) +md = setmask(md, '', '') +md = parameterize(md, '../Par/SquareThermal.py') h = 100. @@ -18,14 +18,14 @@ md.geometry.surface = md.geometry.base + md.geometry.thickness -md.extrude(41,2.) -md = setflowequation(md,'HO','all') +md.extrude(41, 2.) +md = setflowequation(md, 'HO', 'all') md.thermal.isenthalpy = True md.thermal.isdynamicbasalspc = True #Basal forcing -Ts = 273.15-3. -Tb = 273.15-1. +Ts = 273.15 - 3. +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 @@ -43,6 +43,6 @@ t2 = 100. md.timestepping.final_time = 400. -md.thermal.spctemperature = np.array([SPC_cold,SPC_cold,SPC_warm,SPC_warm,SPC_cold]).T -md.thermal.spctemperature = np.vstack((md.thermal.spctemperature,[t0, t1-1, t1, t2-1, t2])) +md.thermal.spctemperature = np.array([SPC_cold, SPC_cold, SPC_warm, SPC_warm, SPC_cold]).T +md.thermal.spctemperature = np.vstack((md.thermal.spctemperature, [t0, t1 - 1, t1, t2 - 1, t2])) #print np.shape(md.thermal.spctemperature) #print md.thermal.spctemperature @@ -57,40 +57,38 @@ #Go solve md.verbose = verbose(0) -md.cluster = generic('name',gethostname(),'np',3) -md = solve(md,'Transient') +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'Transient') #Fields and tolerances to track changes -field_names = ['Enthalpy1','Temperature1','Waterfraction1','BasalMeltingRate1','Watercolumn1', - 'Enthalpy2','Temperature2','Waterfraction2','BasalMeltingRate2','Watercolumn2', - 'Enthalpy3','Temperature3','Waterfraction3','BasalMeltingRate3','Watercolumn3', - 'Enthalpy4','Temperature4','Waterfraction4','BasalMeltingRate4','Watercolumn4'] -field_tolerances = [1.e-10,1.e-10,1.e-10,1.e-9,1.e-10, - 1.e-10,1.e-10,1.e-10,2.e-9,2.e-10, - 1.e-10,1.e-10,1.e-10,2.e-9,1.e-10, - 1.e-10,1.e-10,1.e-10,2.e-9,1.e-10] +field_names = ['Enthalpy1', 'Temperature1', 'Waterfraction1', 'BasalMeltingRate1', 'Watercolumn1', + 'Enthalpy2', 'Temperature2', 'Waterfraction2', 'BasalMeltingRate2', 'Watercolumn2', + 'Enthalpy3', 'Temperature3', 'Waterfraction3', 'BasalMeltingRate3', 'Watercolumn3', + 'Enthalpy4', 'Temperature4', 'Waterfraction4', 'BasalMeltingRate4', 'Watercolumn4'] +field_tolerances = [1.e-10, 1.e-10, 1.e-10, 1.e-9, 1.e-10, + 1.e-10, 1.e-10, 1.e-10, 2.e-9, 2.e-10, + 1.e-10, 1.e-10, 1.e-10, 2.e-9, 1.e-10, + 1.e-10, 1.e-10, 1.e-10, 2.e-9, 1.e-10] i1 = 0 -i2 = int(np.ceil(t2 / md.timestepping.time_step) + 2)-1 -i3 = int(np.ceil(md.timestepping.final_time / (2. * md.timestepping.time_step)))-1 -i4 = np.shape(md.results.TransientSolution)[0]-1 -field_values = [ - md.results.TransientSolution[i1].Enthalpy, - md.results.TransientSolution[i1].Temperature, - md.results.TransientSolution[i1].Waterfraction, - md.results.TransientSolution[i1].BasalforcingsGroundediceMeltingRate, - md.results.TransientSolution[i1].Watercolumn, - md.results.TransientSolution[i2].Enthalpy, - md.results.TransientSolution[i2].Temperature, - md.results.TransientSolution[i2].Waterfraction, - md.results.TransientSolution[i2].BasalforcingsGroundediceMeltingRate, - md.results.TransientSolution[i2].Watercolumn, - md.results.TransientSolution[i3].Enthalpy, - md.results.TransientSolution[i3].Temperature, - md.results.TransientSolution[i3].Waterfraction, - md.results.TransientSolution[i3].BasalforcingsGroundediceMeltingRate, - md.results.TransientSolution[i3].Watercolumn, - md.results.TransientSolution[i4].Enthalpy, - md.results.TransientSolution[i4].Temperature, - md.results.TransientSolution[i4].Waterfraction, - md.results.TransientSolution[i4].BasalforcingsGroundediceMeltingRate, - md.results.TransientSolution[i4].Watercolumn, - ] +i2 = int(np.ceil(t2 / md.timestepping.time_step) + 2) - 1 +i3 = int(np.ceil(md.timestepping.final_time / (2. * md.timestepping.time_step))) - 1 +i4 = np.shape(md.results.TransientSolution)[0] - 1 +field_values = [md.results.TransientSolution[i1].Enthalpy, + md.results.TransientSolution[i1].Temperature, + md.results.TransientSolution[i1].Waterfraction, + md.results.TransientSolution[i1].BasalforcingsGroundediceMeltingRate, + md.results.TransientSolution[i1].Watercolumn, + md.results.TransientSolution[i2].Enthalpy, + md.results.TransientSolution[i2].Temperature, + md.results.TransientSolution[i2].Waterfraction, + md.results.TransientSolution[i2].BasalforcingsGroundediceMeltingRate, + md.results.TransientSolution[i2].Watercolumn, + md.results.TransientSolution[i3].Enthalpy, + md.results.TransientSolution[i3].Temperature, + md.results.TransientSolution[i3].Waterfraction, + md.results.TransientSolution[i3].BasalforcingsGroundediceMeltingRate, + md.results.TransientSolution[i3].Watercolumn, + md.results.TransientSolution[i4].Enthalpy, + md.results.TransientSolution[i4].Temperature, + md.results.TransientSolution[i4].Waterfraction, + md.results.TransientSolution[i4].BasalforcingsGroundediceMeltingRate, + md.results.TransientSolution[i4].Watercolumn] Index: /issm/trunk-jpl/test/NightlyRun/test438.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test438.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test438.py (revision 23793) @@ -10,44 +10,42 @@ from frictionwaterlayer import * -md = triangle(model(),'../Exp/Square.exp',150000.) -md = setmask(md,'../Exp/SquareShelf.exp','') -md = parameterize(md,'../Par/SquareSheetShelf.py') -md = setflowequation(md,'SSA','all') +md = triangle(model(), '../Exp/Square.exp', 150000.) +md = setmask(md, '../Exp/SquareShelf.exp', '') +md = parameterize(md, '../Par/SquareSheetShelf.py') +md = setflowequation(md, 'SSA', 'all') md.friction = frictionwaterlayer(md) -md.friction.water_layer = np.zeros((md.mesh.numberofvertices+1,2)) -md.friction.water_layer[:,1] = 1. -md.friction.water_layer[md.mesh.numberofvertices,:] = [1.,2.] +md.friction.water_layer = np.zeros((md.mesh.numberofvertices + 1, 2)) +md.friction.water_layer[:, 1] = 1. +md.friction.water_layer[md.mesh.numberofvertices, :] = [1., 2.] md.friction.f = 0.8 -md.cluster = generic('name',gethostname(),'np',3) -md = solve(md,'Transient') +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'Transient') #Fields and tolerances to track changes -field_names =['Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1', - 'Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2', - 'Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3'] -field_tolerances=[1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13, - 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13, - 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13] -field_values = [ - md.results.TransientSolution[0].Vx, - md.results.TransientSolution[0].Vy, - md.results.TransientSolution[0].Vel, - md.results.TransientSolution[0].Pressure, - md.results.TransientSolution[0].Base, - md.results.TransientSolution[0].Surface, - md.results.TransientSolution[0].Thickness, - md.results.TransientSolution[1].Vx, - md.results.TransientSolution[1].Vy, - md.results.TransientSolution[1].Vel, - md.results.TransientSolution[1].Pressure, - md.results.TransientSolution[1].Base, - md.results.TransientSolution[1].Surface, - md.results.TransientSolution[1].Thickness, - md.results.TransientSolution[2].Vx, - md.results.TransientSolution[2].Vy, - md.results.TransientSolution[2].Vel, - md.results.TransientSolution[2].Pressure, - md.results.TransientSolution[2].Base, - md.results.TransientSolution[2].Surface, - md.results.TransientSolution[2].Thickness - ] +field_names = ['Vx1', 'Vy1', 'Vel1', 'Pressure1', 'Bed1', 'Surface1', 'Thickness1', + 'Vx2', 'Vy2', 'Vel2', 'Pressure2', 'Bed2', 'Surface2', 'Thickness2', + 'Vx3', 'Vy3', 'Vel3', 'Pressure3', 'Bed3', 'Surface3', 'Thickness3'] +field_tolerances = [1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, + 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, + 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13] +field_values = [md.results.TransientSolution[0].Vx, + md.results.TransientSolution[0].Vy, + md.results.TransientSolution[0].Vel, + md.results.TransientSolution[0].Pressure, + md.results.TransientSolution[0].Base, + md.results.TransientSolution[0].Surface, + md.results.TransientSolution[0].Thickness, + md.results.TransientSolution[1].Vx, + md.results.TransientSolution[1].Vy, + md.results.TransientSolution[1].Vel, + md.results.TransientSolution[1].Pressure, + md.results.TransientSolution[1].Base, + md.results.TransientSolution[1].Surface, + md.results.TransientSolution[1].Thickness, + md.results.TransientSolution[2].Vx, + md.results.TransientSolution[2].Vy, + md.results.TransientSolution[2].Vel, + md.results.TransientSolution[2].Pressure, + md.results.TransientSolution[2].Base, + md.results.TransientSolution[2].Surface, + md.results.TransientSolution[2].Thickness] Index: /issm/trunk-jpl/test/NightlyRun/test439.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test439.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test439.py (revision 23793) @@ -10,46 +10,44 @@ from frictionwaterlayer import * -md = triangle(model(),'../Exp/Square.exp',150000.) -md = setmask(md,'../Exp/SquareShelf.exp','') -md = parameterize(md,'../Par/SquareSheetShelf.py') -md = md.extrude(4,1.) -md = setflowequation(md,'HO','all') +md = triangle(model(), '../Exp/Square.exp', 150000.) +md = setmask(md, '../Exp/SquareShelf.exp', '') +md = parameterize(md, '../Par/SquareSheetShelf.py') +md = md.extrude(4, 1.) +md = setflowequation(md, 'HO', 'all') md.friction = frictionwaterlayer(md) -md.friction.water_layer = np.zeros((md.mesh.numberofvertices+1,2)) -md.friction.water_layer[:,1] = 1. -md.friction.water_layer[md.mesh.numberofvertices,:] = [1.,2.] +md.friction.water_layer = np.zeros((md.mesh.numberofvertices + 1, 2)) +md.friction.water_layer[:, 1] = 1. +md.friction.water_layer[md.mesh.numberofvertices, :] = [1., 2.] md.friction.f = 0.8 -md.groundingline.melt_interpolation='SubelementMelt2' -md.cluster = generic('name',gethostname(),'np',3) -md = solve(md,'Transient') +md.groundingline.melt_interpolation = 'SubelementMelt2' +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'Transient') #Fields and tolerances to track changes -field_names =['Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1', - 'Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2', - 'Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3'] -field_tolerances = [2e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09, - 1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09, - 1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09] -field_values = [ - md.results.TransientSolution[0].Vx, - md.results.TransientSolution[0].Vy, - md.results.TransientSolution[0].Vel, - md.results.TransientSolution[0].Pressure, - md.results.TransientSolution[0].Base, - md.results.TransientSolution[0].Surface, - md.results.TransientSolution[0].Thickness, - md.results.TransientSolution[1].Vx, - md.results.TransientSolution[1].Vy, - md.results.TransientSolution[1].Vel, - md.results.TransientSolution[1].Pressure, - md.results.TransientSolution[1].Base, - md.results.TransientSolution[1].Surface, - md.results.TransientSolution[1].Thickness, - md.results.TransientSolution[2].Vx, - md.results.TransientSolution[2].Vy, - md.results.TransientSolution[2].Vel, - md.results.TransientSolution[2].Pressure, - md.results.TransientSolution[2].Base, - md.results.TransientSolution[2].Surface, - md.results.TransientSolution[2].Thickness - ] +field_names = ['Vx1', 'Vy1', 'Vel1', 'Pressure1', 'Bed1', 'Surface1', 'Thickness1', + 'Vx2', 'Vy2', 'Vel2', 'Pressure2', 'Bed2', 'Surface2', 'Thickness2', + 'Vx3', 'Vy3', 'Vel3', 'Pressure3', 'Bed3', 'Surface3', 'Thickness3'] +field_tolerances = [2e-09, 1e-09, 1e-09, 1e-09, 1e-09, 1e-09, 1e-09, + 1e-09, 1e-09, 1e-09, 1e-09, 1e-09, 1e-09, 1e-09, + 1e-09, 1e-09, 1e-09, 1e-09, 1e-09, 1e-09, 1e-09] +field_values = [md.results.TransientSolution[0].Vx, + md.results.TransientSolution[0].Vy, + md.results.TransientSolution[0].Vel, + md.results.TransientSolution[0].Pressure, + md.results.TransientSolution[0].Base, + md.results.TransientSolution[0].Surface, + md.results.TransientSolution[0].Thickness, + md.results.TransientSolution[1].Vx, + md.results.TransientSolution[1].Vy, + md.results.TransientSolution[1].Vel, + md.results.TransientSolution[1].Pressure, + md.results.TransientSolution[1].Base, + md.results.TransientSolution[1].Surface, + md.results.TransientSolution[1].Thickness, + md.results.TransientSolution[2].Vx, + md.results.TransientSolution[2].Vy, + md.results.TransientSolution[2].Vel, + md.results.TransientSolution[2].Pressure, + md.results.TransientSolution[2].Base, + md.results.TransientSolution[2].Surface, + md.results.TransientSolution[2].Thickness] Index: /issm/trunk-jpl/test/NightlyRun/test440.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test440.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test440.py (revision 23793) @@ -2,6 +2,4 @@ import numpy as np from model import * -from socket import gethostname - from triangle import * from setmask import * @@ -9,19 +7,18 @@ from setflowequation import * from solve import * - from partitioner import * from normal_uncertain import * from response_function import * -md = triangle(model(),'../Exp/Square.exp',200000.) -md = setmask(md,'../Exp/SquareShelf.exp','') -md = parameterize(md,'../Par/SquareSheetShelf.py') -md = setflowequation(md,'SSA','all') -md.cluster = generic('name',oshostname(),'np',3) +md = triangle(model(), '../Exp/Square.exp', 200000.) +md = setmask(md, '../Exp/SquareShelf.exp', '') +md = parameterize(md, '../Par/SquareSheetShelf.py') +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', oshostname(), 'np', 3) #partitioning md.qmu.numberofpartitions = md.mesh.numberofvertices -md = partitioner(md,'package','linear') -md.qmu.partition = md.qmu.partition-1 +md = partitioner(md, 'package', 'linear') +md.qmu.partition = md.qmu.partition - 1 md.qmu.isdakota = 1 @@ -33,8 +30,8 @@ #variables -md.qmu.variables.rho_ice = normal_uncertain.normal_uncertain('MaterialsRhoIce',md.materials.rho_ice,0.01) +md.qmu.variables.rho_ice = normal_uncertain.normal_uncertain('MaterialsRhoIce', md.materials.rho_ice, 0.01) #responses -md.qmu.responses.MaxVel = response_function.response_function('scaled_Thickness',[],[0.0001,0.001,0.01,0.25,0.5,0.75,0.99,0.999,0.9999]) +md.qmu.responses.MaxVel = response_function.response_function('scaled_Thickness', [], [0.0001, 0.001, 0.01, 0.25, 0.5, 0.75, 0.99, 0.999, 0.9999]) #method @@ -45,18 +42,18 @@ md.qmu.params.interval_type = 'forward' -if version>=6: - md.qmu.params.analysis_driver = 'matlab' - md.qmu.params.evaluation_scheduling = 'master' - md.qmu.params.processors_per_evaluation = 2 +if version >= 6: + md.qmu.params.analysis_driver = 'matlab' + md.qmu.params.evaluation_scheduling = 'master' + md.qmu.params.processors_per_evaluation = 2 else: - md.qmu.params.analysis_driver='stressbalance' - md.qmu.params.evaluation_concurrency = 1 + md.qmu.params.analysis_driver = 'stressbalance' + md.qmu.params.evaluation_concurrency = 1 -#imperative! -md.stressbalance.reltol = 10**-5 #tighten for qmu analysese +#imperative! +md.stressbalance.reltol = 10**-5 #tighten for qmu analysese #solve -md.verbose = verbose('000000000') # this line is recommended -md = solve(md,'Stressbalance','overwrite','y') +md.verbose = verbose('000000000') # this line is recommended +md = solve(md, 'Stressbalance', 'overwrite', 'y') md.qmu.results = md.results.dakota @@ -64,11 +61,11 @@ h = np.zeros(md.qmu.numberofpartitions) for i in range(md.qmu.numberofpartitions): - h[i] = md.qmu.results.dresp_out[i].mean + h[i] = md.qmu.results.dresp_out[i].mean #project onto grid -thickness = h[md.qmu.partition] +thickness = h[md.qmu.partition] #Fields and tolerances to track changes -field_names = ['Thickness'] -field_tolerances= [1e-10] +field_names = ['Thickness'] +field_tolerances = [1e-10] field_values = [thickness] Index: /issm/trunk-jpl/test/NightlyRun/test441.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test441.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test441.py (revision 23793) @@ -9,7 +9,7 @@ from solve import * -md = triangle(model(),'../Exp/Square.exp',100000.) -md = setmask(md,'../Exp/SquareShelf.exp','') -md = parameterize(md,'../Par/SquareSheetShelf.py') +md = triangle(model(), '../Exp/Square.exp', 100000.) +md = setmask(md, '../Exp/SquareShelf.exp', '') +md = parameterize(md, '../Par/SquareSheetShelf.py') md.initialization.vx[:] = 1. md.initialization.vy[:] = 1. @@ -21,5 +21,5 @@ md.geometry.base[pos] = md.geometry.bed[pos] md.geometry.surface = md.geometry.base + md.geometry.thickness -md = setflowequation(md,'SSA','all') +md = setflowequation(md, 'SSA', 'all') #Boundary conditions: @@ -29,7 +29,7 @@ md.stressbalance.spcvy[:] = float('Nan') 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))) -pos = np.unique(np.concatenate((posA,posB))) +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))) +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))) @@ -37,5 +37,5 @@ md.stressbalance.spcvy[pos2] = 0. -md.materials.rheology_B = 1. / ((10**-25)**(1./3.)) * np.ones((md.mesh.numberofvertices,)) +md.materials.rheology_B = 1. / ((10**-25)**(1. / 3.)) * np.ones((md.mesh.numberofvertices,)) md.materials.rheology_law = 'None' md.friction.coefficient[:] = np.sqrt(1e7) * np.ones((md.mesh.numberofvertices,)) @@ -49,47 +49,43 @@ md.transient.ismasstransport = 1 md.transient.issmb = 1 -md.transient.requested_outputs = ['default','BasalforcingsFloatingiceMeltingRate'] +md.transient.requested_outputs = ['default', 'BasalforcingsFloatingiceMeltingRate'] md.groundingline.migration = 'SubelementMigration' -md.groundingline.melt_interpolation= 'SubelementMelt2' -md.groundingline.friction_interpolation= 'SubelementFriction2' +md.groundingline.melt_interpolation = 'SubelementMelt2' +md.groundingline.friction_interpolation = 'SubelementFriction2' md.timestepping.final_time = 30. md.timestepping.time_step = 10. -md.cluster = generic('name',gethostname(),'np',3) -md = solve(md,'Transient') +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'Transient') #Fields and tolerances to track changes -field_names = [ - 'Bed1','Surface1','Thickness1','Floatingice1','Vx1','Vy1','Pressure1','FloatingiceMeltingrate1', - 'Bed2','Surface2','Thickness2','Floatingice2','Vx2','Vy2','Pressure2','FloatingiceMeltingrate2', - 'Bed3','Surface3','Thickness3','Floatingice3','Vx3','Vy3','Pressure3','FloatingiceMeltingrate3'] -field_tolerances = [ - 2e-11,5e-12,2e-11,1e-11,5e-10,1e-08,1e-13,1e-13, - 3e-11,3e-11,9e-10,7e-11,1e-09,5e-08,1e-10,1e-13, - 1e-10,3e-11,1e-10,7e-11,1e-09,5e-08,1e-10,1e-13] -field_values = [ - md.results.TransientSolution[0].Base, - md.results.TransientSolution[0].Surface, - md.results.TransientSolution[0].Thickness, - md.results.TransientSolution[0].MaskGroundediceLevelset, - md.results.TransientSolution[0].Vx, - md.results.TransientSolution[0].Vy, - md.results.TransientSolution[0].Pressure, - md.results.TransientSolution[0].BasalforcingsFloatingiceMeltingRate, - md.results.TransientSolution[1].Base, - md.results.TransientSolution[1].Surface, - md.results.TransientSolution[1].Thickness, - md.results.TransientSolution[1].MaskGroundediceLevelset, - md.results.TransientSolution[1].Vx, - md.results.TransientSolution[1].Vy, - md.results.TransientSolution[1].Pressure, - md.results.TransientSolution[1].BasalforcingsFloatingiceMeltingRate, - md.results.TransientSolution[2].Base, - md.results.TransientSolution[2].Surface, - md.results.TransientSolution[2].Thickness, - md.results.TransientSolution[2].MaskGroundediceLevelset, - md.results.TransientSolution[2].Vx, - md.results.TransientSolution[2].Vy, - md.results.TransientSolution[2].Pressure, - md.results.TransientSolution[2].BasalforcingsFloatingiceMeltingRate, - ] +field_names = ['Bed1', 'Surface1', 'Thickness1', 'Floatingice1', 'Vx1', 'Vy1', 'Pressure1', 'FloatingiceMeltingrate1', + 'Bed2', 'Surface2', 'Thickness2', 'Floatingice2', 'Vx2', 'Vy2', 'Pressure2', 'FloatingiceMeltingrate2', + 'Bed3', 'Surface3', 'Thickness3', 'Floatingice3', 'Vx3', 'Vy3', 'Pressure3', 'FloatingiceMeltingrate3'] +field_tolerances = [2e-11, 5e-12, 2e-11, 1e-11, 5e-10, 1e-08, 1e-13, 1e-13, + 3e-11, 3e-11, 9e-10, 7e-11, 1e-09, 5e-08, 1e-10, 1e-13, + 1e-10, 3e-11, 1e-10, 7e-11, 1e-09, 5e-08, 1e-10, 1e-13] +field_values = [md.results.TransientSolution[0].Base, + md.results.TransientSolution[0].Surface, + md.results.TransientSolution[0].Thickness, + md.results.TransientSolution[0].MaskGroundediceLevelset, + md.results.TransientSolution[0].Vx, + md.results.TransientSolution[0].Vy, + md.results.TransientSolution[0].Pressure, + md.results.TransientSolution[0].BasalforcingsFloatingiceMeltingRate, + md.results.TransientSolution[1].Base, + md.results.TransientSolution[1].Surface, + md.results.TransientSolution[1].Thickness, + md.results.TransientSolution[1].MaskGroundediceLevelset, + md.results.TransientSolution[1].Vx, + md.results.TransientSolution[1].Vy, + md.results.TransientSolution[1].Pressure, + md.results.TransientSolution[1].BasalforcingsFloatingiceMeltingRate, + md.results.TransientSolution[2].Base, + md.results.TransientSolution[2].Surface, + md.results.TransientSolution[2].Thickness, + md.results.TransientSolution[2].MaskGroundediceLevelset, + md.results.TransientSolution[2].Vx, + md.results.TransientSolution[2].Vy, + md.results.TransientSolution[2].Pressure, + md.results.TransientSolution[2].BasalforcingsFloatingiceMeltingRate] Index: /issm/trunk-jpl/test/NightlyRun/test442.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test442.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test442.py (revision 23793) @@ -9,7 +9,7 @@ from solve import * -md = triangle(model(),'../Exp/Square.exp',100000.) -md = setmask(md,'../Exp/SquareShelf.exp','') -md = parameterize(md,'../Par/SquareSheetShelf.py') +md = triangle(model(), '../Exp/Square.exp', 100000.) +md = setmask(md, '../Exp/SquareShelf.exp', '') +md = parameterize(md, '../Par/SquareSheetShelf.py') md.initialization.vx[:] = 1. md.initialization.vy[:] = 1. @@ -21,6 +21,6 @@ md.geometry.base[pos] = md.geometry.bed[pos] md.geometry.surface = md.geometry.base + md.geometry.thickness -md = md.extrude(4,1.) -md = setflowequation(md,'HO','all') +md = md.extrude(4, 1.) +md = setflowequation(md, 'HO', 'all') #Boundary conditions: @@ -30,7 +30,7 @@ md.stressbalance.spcvy[:] = float('Nan') 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))) -pos = np.unique(np.concatenate((posA,posB))) +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))) +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))) @@ -38,5 +38,5 @@ md.stressbalance.spcvy[pos2] = 0. -md.materials.rheology_B = 1. / ((10**-25)**(1./3.)) * np.ones((md.mesh.numberofvertices,)) +md.materials.rheology_B = 1. / ((10**-25)**(1. / 3.)) * np.ones((md.mesh.numberofvertices,)) md.materials.rheology_law = 'None' md.friction.coefficient[:] = np.sqrt(1e7) * np.ones((md.mesh.numberofvertices,)) @@ -50,50 +50,46 @@ md.transient.ismasstransport = 1 md.transient.issmb = 1 -md.transient.requested_outputs = ['default','BasalforcingsFloatingiceMeltingRate'] +md.transient.requested_outputs = ['default', 'BasalforcingsFloatingiceMeltingRate'] md.groundingline.migration = 'SubelementMigration' -md.groundingline.friction_interpolation= 'SubelementFriction2' -md.groundingline.melt_interpolation= 'SubelementMelt2' +md.groundingline.friction_interpolation = 'SubelementFriction2' +md.groundingline.melt_interpolation = 'SubelementMelt2' md.timestepping.final_time = 30 md.timestepping.time_step = 10 -md.cluster = generic('name',gethostname(),'np',3) -md = solve(md,'Transient') +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'Transient') #Fields and tolerances to track changes -field_names = [ - 'Bed1','Surface1','Thickness1','Floatingice1','Vx1','Vy1','Vz1','Pressure1','FloatingiceMeltingrate1', - 'Bed2','Surface2','Thickness2','Floatingice2','Vx2','Vy2','Vz2','Pressure2','FloatingiceMeltingrate2', - 'Bed3','Surface3','Thickness3','Floatingice3','Vx3','Vy3','Vz3','Pressure3','FloatingiceMeltingrate3'] -field_tolerances = [ - 2e-11,5e-12,2e-11,1e-11,5e-10,3e-08,6e-10,1e-13,1e-13, - 3e-11,3e-11,9e-10,7e-11,7e-09,1e-07,1e-09,1e-10,1e-13, - 1e-8,2e-08,7e-09,2e-7 ,1e-03,8e-04,2e-09,1e-10,1e-13] -field_values = [ - md.results.TransientSolution[0].Base, - md.results.TransientSolution[0].Surface, - md.results.TransientSolution[0].Thickness, - md.results.TransientSolution[0].MaskGroundediceLevelset, - md.results.TransientSolution[0].Vx, - md.results.TransientSolution[0].Vy, - md.results.TransientSolution[0].Vz, - md.results.TransientSolution[0].Pressure, - md.results.TransientSolution[0].BasalforcingsFloatingiceMeltingRate, - md.results.TransientSolution[1].Base, - md.results.TransientSolution[1].Surface, - md.results.TransientSolution[1].Thickness, - md.results.TransientSolution[1].MaskGroundediceLevelset, - md.results.TransientSolution[1].Vx, - md.results.TransientSolution[1].Vy, - md.results.TransientSolution[1].Vz, - md.results.TransientSolution[1].Pressure, - md.results.TransientSolution[1].BasalforcingsFloatingiceMeltingRate, - md.results.TransientSolution[2].Base, - md.results.TransientSolution[2].Surface, - md.results.TransientSolution[2].Thickness, - md.results.TransientSolution[2].MaskGroundediceLevelset, - md.results.TransientSolution[2].Vx, - md.results.TransientSolution[2].Vy, - md.results.TransientSolution[2].Vz, - md.results.TransientSolution[2].Pressure, - md.results.TransientSolution[2].BasalforcingsFloatingiceMeltingRate, - ] +field_names = ['Bed1', 'Surface1', 'Thickness1', 'Floatingice1', 'Vx1', 'Vy1', 'Vz1', 'Pressure1', 'FloatingiceMeltingrate1', + 'Bed2', 'Surface2', 'Thickness2', 'Floatingice2', 'Vx2', 'Vy2', 'Vz2', 'Pressure2', 'FloatingiceMeltingrate2', + 'Bed3', 'Surface3', 'Thickness3', 'Floatingice3', 'Vx3', 'Vy3', 'Vz3', 'Pressure3', 'FloatingiceMeltingrate3'] +field_tolerances = [2e-11, 5e-12, 2e-11, 1e-11, 5e-10, 3e-08, 6e-10, 1e-13, 1e-13, + 3e-11, 3e-11, 9e-10, 7e-11, 7e-09, 1e-07, 1e-09, 1e-10, 1e-13, + 1e-8, 2e-08, 7e-09, 2e-7, 1e-03, 8e-04, 2e-09, 1e-10, 1e-13] +field_values = [md.results.TransientSolution[0].Base, + md.results.TransientSolution[0].Surface, + md.results.TransientSolution[0].Thickness, + md.results.TransientSolution[0].MaskGroundediceLevelset, + md.results.TransientSolution[0].Vx, + md.results.TransientSolution[0].Vy, + md.results.TransientSolution[0].Vz, + md.results.TransientSolution[0].Pressure, + md.results.TransientSolution[0].BasalforcingsFloatingiceMeltingRate, + md.results.TransientSolution[1].Base, + md.results.TransientSolution[1].Surface, + md.results.TransientSolution[1].Thickness, + md.results.TransientSolution[1].MaskGroundediceLevelset, + md.results.TransientSolution[1].Vx, + md.results.TransientSolution[1].Vy, + md.results.TransientSolution[1].Vz, + md.results.TransientSolution[1].Pressure, + md.results.TransientSolution[1].BasalforcingsFloatingiceMeltingRate, + md.results.TransientSolution[2].Base, + md.results.TransientSolution[2].Surface, + md.results.TransientSolution[2].Thickness, + md.results.TransientSolution[2].MaskGroundediceLevelset, + md.results.TransientSolution[2].Vx, + md.results.TransientSolution[2].Vy, + md.results.TransientSolution[2].Vz, + md.results.TransientSolution[2].Pressure, + md.results.TransientSolution[2].BasalforcingsFloatingiceMeltingRate] Index: /issm/trunk-jpl/test/NightlyRun/test443.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test443.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test443.py (revision 23793) @@ -13,81 +13,79 @@ from regionaloutput import regionaloutput -md=triangle(model(),'../Exp/Square.exp',150000.) -md=setmask(md,'../Exp/SquareShelf.exp','') -md=parameterize(md,'../Par/SquareSheetShelf.py') -md.geometry.bed=copy.deepcopy(md.geometry.base) -pos=np.nonzero(md.mask.groundedice_levelset<0.) -md.geometry.bed[pos]=md.geometry.bed[pos]-10 -md.friction=frictioncoulomb() -md.friction.coefficient=20*np.ones(md.mesh.numberofvertices) -md.friction.p=1*np.ones(md.mesh.numberofelements) -md.friction.q=1*np.ones(md.mesh.numberofelements) -md.friction.coefficientcoulomb=0.02*np.ones(md.mesh.numberofvertices) -md.transient.isthermal=False -md.transient.isgroundingline=True -md.groundingline.migration='AggressiveMigration'; -md.mesh.scale_factor=1.1*np.ones((md.mesh.numberofvertices)) +md = triangle(model(), '../Exp/Square.exp', 150000.) +md = setmask(md, '../Exp/SquareShelf.exp', '') +md = parameterize(md, '../Par/SquareSheetShelf.py') +md.geometry.bed = copy.deepcopy(md.geometry.base) +pos = np.nonzero(md.mask.groundedice_levelset < 0.) +md.geometry.bed[pos] = md.geometry.bed[pos] - 10 +md.friction = frictioncoulomb() +md.friction.coefficient = 20 * np.ones(md.mesh.numberofvertices) +md.friction.p = 1 * np.ones(md.mesh.numberofelements) +md.friction.q = 1 * np.ones(md.mesh.numberofelements) +md.friction.coefficientcoulomb = 0.02 * np.ones(md.mesh.numberofvertices) +md.transient.isthermal = False +md.transient.isgroundingline = True +md.groundingline.migration = 'AggressiveMigration' +md.mesh.scale_factor = 1.1 * np.ones((md.mesh.numberofvertices)) -md.settings.output_frequency=2 -md=setflowequation(md,'SSA','all') -md.cluster=generic('name',gethostname(),'np',3) +md.settings.output_frequency = 2 +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) -regionalmask=np.zeros((md.mesh.numberofvertices)) -inflag=ContourToMesh(md.mesh.elements,md.mesh.x,md.mesh.y,'../Exp/SquareHalfRight.exp','node',1) +regionalmask = np.zeros((md.mesh.numberofvertices)) +inflag = ContourToMesh(md.mesh.elements, md.mesh.x, md.mesh.y, '../Exp/SquareHalfRight.exp', 'node', 1) regionalmask[np.nonzero(inflag)[0]] = 1. -md.transient.requested_outputs=['default','GroundedArea1','FloatingArea1','TotalFloatingBmb1','TotalGroundedBmb1','TotalSmb1','IceMass1','IceVolume1','IceVolumeAboveFloatation1','IceVolumeAboveFloatation2','IceVolumeAboveFloatation','IceMassScaled1','IceVolumeScaled1','IceVolumeAboveFloatationScaled1','IceVolumeAboveFloatationScaled2'] +md.transient.requested_outputs = ['default', 'GroundedArea1', 'FloatingArea1', 'TotalFloatingBmb1', 'TotalGroundedBmb1', 'TotalSmb1', 'IceMass1', 'IceVolume1', 'IceVolumeAboveFloatation1', 'IceVolumeAboveFloatation2', 'IceVolumeAboveFloatation', 'IceMassScaled1', 'IceVolumeScaled1', 'IceVolumeAboveFloatationScaled1', 'IceVolumeAboveFloatationScaled2'] -md.outputdefinition.definitions=[regionaloutput('name','GroundedArea1','outputnamestring','GroundedArea','mask',regionalmask,'definitionstring','Outputdefinition1'), - regionaloutput('name','FloatingArea1','outputnamestring','FloatingArea','mask',regionalmask,'definitionstring','Outputdefinition2'), - regionaloutput('name','TotalFloatingBmb1','outputnamestring','TotalFloatingBmb','mask',regionalmask,'definitionstring','Outputdefinition3'), - regionaloutput('name','TotalGroundedBmb1','outputnamestring','TotalGroundedBmb','mask',regionalmask,'definitionstring','Outputdefinition4'), - regionaloutput('name','IceMass1','outputnamestring','IceMass','mask',regionalmask,'definitionstring','Outputdefinition5'), - regionaloutput('name','IceVolume1','outputnamestring','IceVolume','mask',regionalmask,'definitionstring','Outputdefinition6'), - regionaloutput('name','IceVolumeAboveFloatation1','outputnamestring','IceVolumeAboveFloatation','mask',regionalmask,'definitionstring','Outputdefinition7'), - regionaloutput('name','TotalSmb1','outputnamestring','TotalSmb','mask',regionalmask,'definitionstring','Outputdefinition8'), - regionaloutput('name','IceVolumeAboveFloatation2','outputnamestring','IceVolumeAboveFloatation','maskexpstring','../Exp/SquareHalfRight.exp','definitionstring','Outputdefinition9','model',md), - regionaloutput('name','IceMassScaled1','outputnamestring','IceMassScaled','mask',regionalmask,'definitionstring','Outputdefinition10'), - regionaloutput('name','IceVolumeScaled1','outputnamestring','IceVolumeScaled','mask',regionalmask,'definitionstring','Outputdefinition11'), - regionaloutput('name','IceVolumeAboveFloatationScaled1','outputnamestring','IceVolumeAboveFloatationScaled','mask',regionalmask,'definitionstring','Outputdefinition12'), - regionaloutput('name','IceVolumeAboveFloatationScaled2','outputnamestring','IceVolumeAboveFloatationScaled','maskexpstring','../Exp/SquareHalfRight.exp','definitionstring','Outputdefinition13','model',md)] +md.outputdefinition.definitions = [regionaloutput('name', 'GroundedArea1', 'outputnamestring', 'GroundedArea', 'mask', regionalmask, 'definitionstring', 'Outputdefinition1'), + regionaloutput('name', 'FloatingArea1', 'outputnamestring', 'FloatingArea', 'mask', regionalmask, 'definitionstring', 'Outputdefinition2'), + regionaloutput('name', 'TotalFloatingBmb1', 'outputnamestring', 'TotalFloatingBmb', 'mask', regionalmask, 'definitionstring', 'Outputdefinition3'), + regionaloutput('name', 'TotalGroundedBmb1', 'outputnamestring', 'TotalGroundedBmb', 'mask', regionalmask, 'definitionstring', 'Outputdefinition4'), + regionaloutput('name', 'IceMass1', 'outputnamestring', 'IceMass', 'mask', regionalmask, 'definitionstring', 'Outputdefinition5'), + regionaloutput('name', 'IceVolume1', 'outputnamestring', 'IceVolume', 'mask', regionalmask, 'definitionstring', 'Outputdefinition6'), + regionaloutput('name', 'IceVolumeAboveFloatation1', 'outputnamestring', 'IceVolumeAboveFloatation', 'mask', regionalmask, 'definitionstring', 'Outputdefinition7'), + regionaloutput('name', 'TotalSmb1', 'outputnamestring', 'TotalSmb', 'mask', regionalmask, 'definitionstring', 'Outputdefinition8'), + regionaloutput('name', 'IceVolumeAboveFloatation2', 'outputnamestring', 'IceVolumeAboveFloatation', 'maskexpstring', '../Exp/SquareHalfRight.exp', 'definitionstring', 'Outputdefinition9', 'model', md), + regionaloutput('name', 'IceMassScaled1', 'outputnamestring', 'IceMassScaled', 'mask', regionalmask, 'definitionstring', 'Outputdefinition10'), + regionaloutput('name', 'IceVolumeScaled1', 'outputnamestring', 'IceVolumeScaled', 'mask', regionalmask, 'definitionstring', 'Outputdefinition11'), + regionaloutput('name', 'IceVolumeAboveFloatationScaled1', 'outputnamestring', 'IceVolumeAboveFloatationScaled', 'mask', regionalmask, 'definitionstring', 'Outputdefinition12'), + regionaloutput('name', 'IceVolumeAboveFloatationScaled2', 'outputnamestring', 'IceVolumeAboveFloatationScaled', 'maskexpstring', '../Exp/SquareHalfRight.exp', 'definitionstring', 'Outputdefinition13', 'model', md)] -md.extrude(3,1.) -md2=copy.deepcopy(md) +md.extrude(3, 1.) +md2 = copy.deepcopy(md) md2.collapse() -md=solve(md,'Transient') +md = solve(md, 'Transient') #Fields and tolerances to track changes -field_names =['IceMass1','IceVolume1','IceVolumeAboveFloatation1','IceVolumeAboveFloatation21','Thickness1','GroundedArea1','FloatingArea1','TotalFloatingBmb1','TotalGroundedBmb1','TotalSmb1','IceMassScaled1','IceVolumeScaled1','IceVolumeAboveFloatationScaled1','IceVolumeAboveFloatationScaled21','IceMass3','IceVolume3','IceVolumeAboveFloatation3','IceVolumeAboveFloatation23','Thickness3','GroundedArea3','FloatingArea3','TotalFloatingBmb3','TotalGroundedBmb3','TotalSmb3','IceMassScaled3','IceVolumeScaled3','IceVolumeAboveFloatationScaled3','IceVolumeAboveFloatationScaled23','ExtrudedMask','CollapsedMask'] -field_tolerances=[1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13] -field_values=[\ - md.results.TransientSolution[0].IceMass1,\ - md.results.TransientSolution[0].IceVolume1,\ - md.results.TransientSolution[0].IceVolumeAboveFloatation1,\ - md.results.TransientSolution[0].IceVolumeAboveFloatation2,\ - md.results.TransientSolution[0].Thickness,\ - md.results.TransientSolution[0].GroundedArea1,\ - md.results.TransientSolution[0].FloatingArea1,\ - md.results.TransientSolution[0].TotalFloatingBmb1,\ - md.results.TransientSolution[0].TotalGroundedBmb1,\ - md.results.TransientSolution[0].TotalSmb1,\ - md.results.TransientSolution[0].IceMassScaled1,\ - md.results.TransientSolution[0].IceVolumeScaled1,\ - md.results.TransientSolution[0].IceVolumeAboveFloatationScaled1,\ - md.results.TransientSolution[0].IceVolumeAboveFloatationScaled2,\ - md.results.TransientSolution[2].IceMass1,\ - md.results.TransientSolution[2].IceVolume1,\ - md.results.TransientSolution[2].IceVolumeAboveFloatation1,\ - md.results.TransientSolution[2].IceVolumeAboveFloatation2,\ - md.results.TransientSolution[2].Thickness,\ - md.results.TransientSolution[2].GroundedArea1,\ - md.results.TransientSolution[2].FloatingArea1,\ - md.results.TransientSolution[2].TotalFloatingBmb1,\ - md.results.TransientSolution[2].TotalGroundedBmb1,\ - md.results.TransientSolution[2].TotalSmb1,\ - md.results.TransientSolution[2].IceMassScaled1,\ - md.results.TransientSolution[2].IceVolumeScaled1,\ - md.results.TransientSolution[2].IceVolumeAboveFloatationScaled1,\ - md.results.TransientSolution[2].IceVolumeAboveFloatationScaled2,\ - len(md.outputdefinition.definitions[0].mask),\ - len(md2.outputdefinition.definitions[0].mask),\ - ] +field_names = ['IceMass1', 'IceVolume1', 'IceVolumeAboveFloatation1', 'IceVolumeAboveFloatation21', 'Thickness1', 'GroundedArea1', 'FloatingArea1', 'TotalFloatingBmb1', 'TotalGroundedBmb1', 'TotalSmb1', 'IceMassScaled1', 'IceVolumeScaled1', 'IceVolumeAboveFloatationScaled1', 'IceVolumeAboveFloatationScaled21', 'IceMass3', 'IceVolume3', 'IceVolumeAboveFloatation3', 'IceVolumeAboveFloatation23', 'Thickness3', 'GroundedArea3', 'FloatingArea3', 'TotalFloatingBmb3', 'TotalGroundedBmb3', 'TotalSmb3', 'IceMassScaled3', 'IceVolumeScaled3', 'IceVolumeAboveFloatationScaled3', 'IceVolumeAboveFloatationScaled23', 'ExtrudedMask', 'CollapsedMask'] +field_tolerances = [1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13] +field_values = [md.results.TransientSolution[0].IceMass1, + md.results.TransientSolution[0].IceVolume1, + md.results.TransientSolution[0].IceVolumeAboveFloatation1, + md.results.TransientSolution[0].IceVolumeAboveFloatation2, + md.results.TransientSolution[0].Thickness, + md.results.TransientSolution[0].GroundedArea1, + md.results.TransientSolution[0].FloatingArea1, + md.results.TransientSolution[0].TotalFloatingBmb1, + md.results.TransientSolution[0].TotalGroundedBmb1, + md.results.TransientSolution[0].TotalSmb1, + md.results.TransientSolution[0].IceMassScaled1, + md.results.TransientSolution[0].IceVolumeScaled1, + md.results.TransientSolution[0].IceVolumeAboveFloatationScaled1, + md.results.TransientSolution[0].IceVolumeAboveFloatationScaled2, + md.results.TransientSolution[2].IceMass1, + md.results.TransientSolution[2].IceVolume1, + md.results.TransientSolution[2].IceVolumeAboveFloatation1, + md.results.TransientSolution[2].IceVolumeAboveFloatation2, + md.results.TransientSolution[2].Thickness, + md.results.TransientSolution[2].GroundedArea1, + md.results.TransientSolution[2].FloatingArea1, + md.results.TransientSolution[2].TotalFloatingBmb1, + md.results.TransientSolution[2].TotalGroundedBmb1, + md.results.TransientSolution[2].TotalSmb1, + md.results.TransientSolution[2].IceMassScaled1, + md.results.TransientSolution[2].IceVolumeScaled1, + md.results.TransientSolution[2].IceVolumeAboveFloatationScaled1, + md.results.TransientSolution[2].IceVolumeAboveFloatationScaled2, + len(md.outputdefinition.definitions[0].mask), + len(md2.outputdefinition.definitions[0].mask)] Index: /issm/trunk-jpl/test/NightlyRun/test444.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test444.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test444.py (revision 23793) @@ -1,7 +1,5 @@ #Test Name: SquareShelfTranForceNeg2dDakotaLocal import numpy as np -from os import getcwd from model import * -from socket import gethostname from triangle import * from setmask import * @@ -15,12 +13,12 @@ from regionaloutput import * -#model not consistent: equality thickness=surface-base violated +#model not consistent: equality thickness = surface-base violated -md = triangle(model(),'../Exp/Square.exp',150000.) -md = setmask(md,'../Exp/SquareShelf.exp','') -md = parameterize(md,'../Par/SquareSheetShelf.py') +md = triangle(model(), '../Exp/Square.exp', 150000.) +md = setmask(md, '../Exp/SquareShelf.exp', '') +md = parameterize(md, '../Par/SquareSheetShelf.py') md.geometry.bed = md.geometry.base.copy() pos = np.where(md.mask.groundedice_levelset < 0) -md.geometry.bed[pos] = md.geometry.base[pos]-10 +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,)) @@ -31,32 +29,32 @@ md.settings.output_frequency = 3 -md = setflowequation(md,'SSA','all') -md.cluster = generic('name',oshostname(),'np',3) +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', oshostname(), 'np', 3) regionalmask = np.zeros((md.mesh.numberofvertices,)) -c_in = ContourToMesh(md.mesh.elements,md.mesh.x,md.mesh.y,'../Exp/SquareHalfRight.exp','node',1) +c_in = ContourToMesh(md.mesh.elements, md.mesh.x, md.mesh.y, '../Exp/SquareHalfRight.exp', 'node', 1) regionalmask[np.where(c_in)] = 1 -md.transient.requested_outputs = ['default','GroundedArea','FloatingArea','IceVolumeAboveFloatation','GroundedArea1','FloatingArea1','TotalFloatingBmb1','TotalGroundedBmb1','TotalSmb1', - 'IceMass1','IceVolume1','IceVolumeAboveFloatation1','IceVolumeAboveFloatation'] -md.outputdefinition.definitions.append(regionaloutput('name','GroundedArea1','outputnamestring','GroundedArea','mask',regionalmask, - 'definitionstring','Outputdefinition1')) -md.outputdefinition.definitions.append(regionaloutput('name','FloatingArea1','outputnamestring','FloatingArea','mask',regionalmask, - 'definitionstring','Outputdefinition2')) -md.outputdefinition.definitions.append(regionaloutput('name','TotalFloatingBmb1','outputnamestring','TotalFloatingBmb','mask',regionalmask, - 'definitionstring','Outputdefinition3')) -md.outputdefinition.definitions.append(regionaloutput('name','TotalGroundedBmb1','outputnamestring','TotalGroundedBmb','mask',regionalmask, - 'definitionstring','Outputdefinition4')) -md.outputdefinition.definitions.append(regionaloutput('name','IceMass1','outputnamestring','IceMass','mask',regionalmask, - 'definitionstring','Outputdefinition5')) -md.outputdefinition.definitions.append(regionaloutput('name','IceVolume1','outputnamestring','IceVolume','mask',regionalmask, - 'definitionstring','Outputdefinition6')) -md.outputdefinition.definitions.append(regionaloutput('name','IceVolumeAboveFloatation1','outputnamestring','IceVolumeAboveFloatation','mask',regionalmask, - 'definitionstring','Outputdefinition7')) -md.outputdefinition.definitions.append(regionaloutput('name','TotalSmb1','outputnamestring','TotalSmb','mask',regionalmask, - 'definitionstring','Outputdefinition8')) -md.outputdefinition.definitions.append(regionaloutput('name','TotalSmb2','outputnamestring','TotalSmb','mask',regionalmask, - 'definitionstring','Outputdefinition9')) +md.transient.requested_outputs = ['default', 'GroundedArea', 'FloatingArea', 'IceVolumeAboveFloatation', 'GroundedArea1', 'FloatingArea1', 'TotalFloatingBmb1', 'TotalGroundedBmb1', 'TotalSmb1', + 'IceMass1', 'IceVolume1', 'IceVolumeAboveFloatation1', 'IceVolumeAboveFloatation'] +md.outputdefinition.definitions.append(regionaloutput('name', 'GroundedArea1', 'outputnamestring', 'GroundedArea', 'mask', regionalmask, + 'definitionstring', 'Outputdefinition1')) +md.outputdefinition.definitions.append(regionaloutput('name', 'FloatingArea1', 'outputnamestring', 'FloatingArea', 'mask', regionalmask, + 'definitionstring', 'Outputdefinition2')) +md.outputdefinition.definitions.append(regionaloutput('name', 'TotalFloatingBmb1', 'outputnamestring', 'TotalFloatingBmb', 'mask', regionalmask, + 'definitionstring', 'Outputdefinition3')) +md.outputdefinition.definitions.append(regionaloutput('name', 'TotalGroundedBmb1', 'outputnamestring', 'TotalGroundedBmb', 'mask', regionalmask, + 'definitionstring', 'Outputdefinition4')) +md.outputdefinition.definitions.append(regionaloutput('name', 'IceMass1', 'outputnamestring', 'IceMass', 'mask', regionalmask, + 'definitionstring', 'Outputdefinition5')) +md.outputdefinition.definitions.append(regionaloutput('name', 'IceVolume1', 'outputnamestring', 'IceVolume', 'mask', regionalmask, + 'definitionstring', 'Outputdefinition6')) +md.outputdefinition.definitions.append(regionaloutput('name', 'IceVolumeAboveFloatation1', 'outputnamestring', 'IceVolumeAboveFloatation', 'mask', regionalmask, + 'definitionstring', 'Outputdefinition7')) +md.outputdefinition.definitions.append(regionaloutput('name', 'TotalSmb1', 'outputnamestring', 'TotalSmb', 'mask', regionalmask, + 'definitionstring', 'Outputdefinition8')) +md.outputdefinition.definitions.append(regionaloutput('name', 'TotalSmb2', 'outputnamestring', 'TotalSmb', 'mask', regionalmask, + 'definitionstring', 'Outputdefinition9')) -md.extrude(3,1.) +md.extrude(3, 1.) md.collapse() @@ -68,22 +66,22 @@ #variables -md.qmu.variables.drag_coefficient = normal_uncertain.normal_uncertain('scaled_BasalforcingsFloatingiceMeltingRate',1,0.1) +md.qmu.variables.drag_coefficient = normal_uncertain.normal_uncertain('scaled_BasalforcingsFloatingiceMeltingRate', 1, 0.1) #responses -md.qmu.responses.IceMass1 = response_function.response_function('Outputdefinition5',[],[0.0001,0.001,0.01,0.25,0.5,0.75,0.99,0.999,0.9999]) -md.qmu.responses.IceVolume1 = response_function.response_function('Outputdefinition6',[],[0.0001,0.001,0.01,0.25,0.5,0.75,0.99,0.999,0.9999]) -md.qmu.responses.IceVolumeAboveFloatation1 = response_function.response_function('Outputdefinition7',[],[0.0001,0.001,0.01,0.25,0.5,0.75,0.99,0.999,0.9999]) -md.qmu.responses.IceVolumeAboveFloatation = response_function.response_function('IceVolumeAboveFloatation',[],[0.0001,0.001,0.01,0.25,0.5,0.75,0.99,0.999,0.9999]) -md.qmu.responses.GroundedArea1 = response_function.response_function('Outputdefinition1',[],[0.0001,0.001,0.01,0.25,0.5,0.75,0.99,0.999,0.9999]) -md.qmu.responses.FloatingArea1 = response_function.response_function('Outputdefinition2',[],[0.0001,0.001,0.01,0.25,0.5,0.75,0.99,0.999,0.9999]) -md.qmu.responses.TotalFloatingBmb1 = response_function.response_function('Outputdefinition3',[],[0.0001,0.001,0.01,0.25,0.5,0.75,0.99,0.999,0.9999]) -md.qmu.responses.TotalGroundedBmb1 = response_function.response_function('Outputdefinition4',[],[0.0001,0.001,0.01,0.25,0.5,0.75,0.99,0.999,0.9999]) -md.qmu.responses.TotalSmb1 = response_function.response_function('Outputdefinition8',[],[0.0001,0.001,0.01,0.25,0.5,0.75,0.99,0.999,0.9999]) -md.qmu.responses.TotalSmb2 = response_function.response_function('Outputdefinition9',[],[0.0001,0.001,0.01,0.25,0.5,0.75,0.99,0.999,0.9999]) -md.qmu.responses.FloatingArea = response_function.response_function('FloatingArea',[],[0.0001,0.001,0.01,0.25,0.5,0.75,0.99,0.999,0.9999]) +md.qmu.responses.IceMass1 = response_function.response_function('Outputdefinition5', [], [0.0001, 0.001, 0.01, 0.25, 0.5, 0.75, 0.99, 0.999, 0.9999]) +md.qmu.responses.IceVolume1 = response_function.response_function('Outputdefinition6', [], [0.0001, 0.001, 0.01, 0.25, 0.5, 0.75, 0.99, 0.999, 0.9999]) +md.qmu.responses.IceVolumeAboveFloatation1 = response_function.response_function('Outputdefinition7', [], [0.0001, 0.001, 0.01, 0.25, 0.5, 0.75, 0.99, 0.999, 0.9999]) +md.qmu.responses.IceVolumeAboveFloatation = response_function.response_function('IceVolumeAboveFloatation', [], [0.0001, 0.001, 0.01, 0.25, 0.5, 0.75, 0.99, 0.999, 0.9999]) +md.qmu.responses.GroundedArea1 = response_function.response_function('Outputdefinition1', [], [0.0001, 0.001, 0.01, 0.25, 0.5, 0.75, 0.99, 0.999, 0.9999]) +md.qmu.responses.FloatingArea1 = response_function.response_function('Outputdefinition2', [], [0.0001, 0.001, 0.01, 0.25, 0.5, 0.75, 0.99, 0.999, 0.9999]) +md.qmu.responses.TotalFloatingBmb1 = response_function.response_function('Outputdefinition3', [], [0.0001, 0.001, 0.01, 0.25, 0.5, 0.75, 0.99, 0.999, 0.9999]) +md.qmu.responses.TotalGroundedBmb1 = response_function.response_function('Outputdefinition4', [], [0.0001, 0.001, 0.01, 0.25, 0.5, 0.75, 0.99, 0.999, 0.9999]) +md.qmu.responses.TotalSmb1 = response_function.response_function('Outputdefinition8', [], [0.0001, 0.001, 0.01, 0.25, 0.5, 0.75, 0.99, 0.999, 0.9999]) +md.qmu.responses.TotalSmb2 = response_function.response_function('Outputdefinition9', [], [0.0001, 0.001, 0.01, 0.25, 0.5, 0.75, 0.99, 0.999, 0.9999]) +md.qmu.responses.FloatingArea = response_function.response_function('FloatingArea', [], [0.0001, 0.001, 0.01, 0.25, 0.5, 0.75, 0.99, 0.999, 0.9999]) #method md.qmu.method = dakota_method.dakota_method('nond_samp') -md.qmu.method = dmeth_params_set(md.qmu.method,'seed',1234,'samples',20,'sample_type','random') +md.qmu.method = dmeth_params_set(md.qmu.method, 'seed', 1234, 'samples', 20, 'sample_type', 'random') #parameters @@ -93,22 +91,22 @@ if version >= 6: - md.qmu.params.analysis_driver = 'matlab' - md.qmu.params.evaluation_scheduling = 'master' - md.qmu.params.processors_per_evaluation = 2 + md.qmu.params.analysis_driver = 'matlab' + md.qmu.params.evaluation_scheduling = 'master' + md.qmu.params.processors_per_evaluation = 2 else: - md.qmu.params.analysis_driver = 'stressbalance' - md.qmu.params.evaluation_concurrency = 1 + md.qmu.params.analysis_driver = 'stressbalance' + md.qmu.params.evaluation_concurrency = 1 #partitioning md.qmu.numberofpartitions = 10 -md = partitioner(md,'package','chaco','npart',md.qmu.numberofpartitions,'weighting','on') -md.qmu.partition = md.qmu.partition-1 +md = partitioner(md, 'package', 'chaco', 'npart', md.qmu.numberofpartitions, 'weighting', 'on') +md.qmu.partition = md.qmu.partition - 1 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 = solve(md,'Transient','overwrite','y') +md.verbose = verbose('000000000') # this line is recommended +md = solve(md, 'Transient', 'overwrite', 'y') #Fields and tolerances to track changes @@ -118,10 +116,10 @@ md.results.dakota.montecarlo = [] for i in range(11): - md.results.dakota.montecarlo.append(md.results.dakota.dresp_out[i].mean) + md.results.dakota.montecarlo.append(md.results.dakota.dresp_out[i].mean) for i in range(11): - md.results.dakota.montecarlo.append(md.results.dakota.dresp_out[i].stddev) + md.results.dakota.montecarlo.append(md.results.dakota.dresp_out[i].stddev) -field_names = ['montecarlo'] +field_names = ['montecarlo'] field_tolerances = [1e-11] field_values = [md.results.dakota.montecarlo] Index: /issm/trunk-jpl/test/NightlyRun/test445.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test445.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test445.py (revision 23793) @@ -13,20 +13,20 @@ from ContourToMesh import * -#model not consistent: equality thickness=surface-base violated +#model not consistent: equality thickness = surface-base violated -md=triangle(model(),'../Exp/Square.exp',150000.) -md=setmask(md,'../Exp/SquareShelf.exp','') -md=parameterize(md,'../Par/SquareSheetShelf.py') -md.extrude(3,2.) -md=setflowequation(md,'HO','all') -md.cluster=generic('name',gethostname(),'np',3) -md.timestepping.time_step=0. -md.thermal.isenthalpy=1 -md.thermal.isdynamicbasalspc=1 -md.initialization.waterfraction=np.zeros((md.mesh.numberofvertices)) -md.initialization.watercolumn=np.zeros((md.mesh.numberofvertices)) +md = triangle(model(), '../Exp/Square.exp', 150000.) +md = setmask(md, '../Exp/SquareShelf.exp', '') +md = parameterize(md, '../Par/SquareSheetShelf.py') +md.extrude(3, 2.) +md = setflowequation(md, 'HO', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) +md.timestepping.time_step = 0. +md.thermal.isenthalpy = 1 +md.thermal.isdynamicbasalspc = 1 +md.initialization.waterfraction = np.zeros((md.mesh.numberofvertices)) +md.initialization.watercolumn = np.zeros((md.mesh.numberofvertices)) -md.friction.coupling=3 -md.friction.effective_pressure=md.materials.rho_ice*md.constants.g*md.geometry.thickness+md.materials.rho_water*md.constants.g*md.geometry.base +md.friction.coupling = 3 +md.friction.effective_pressure = md.materials.rho_ice * md.constants.g * md.geometry.thickness + md.materials.rho_water * md.constants.g * md.geometry.base #dakota version @@ -35,50 +35,50 @@ #variables -md.qmu.variables.neff=normal_uncertain.normal_uncertain('scaled_FrictionEffectivePressure',1,.05) -md.qmu.variables.geoflux=normal_uncertain.normal_uncertain('scaled_BasalforcingsGeothermalflux',1,.05) +md.qmu.variables.neff = normal_uncertain.normal_uncertain('scaled_FrictionEffectivePressure', 1, .05) +md.qmu.variables.geoflux = normal_uncertain.normal_uncertain('scaled_BasalforcingsGeothermalflux', 1, .05) #responses -md.qmu.responses.MaxVel = response_function.response_function('MaxVel',[],[0.0001,0.001,0.01,0.25,0.5,0.75,0.99,0.999,0.9999]) -md.qmu.responses.MassFlux1 = response_function.response_function('indexed_MassFlux_1',[],[0.0001,0.001,0.01,0.25,0.5,0.75,0.99,0.999,0.9999]) -md.qmu.responses.MassFlux2 = response_function.response_function('indexed_MassFlux_2',[],[0.0001,0.001,0.01,0.25,0.5,0.75,0.99,0.999,0.9999]) -md.qmu.responses.MassFlux3 = response_function.response_function('indexed_MassFlux_3',[],[0.0001,0.001,0.01,0.25,0.5,0.75,0.99,0.999,0.9999]) -md.qmu.responses.MassFlux4 = response_function.response_function('indexed_MassFlux_4',[],[0.0001,0.001,0.01,0.25,0.5,0.75,0.99,0.999,0.9999]) -md.qmu.responses.MassFlux5 = response_function.response_function('indexed_MassFlux_5',[],[0.0001,0.001,0.01,0.25,0.5,0.75,0.99,0.999,0.9999]) -md.qmu.responses.MassFlux6 = response_function.response_function('indexed_MassFlux_6',[],[0.0001,0.001,0.01,0.25,0.5,0.75,0.99,0.999,0.9999]) -md.qmu.responses.MassFlux7 = response_function.response_function('indexed_MassFlux_7',[],[0.0001,0.001,0.01,0.25,0.5,0.75,0.99,0.999,0.9999]) +md.qmu.responses.MaxVel = response_function.response_function('MaxVel', [], [0.0001, 0.001, 0.01, 0.25, 0.5, 0.75, 0.99, 0.999, 0.9999]) +md.qmu.responses.MassFlux1 = response_function.response_function('indexed_MassFlux_1', [], [0.0001, 0.001, 0.01, 0.25, 0.5, 0.75, 0.99, 0.999, 0.9999]) +md.qmu.responses.MassFlux2 = response_function.response_function('indexed_MassFlux_2', [], [0.0001, 0.001, 0.01, 0.25, 0.5, 0.75, 0.99, 0.999, 0.9999]) +md.qmu.responses.MassFlux3 = response_function.response_function('indexed_MassFlux_3', [], [0.0001, 0.001, 0.01, 0.25, 0.5, 0.75, 0.99, 0.999, 0.9999]) +md.qmu.responses.MassFlux4 = response_function.response_function('indexed_MassFlux_4', [], [0.0001, 0.001, 0.01, 0.25, 0.5, 0.75, 0.99, 0.999, 0.9999]) +md.qmu.responses.MassFlux5 = response_function.response_function('indexed_MassFlux_5', [], [0.0001, 0.001, 0.01, 0.25, 0.5, 0.75, 0.99, 0.999, 0.9999]) +md.qmu.responses.MassFlux6 = response_function.response_function('indexed_MassFlux_6', [], [0.0001, 0.001, 0.01, 0.25, 0.5, 0.75, 0.99, 0.999, 0.9999]) +md.qmu.responses.MassFlux7 = response_function.response_function('indexed_MassFlux_7', [], [0.0001, 0.001, 0.01, 0.25, 0.5, 0.75, 0.99, 0.999, 0.9999]) #mass flux profiles -md.qmu.mass_flux_profiles = ['../Exp/MassFlux1.exp','../Exp/MassFlux2.exp','../Exp/MassFlux3.exp','../Exp/MassFlux4.exp','../Exp/MassFlux5.exp','../Exp/MassFlux6.exp','../Exp/Square.exp'] +md.qmu.mass_flux_profiles = ['../Exp/MassFlux1.exp', '../Exp/MassFlux2.exp', '../Exp/MassFlux3.exp', '../Exp/MassFlux4.exp', '../Exp/MassFlux5.exp', '../Exp/MassFlux6.exp', '../Exp/Square.exp'] md.qmu.mass_flux_profile_directory = getcwd() #method md.qmu.method = dakota_method.dakota_method('nond_samp') -md.qmu.method = dmeth_params_set(md.qmu.method,'seed',1234,'samples',20,'sample_type','random') +md.qmu.method = dmeth_params_set(md.qmu.method, 'seed', 1234, 'samples', 20, 'sample_type', 'random') #parameters md.qmu.params.direct = True md.qmu.params.analysis_components = '' -md.qmu.params.tabular_graphics_data = True; +md.qmu.params.tabular_graphics_data = True if version >= 6: - md.qmu.params.analysis_driver = 'matlab' - md.qmu.params.evaluation_scheduling = 'master' - md.qmu.params.processors_per_evaluation = 2 + md.qmu.params.analysis_driver = 'matlab' + md.qmu.params.evaluation_scheduling = 'master' + md.qmu.params.processors_per_evaluation = 2 else: - md.qmu.params.analysis_driver = 'steadystate' - md.qmu.params.evaluation_concurrency = 1 + md.qmu.params.analysis_driver = 'steadystate' + md.qmu.params.evaluation_concurrency = 1 #partitioning md.qmu.numberofpartitions = 10 -md = partitioner(md,'package','chaco','npart',md.qmu.numberofpartitions,'weighting','on') -md.qmu.partition = md.qmu.partition-1 +md = partitioner(md, 'package', 'chaco', 'npart', md.qmu.numberofpartitions, 'weighting', 'on') +md.qmu.partition = md.qmu.partition - 1 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 = solve(md,'Steadystate','overwrite','y') +md.verbose = verbose('000000000') # this line is recommended +md = solve(md, 'Steadystate', 'overwrite', 'y') #Fields and tolerances to track changes @@ -88,10 +88,10 @@ md.results.dakota.montecarlo = [] for i in range(8): - md.results.dakota.montecarlo.append(md.results.dakota.dresp_out[i].mean) + md.results.dakota.montecarlo.append(md.results.dakota.dresp_out[i].mean) for i in range(8): - md.results.dakota.montecarlo.append(md.results.dakota.dresp_out[i].stddev) + md.results.dakota.montecarlo.append(md.results.dakota.dresp_out[i].stddev) -field_names = ['montecarlo'] +field_names = ['montecarlo'] field_tolerances = [2e-10] field_values = [md.results.dakota.montecarlo] Index: /issm/trunk-jpl/test/NightlyRun/test450.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test450.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test450.py (revision 23793) @@ -1,7 +1,5 @@ #Test Name: SquareSheetShelfStressSSAHigherOrder -import numpy as np from model import * from socket import gethostname - from triangle import * from setmask import * @@ -10,22 +8,20 @@ from solve import * -md=triangle(model(),'../Exp/Square.exp',150000.) -md=setmask(md,'../Exp/SquareShelf.exp','') -md=parameterize(md,'../Par/SquareSheetShelf.py') -md=setflowequation(md,'SSA','all') -md.cluster=generic('name',gethostname(),'np',3) +md = triangle(model(), '../Exp/Square.exp', 150000.) +md = setmask(md, '../Exp/SquareShelf.exp', '') +md = parameterize(md, '../Par/SquareSheetShelf.py') +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) -field_names=[] -field_tolerances=[] -field_values=[] -for i in ['P1bubble','P1bubblecondensed','P2']: - md.flowequation.fe_SSA=i - md=solve(md,'Stressbalance') - field_names =field_names+['Vx'+i,'Vy'+i,'Vel'+i,'Pressure'+i] - field_tolerances=field_tolerances+[1e-12,1e-13,1e-13,1e-13] - field_values=field_values+[\ - md.results.StressbalanceSolution.Vx,\ - md.results.StressbalanceSolution.Vy,\ - md.results.StressbalanceSolution.Vel,\ - md.results.StressbalanceSolution.Pressure,\ - ] +field_names = [] +field_tolerances = [] +field_values = [] +for i in ['P1bubble', 'P1bubblecondensed', 'P2']: + md.flowequation.fe_SSA = i + md = solve(md, 'Stressbalance') + field_names = field_names + ['Vx' + i, 'Vy' + i, 'Vel' + i, 'Pressure' + i] + field_tolerances = field_tolerances + [1e-12, 1e-13, 1e-13, 1e-13] + field_values = field_values + [md.results.StressbalanceSolution.Vx, + md.results.StressbalanceSolution.Vy, + md.results.StressbalanceSolution.Vel, + md.results.StressbalanceSolution.Pressure] Index: /issm/trunk-jpl/test/NightlyRun/test455.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test455.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test455.py (revision 23793) @@ -1,4 +1,3 @@ #Test Name: SquareSheetShelfStressHOHigherOrder -import numpy as np from model import * from socket import gethostname @@ -10,24 +9,22 @@ from solve import * -md=triangle(model(),'../Exp/Square.exp',180000.) -md=setmask(md,'../Exp/SquareShelf.exp','') -md=parameterize(md,'../Par/SquareSheetShelf.py') -md.extrude(5,1.) -md=setflowequation(md,'HO','all') -md.cluster=generic('name',gethostname(),'np',3) +md = triangle(model(), '../Exp/Square.exp', 180000.) +md = setmask(md, '../Exp/SquareShelf.exp', '') +md = parameterize(md, '../Par/SquareSheetShelf.py') +md.extrude(5, 1.) +md = setflowequation(md, 'HO', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) -field_names=[] -field_tolerances=[] -field_values=[] -for i in ['P1bubble','P1bubblecondensed','P1xP2','P2xP1','P2','P1xP3','P2xP4']: - md.flowequation.fe_HO=i - md=solve(md,'Stressbalance') - field_names =field_names+['Vx'+i,'Vy'+i,'Vz'+i,'Vel'+i,'Pressure'+i] - field_tolerances=field_tolerances+[7e-08,6e-08,6e-08,6e-08,3e-13] - field_values=field_values+[\ - md.results.StressbalanceSolution.Vx,\ - md.results.StressbalanceSolution.Vy,\ - md.results.StressbalanceSolution.Vz,\ - md.results.StressbalanceSolution.Vel,\ - md.results.StressbalanceSolution.Pressure,\ - ] +field_names = [] +field_tolerances = [] +field_values = [] +for i in ['P1bubble', 'P1bubblecondensed', 'P1xP2', 'P2xP1', 'P2', 'P1xP3', 'P2xP4']: + md.flowequation.fe_HO = i + md = solve(md, 'Stressbalance') + field_names = field_names + ['Vx' + i, 'Vy' + i, 'Vz' + i, 'Vel' + i, 'Pressure' + i] + field_tolerances = field_tolerances + [7e-08, 6e-08, 6e-08, 6e-08, 3e-13] + field_values = field_values + [md.results.StressbalanceSolution.Vx, + md.results.StressbalanceSolution.Vy, + md.results.StressbalanceSolution.Vz, + md.results.StressbalanceSolution.Vel, + md.results.StressbalanceSolution.Pressure] Index: /issm/trunk-jpl/test/NightlyRun/test460.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test460.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test460.py (revision 23793) @@ -10,29 +10,27 @@ from matestar import * -md=triangle(model(),'../Exp/Square.exp',180000.) -md=setmask(md,'../Exp/SquareShelf.exp','') -md=parameterize(md,'../Par/SquareSheetShelf.py') -md = md.extrude(3,1.) +md = triangle(model(), '../Exp/Square.exp', 180000.) +md = setmask(md, '../Exp/SquareShelf.exp', '') +md = parameterize(md, '../Par/SquareSheetShelf.py') +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.cluster = generic('name',gethostname(),'np',3) +md.cluster = generic('name', gethostname(), 'np', 3) #Go solve -field_names=[] -field_tolerances=[] -field_values=[] -#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,7e-06,2e-06,5e-06,5e-07] - field_values = field_values + [ - md.results.StressbalanceSolution.Vx, - md.results.StressbalanceSolution.Vy, - md.results.StressbalanceSolution.Vz, - md.results.StressbalanceSolution.Vel, - md.results.StressbalanceSolution.Pressure, - ] +field_names = [] +field_tolerances = [] +field_values = [] +#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, 7e-06, 2e-06, 5e-06, 5e-07] + field_values = field_values + [md.results.StressbalanceSolution.Vx, + md.results.StressbalanceSolution.Vy, + md.results.StressbalanceSolution.Vz, + md.results.StressbalanceSolution.Vel, + md.results.StressbalanceSolution.Pressure] Index: /issm/trunk-jpl/test/NightlyRun/test461.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test461.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test461.py (revision 23793) @@ -10,8 +10,8 @@ from matestar import * -md = triangle(model(),'../Exp/Square.exp',180000.) -md = setmask(md,'../Exp/SquareShelf.exp','') -md = parameterize(md,'../Par/SquareSheetShelf.py') -md = md.extrude(3,1.) +md = triangle(model(), '../Exp/Square.exp', 180000.) +md = setmask(md, '../Exp/SquareShelf.exp', '') +md = parameterize(md, '../Par/SquareSheetShelf.py') +md = md.extrude(3, 1.) md.materials = matestar() md.materials.rheology_B = 3.15e8 * np.ones((md.mesh.numberofvertices,)) @@ -19,5 +19,5 @@ md.materials.rheology_Es = 3. * np.ones((md.mesh.numberofvertices,)) -md = setflowequation(md,'FS','all') +md = setflowequation(md, 'FS', 'all') md.initialization.waterfraction = np.zeros((md.mesh.numberofvertices,)) md.initialization.watercolumn = np.zeros((md.mesh.numberofvertices,)) @@ -29,25 +29,21 @@ md.thermal.isenthalpy = 1 md.thermal.isdynamicbasalspc = 1 -md.cluster = generic('name',gethostname(),'np',3) -md = solve(md,'Transient') +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'Transient') #Fields and tolerances to track changes -field_names = [ - 'Enthalpy1','Waterfraction1','Temperature1', - 'Enthalpy2','Waterfraction2','Temperature2', - 'Enthalpy3','Waterfraction3','Temperature3'] -field_tolerances = [ - 1e-12,1e-11,1e-12, - 1e-12,1e-10,1e-12, - 1e-12,1e-9,1e-12] -field_values = [ - md.results.TransientSolution[0].Enthalpy, - md.results.TransientSolution[0].Waterfraction, - md.results.TransientSolution[0].Temperature, - md.results.TransientSolution[1].Enthalpy, - md.results.TransientSolution[1].Waterfraction, - md.results.TransientSolution[1].Temperature, - md.results.TransientSolution[2].Enthalpy, - md.results.TransientSolution[2].Waterfraction, - md.results.TransientSolution[2].Temperature, - ] +field_names = ['Enthalpy1', 'Waterfraction1', 'Temperature1', + 'Enthalpy2', 'Waterfraction2', 'Temperature2', + 'Enthalpy3', 'Waterfraction3', 'Temperature3'] +field_tolerances = [1e-12, 1e-11, 1e-12, + 1e-12, 1e-10, 1e-12, + 1e-12, 1e-9, 1e-12] +field_values = [md.results.TransientSolution[0].Enthalpy, + md.results.TransientSolution[0].Waterfraction, + md.results.TransientSolution[0].Temperature, + md.results.TransientSolution[1].Enthalpy, + md.results.TransientSolution[1].Waterfraction, + md.results.TransientSolution[1].Temperature, + md.results.TransientSolution[2].Enthalpy, + md.results.TransientSolution[2].Waterfraction, + md.results.TransientSolution[2].Temperature] Index: /issm/trunk-jpl/test/NightlyRun/test462.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test462.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test462.py (revision 23793) @@ -1,4 +1,3 @@ #Test Name: SquareSheetShelfAmrBamgField -import numpy as np from model import * from socket import gethostname @@ -9,9 +8,9 @@ from solve import * -md = triangle(model(),'../Exp/Square.exp',150000.) -md = setmask(md,'../Exp/SquareShelf.exp','') -md = parameterize(md,'../Par/SquareSheetShelf.py') -md = setflowequation(md,'SSA','all') -md.cluster = generic('name',gethostname(),'np',3) +md = triangle(model(), '../Exp/Square.exp', 150000.) +md = setmask(md, '../Exp/SquareShelf.exp', '') +md = parameterize(md, '../Par/SquareSheetShelf.py') +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) md.transient.isstressbalance = 1 md.transient.ismasstransport = 1 @@ -37,13 +36,11 @@ md.timestepping.final_time = 3 md.timestepping.time_step = 1 -md = solve(md,'Transient') +md = solve(md, 'Transient') #Fields and tolerances to track changes -field_names = ['Vx','Vy','Vel','Pressure'] -field_tolerances = [1e-13,1e-13,1e-13,1e-13] -field_values = [ - md.results.TransientSolution[2].Vx, - md.results.TransientSolution[2].Vy, - md.results.TransientSolution[2].Vel, - md.results.TransientSolution[2].Pressure, - ] +field_names = ['Vx', 'Vy', 'Vel', 'Pressure'] +field_tolerances = [1e-13, 1e-13, 1e-13, 1e-13] +field_values = [md.results.TransientSolution[2].Vx, + md.results.TransientSolution[2].Vy, + md.results.TransientSolution[2].Vel, + md.results.TransientSolution[2].Pressure] Index: /issm/trunk-jpl/test/NightlyRun/test463.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test463.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test463.py (revision 23793) @@ -1,4 +1,3 @@ #Test Name: SquareSheetShelfAmrBamgGroundingline -import numpy as np from model import * from socket import gethostname @@ -9,9 +8,9 @@ from solve import * -md = triangle(model(),'../Exp/Square.exp',150000.) -md = setmask(md,'../Exp/SquareShelf.exp','') -md = parameterize(md,'../Par/SquareSheetShelf.py') -md = setflowequation(md,'SSA','all') -md.cluster = generic('name',gethostname(),'np',3) +md = triangle(model(), '../Exp/Square.exp', 150000.) +md = setmask(md, '../Exp/SquareShelf.exp', '') +md = parameterize(md, '../Par/SquareSheetShelf.py') +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) md.transient.isstressbalance = 1 md.transient.ismasstransport = 1 @@ -37,13 +36,11 @@ md.timestepping.final_time = 3 md.timestepping.time_step = 1 -md = solve(md,'Transient') +md = solve(md, 'Transient') #Fields and tolerances to track changes -field_names = ['Vx','Vy','Vel','Pressure'] -field_tolerances = [1e-8,1e-8,1e-8,1e-8] -field_values = [ - md.results.TransientSolution[2].Vx, - md.results.TransientSolution[2].Vy, - md.results.TransientSolution[2].Vel, - md.results.TransientSolution[2].Pressure, - ] +field_names = ['Vx', 'Vy', 'Vel', 'Pressure'] +field_tolerances = [1e-8, 1e-8, 1e-8, 1e-8] +field_values = [md.results.TransientSolution[2].Vx, + md.results.TransientSolution[2].Vy, + md.results.TransientSolution[2].Vel, + md.results.TransientSolution[2].Pressure] Index: /issm/trunk-jpl/test/NightlyRun/test464.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test464.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test464.py (revision 23793) @@ -1,4 +1,3 @@ #Test Name: SquareSheetShelfAmrBamgIceFront -import numpy as np from model import * from socket import gethostname @@ -9,9 +8,9 @@ from solve import * -md = triangle(model(),'../Exp/Square.exp',150000.) -md = setmask(md,'../Exp/SquareShelf.exp','') -md = parameterize(md,'../Par/SquareSheetShelf.py') -md = setflowequation(md,'SSA','all') -md.cluster = generic('name',gethostname(),'np',3) +md = triangle(model(), '../Exp/Square.exp', 150000.) +md = setmask(md, '../Exp/SquareShelf.exp', '') +md = parameterize(md, '../Par/SquareSheetShelf.py') +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) md.transient.isstressbalance = 1 md.transient.ismasstransport = 1 @@ -37,13 +36,11 @@ md.timestepping.final_time = 3 md.timestepping.time_step = 1 -md = solve(md,'Transient') +md = solve(md, 'Transient') #Fields and tolerances to track changes -field_names = ['Vx','Vy','Vel','Pressure'] -field_tolerances = [1e-13,1e-13,1e-13,1e-13] -field_values = [ - md.results.TransientSolution[2].Vx, - md.results.TransientSolution[2].Vy, - md.results.TransientSolution[2].Vel, - md.results.TransientSolution[2].Pressure, - ] +field_names = ['Vx', 'Vy', 'Vel', 'Pressure'] +field_tolerances = [1e-13, 1e-13, 1e-13, 1e-13] +field_values = [md.results.TransientSolution[2].Vx, + md.results.TransientSolution[2].Vy, + md.results.TransientSolution[2].Vel, + md.results.TransientSolution[2].Pressure] Index: /issm/trunk-jpl/test/NightlyRun/test465.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test465.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test465.py (revision 23793) @@ -1,4 +1,3 @@ #Test Name: SquareSheetShelfAmrBamgAll -import numpy as np from model import * from socket import gethostname @@ -9,9 +8,9 @@ from solve import * -md = triangle(model(),'../Exp/Square.exp',150000.) -md = setmask(md,'../Exp/SquareShelf.exp','') -md = parameterize(md,'../Par/SquareSheetShelf.py') -md = setflowequation(md,'SSA','all') -md.cluster = generic('name',gethostname(),'np',3) +md = triangle(model(), '../Exp/Square.exp', 150000.) +md = setmask(md, '../Exp/SquareShelf.exp', '') +md = parameterize(md, '../Par/SquareSheetShelf.py') +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) md.transient.isstressbalance = 1 md.transient.ismasstransport = 1 @@ -37,13 +36,11 @@ md.timestepping.final_time = 3 md.timestepping.time_step = 1 -md = solve(md,'Transient') +md = solve(md, 'Transient') #Fields and tolerances to track changes -field_names = ['Vx','Vy','Vel','Pressure'] -field_tolerances = [1e-8,1e-8,1e-8,1e-8] -field_values = [ - md.results.TransientSolution[2].Vx, - md.results.TransientSolution[2].Vy, - md.results.TransientSolution[2].Vel, - md.results.TransientSolution[2].Pressure, - ] +field_names = ['Vx', 'Vy', 'Vel', 'Pressure'] +field_tolerances = [1e-8, 1e-8, 1e-8, 1e-8] +field_values = [md.results.TransientSolution[2].Vx, + md.results.TransientSolution[2].Vy, + md.results.TransientSolution[2].Vel, + md.results.TransientSolution[2].Pressure] Index: /issm/trunk-jpl/test/NightlyRun/test501.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test501.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test501.py (revision 23793) @@ -9,16 +9,16 @@ -md=triangle(model(),'../Exp/Pig.exp',20000.) -md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp') -md=parameterize(md,'../Par/Pig.py') -md=setflowequation(md,'SSA','all') -md.cluster=generic('name',gethostname(),'np',3) -md=solve(md,'Stressbalance') +md = triangle(model(), '../Exp/Pig.exp', 20000.) +md = setmask(md, '../Exp/PigShelves.exp', '../Exp/PigIslands.exp') +md = parameterize(md, '../Par/Pig.py') +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'Stressbalance') # Fields and tolerances to track changes -field_names =['Vx','Vy','Vel','Pressure'] -field_tolerances=[1e-12,2e-12,2e-12,1e-13] -field_values=[md.results.StressbalanceSolution.Vx, - md.results.StressbalanceSolution.Vy, - md.results.StressbalanceSolution.Vel, - md.results.StressbalanceSolution.Pressure] +field_names = ['Vx', 'Vy', 'Vel', 'Pressure'] +field_tolerances = [1e-12, 2e-12, 2e-12, 1e-13] +field_values = [md.results.StressbalanceSolution.Vx, + md.results.StressbalanceSolution.Vy, + md.results.StressbalanceSolution.Vel, + md.results.StressbalanceSolution.Pressure] Index: /issm/trunk-jpl/test/NightlyRun/test502.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test502.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test502.py (revision 23793) @@ -9,20 +9,18 @@ -md=triangle(model(),'../Exp/Pig.exp',20000.) -md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp') -md=parameterize(md,'../Par/Pig.py') -md.extrude(3,0.9) -md=setflowequation(md,'HO','all') -md.cluster=generic('name',gethostname(),'np',3) -md=solve(md,'Stressbalance') +md = triangle(model(), '../Exp/Pig.exp', 20000.) +md = setmask(md, '../Exp/PigShelves.exp', '../Exp/PigIslands.exp') +md = parameterize(md, '../Par/Pig.py') +md.extrude(3, 0.9) +md = setflowequation(md, 'HO', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'Stressbalance') # Fields and tolerances to track changes -field_names =['Vx','Vy','Vz','Vel','Pressure'] -field_tolerances=[1e-08,1e-08,1e-08,1e-08,1e-08] -field_values=[\ - md.results.StressbalanceSolution.Vx,\ - md.results.StressbalanceSolution.Vy,\ - md.results.StressbalanceSolution.Vz,\ - md.results.StressbalanceSolution.Vel,\ - md.results.StressbalanceSolution.Pressure,\ - ] +field_names = ['Vx', 'Vy', 'Vz', 'Vel', 'Pressure'] +field_tolerances = [1e-08, 1e-08, 1e-08, 1e-08, 1e-08] +field_values = [md.results.StressbalanceSolution.Vx, + md.results.StressbalanceSolution.Vy, + md.results.StressbalanceSolution.Vz, + md.results.StressbalanceSolution.Vel, + md.results.StressbalanceSolution.Pressure] Index: /issm/trunk-jpl/test/NightlyRun/test503.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test503.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test503.py (revision 23793) @@ -9,20 +9,18 @@ -md=triangle(model(),'../Exp/Pig.exp',20000.) -md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp') -md=parameterize(md,'../Par/Pig.py') -md.extrude(3,0.9) -md=setflowequation(md,'FS','all') -md.cluster=generic('name',gethostname(),'np',3) -md=solve(md,'Stressbalance') +md = triangle(model(), '../Exp/Pig.exp', 20000.) +md = setmask(md, '../Exp/PigShelves.exp', '../Exp/PigIslands.exp') +md = parameterize(md, '../Par/Pig.py') +md.extrude(3, 0.9) +md = setflowequation(md, 'FS', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'Stressbalance') # Fields and tolerances to track changes -field_names =['Vx','Vy','Vz','Vel','Pressure'] -field_tolerances=[1e-09,1e-09,1e-09,1e-09,1e-09] -field_values=[\ - md.results.StressbalanceSolution.Vx,\ - md.results.StressbalanceSolution.Vy,\ - md.results.StressbalanceSolution.Vz,\ - md.results.StressbalanceSolution.Vel,\ - md.results.StressbalanceSolution.Pressure,\ - ] +field_names = ['Vx', 'Vy', 'Vz', 'Vel', 'Pressure'] +field_tolerances = [1e-09, 1e-09, 1e-09, 1e-09, 1e-09] +field_values = [md.results.StressbalanceSolution.Vx, + md.results.StressbalanceSolution.Vy, + md.results.StressbalanceSolution.Vz, + md.results.StressbalanceSolution.Vel, + md.results.StressbalanceSolution.Pressure] Index: /issm/trunk-jpl/test/NightlyRun/test504.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test504.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test504.py (revision 23793) @@ -9,50 +9,74 @@ -md=triangle(model(),'../Exp/Pig.exp',20000.) -md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp') -md=parameterize(md,'../Par/Pig.py') -md=setflowequation(md,'SSA','all') -md.mesh.scale_factor=0.9*np.ones((md.mesh.numberofvertices)) -md.transient.requested_outputs=['default','IceVolume','IceVolumeScaled','GroundedArea','GroundedAreaScaled','FloatingArea','FloatingAreaScaled','TotalSmb','TotalSmbScaled','TotalFloatingBmb','TotalFloatingBmbScaled'] -md.cluster=generic('name',gethostname(),'np',3) -md=solve(md,'Transient') +md = triangle(model(), '../Exp/Pig.exp', 20000.) +md = setmask(md, '../Exp/PigShelves.exp', '../Exp/PigIslands.exp') +md = parameterize(md, '../Par/Pig.py') +md = setflowequation(md, 'SSA', 'all') +md.mesh.scale_factor = 0.9 * np.ones((md.mesh.numberofvertices)) +md.transient.requested_outputs = ['default', 'IceVolume', 'IceVolumeScaled', 'GroundedArea', 'GroundedAreaScaled', 'FloatingArea', 'FloatingAreaScaled', 'TotalSmb', 'TotalSmbScaled', 'TotalFloatingBmb', 'TotalFloatingBmbScaled'] +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'Transient') # Fields and tolerances to track changes -field_names =['Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','IceVolume1','IceVolumeScaled1','GroundedArea1','GroundedAreaScaled1','FloatingArea1','FloatingAreaScaled1','TotalSmb1','TotalSmbScaled1','TotalFloatingBmb1','TotalFloatingBmbScaled1','Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2','IceVolume2','IceVolumeScaled2','GroundedArea2','GroundedAreaScaled2','FloatingArea2','FloatingAreaScaled2','TotalSmb2','TotalSmbScaled2','TotalFloatingBmb2','TotalFloatingBmbScaled2'] -field_tolerances=[1e-12,2e-12,2e-12,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-12,1e-12,1e-12,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,] -field_values=[\ - md.results.TransientSolution[0].Vx,\ - md.results.TransientSolution[0].Vy,\ - md.results.TransientSolution[0].Vel,\ - md.results.TransientSolution[0].Pressure,\ - md.results.TransientSolution[0].Base,\ - md.results.TransientSolution[0].Surface,\ - md.results.TransientSolution[0].Thickness,\ - md.results.TransientSolution[0].IceVolume,\ - md.results.TransientSolution[0].IceVolumeScaled,\ - md.results.TransientSolution[0].GroundedArea,\ - md.results.TransientSolution[0].GroundedAreaScaled,\ - md.results.TransientSolution[0].FloatingArea,\ - md.results.TransientSolution[0].FloatingAreaScaled,\ - md.results.TransientSolution[0].TotalSmb,\ - md.results.TransientSolution[0].TotalSmbScaled,\ - md.results.TransientSolution[0].TotalFloatingBmb,\ - md.results.TransientSolution[0].TotalFloatingBmbScaled,\ - md.results.TransientSolution[1].Vx,\ - md.results.TransientSolution[1].Vy,\ - md.results.TransientSolution[1].Vel,\ - md.results.TransientSolution[1].Pressure,\ - md.results.TransientSolution[1].Base,\ - md.results.TransientSolution[1].Surface,\ - md.results.TransientSolution[1].Thickness,\ - md.results.TransientSolution[1].IceVolume,\ - md.results.TransientSolution[1].IceVolumeScaled,\ - md.results.TransientSolution[1].GroundedArea,\ - md.results.TransientSolution[1].GroundedAreaScaled,\ - md.results.TransientSolution[1].FloatingArea,\ - md.results.TransientSolution[1].FloatingAreaScaled,\ - md.results.TransientSolution[1].TotalSmb,\ - md.results.TransientSolution[1].TotalSmbScaled,\ - md.results.TransientSolution[1].TotalFloatingBmb,\ - md.results.TransientSolution[1].TotalFloatingBmbScaled,\ - ] +field_names = ['Vx1', 'Vy1', 'Vel1', 'Pressure1', + 'Bed1', 'Surface1', 'Thickness1', + 'IceVolume1', 'IceVolumeScaled1', + 'GroundedArea1', 'GroundedAreaScaled1', + 'FloatingArea1', 'FloatingAreaScaled1', + 'TotalSmb1', 'TotalSmbScaled1', + 'TotalFloatingBmb1', 'TotalFloatingBmbScaled1', + 'Vx2', 'Vy2', 'Vel2', 'Pressure2', + 'Bed2', 'Surface2', 'Thickness2', + 'IceVolume2', 'IceVolumeScaled2', + 'GroundedArea2', 'GroundedAreaScaled2', + 'FloatingArea2', 'FloatingAreaScaled2', + 'TotalSmb2', 'TotalSmbScaled2', + 'TotalFloatingBmb2', 'TotalFloatingBmbScaled2'] +field_tolerances = [1e-12, 2e-12, 2e-12, 1e-13, + 1e-13, 1e-13, 1e-13, + 1e-13, 1e-13, + 1e-13, 1e-13, + 1e-12, 1e-12, + 1e-12, 1e-13, + 1e-13, 1e-13, + 1e-13, 1e-13, 1e-13, 1e-13, + 1e-13, 1e-13, 1e-13, + 1e-13, 1e-13, + 1e-13, 1e-13, + 1e-13, 1e-13, + 1e-13, 1e-13, + 1e-13, 1e-13] +field_values = [md.results.TransientSolution[0].Vx, + md.results.TransientSolution[0].Vy, + md.results.TransientSolution[0].Vel, + md.results.TransientSolution[0].Pressure, + md.results.TransientSolution[0].Base, + md.results.TransientSolution[0].Surface, + md.results.TransientSolution[0].Thickness, + md.results.TransientSolution[0].IceVolume, + md.results.TransientSolution[0].IceVolumeScaled, + md.results.TransientSolution[0].GroundedArea, + md.results.TransientSolution[0].GroundedAreaScaled, + md.results.TransientSolution[0].FloatingArea, + md.results.TransientSolution[0].FloatingAreaScaled, + md.results.TransientSolution[0].TotalSmb, + md.results.TransientSolution[0].TotalSmbScaled, + md.results.TransientSolution[0].TotalFloatingBmb, + md.results.TransientSolution[0].TotalFloatingBmbScaled, + md.results.TransientSolution[1].Vx, + md.results.TransientSolution[1].Vy, + md.results.TransientSolution[1].Vel, + md.results.TransientSolution[1].Pressure, + md.results.TransientSolution[1].Base, + md.results.TransientSolution[1].Surface, + md.results.TransientSolution[1].Thickness, + md.results.TransientSolution[1].IceVolume, + md.results.TransientSolution[1].IceVolumeScaled, + md.results.TransientSolution[1].GroundedArea, + md.results.TransientSolution[1].GroundedAreaScaled, + md.results.TransientSolution[1].FloatingArea, + md.results.TransientSolution[1].FloatingAreaScaled, + md.results.TransientSolution[1].TotalSmb, + md.results.TransientSolution[1].TotalSmbScaled, + md.results.TransientSolution[1].TotalFloatingBmb, + md.results.TransientSolution[1].TotalFloatingBmbScaled] Index: /issm/trunk-jpl/test/NightlyRun/test505.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test505.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test505.py (revision 23793) @@ -9,37 +9,35 @@ -md=triangle(model(),'../Exp/Pig.exp',30000.) -md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp') -md=parameterize(md,'../Par/Pig.py') -md.extrude(3,1.) -md=setflowequation(md,'SSA','all') -md.cluster=generic('name',gethostname(),'np',3) -md=solve(md,'Transient') +md = triangle(model(), '../Exp/Pig.exp', 30000.) +md = setmask(md, '../Exp/PigShelves.exp', '../Exp/PigIslands.exp') +md = parameterize(md, '../Par/Pig.py') +md.extrude(3, 1.) +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'Transient') # Fields and tolerances to track changes -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-12,1e-12,3e-10,1e-12,1e-13,1e-11,5e-12,9e-12,1e-13,5e-9, \ - 5e-11,5e-11,1e-10,2e-11,7e-12,1e-11,1e-11,5e-12,1e-11,2e-8] -field_values=[\ - md.results.TransientSolution[0].Vx,\ - md.results.TransientSolution[0].Vy,\ - md.results.TransientSolution[0].Vz,\ - md.results.TransientSolution[0].Vel,\ - md.results.TransientSolution[0].Pressure,\ - md.results.TransientSolution[0].Base,\ - md.results.TransientSolution[0].Surface,\ - md.results.TransientSolution[0].Thickness,\ - md.results.TransientSolution[0].Temperature,\ - md.results.TransientSolution[0].BasalforcingsGroundediceMeltingRate,\ - md.results.TransientSolution[1].Vx,\ - md.results.TransientSolution[1].Vy,\ - md.results.TransientSolution[1].Vz,\ - md.results.TransientSolution[1].Vel,\ - md.results.TransientSolution[1].Pressure,\ - md.results.TransientSolution[1].Base,\ - md.results.TransientSolution[1].Surface,\ - md.results.TransientSolution[1].Thickness,\ - md.results.TransientSolution[1].Temperature,\ - md.results.TransientSolution[1].BasalforcingsGroundediceMeltingRate,\ - ] +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-12, 1e-12, 3e-10, 1e-12, 1e-13, 1e-11, 5e-12, 9e-12, 1e-13, 5e-9, + 5e-11, 5e-11, 1e-10, 2e-11, 7e-12, 1e-11, 1e-11, 5e-12, 1e-11, 2e-8] +field_values = [md.results.TransientSolution[0].Vx, + md.results.TransientSolution[0].Vy, + md.results.TransientSolution[0].Vz, + md.results.TransientSolution[0].Vel, + md.results.TransientSolution[0].Pressure, + md.results.TransientSolution[0].Base, + md.results.TransientSolution[0].Surface, + md.results.TransientSolution[0].Thickness, + md.results.TransientSolution[0].Temperature, + md.results.TransientSolution[0].BasalforcingsGroundediceMeltingRate, + md.results.TransientSolution[1].Vx, + md.results.TransientSolution[1].Vy, + md.results.TransientSolution[1].Vz, + md.results.TransientSolution[1].Vel, + md.results.TransientSolution[1].Pressure, + md.results.TransientSolution[1].Base, + md.results.TransientSolution[1].Surface, + md.results.TransientSolution[1].Thickness, + md.results.TransientSolution[1].Temperature, + md.results.TransientSolution[1].BasalforcingsGroundediceMeltingRate] Index: /issm/trunk-jpl/test/NightlyRun/test506.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test506.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test506.py (revision 23793) @@ -9,59 +9,57 @@ -md=triangle(model(),'../Exp/Pig.exp',30000.) -md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp') -md=parameterize(md,'../Par/Pig.py') -md.mesh.scale_factor=0.9*np.ones((md.mesh.numberofvertices)) -md.extrude(2,1.) -md=setflowequation(md,'HO','all') -md.transient.requested_outputs=['default','IceVolume','IceVolumeScaled','GroundedArea','GroundedAreaScaled','FloatingArea','FloatingAreaScaled','TotalSmb','TotalSmbScaled','TotalFloatingBmb','TotalFloatingBmbScaled'] -md.cluster=generic('name',gethostname(),'np',3) -md=solve(md,'Transient') +md = triangle(model(), '../Exp/Pig.exp', 30000.) +md = setmask(md, '../Exp/PigShelves.exp', '../Exp/PigIslands.exp') +md = parameterize(md, '../Par/Pig.py') +md.mesh.scale_factor = 0.9 * np.ones((md.mesh.numberofvertices)) +md.extrude(2, 1.) +md = setflowequation(md, 'HO', 'all') +md.transient.requested_outputs = ['default', 'IceVolume', 'IceVolumeScaled', 'GroundedArea', 'GroundedAreaScaled', 'FloatingArea', 'FloatingAreaScaled', 'TotalSmb', 'TotalSmbScaled', 'TotalFloatingBmb', 'TotalFloatingBmbScaled'] +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'Transient') # Fields and tolerances to track changes -field_names =['Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsGroundediceMeltingRate1','IceVolume1','IceVolumeScaled1','GroundedArea1','GroundedAreaScaled1','FloatingArea1','FloatingAreaScaled1','TotalSmb1','TotalSmbScaled1','TotalFloatingBmb1','TotalFloatingBmbScaled1', \ - 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsGroundediceMeltingRate2','IceVolume2','IceVolumeScaled2','GroundedArea2','GroundedAreaScaled2','FloatingArea2','FloatingAreaScaled2','TotalSmb2','TotalSmbScaled2','TotalFloatingBmb2','TotalFloatingBmbScaled2'] -field_tolerances=[1e-10,1e-10,1e-10,1e-10,1e-12,1e-11,2e-12,1e-11,1e-12,1e-09,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,\ - 1e-11,1e-11,1e-09,1e-11,1e-11,1e-10,1e-11,1e-10,1e-11,2e-08,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13] -field_values=[\ - md.results.TransientSolution[0].Vx,\ - md.results.TransientSolution[0].Vy,\ - md.results.TransientSolution[0].Vz,\ - md.results.TransientSolution[0].Vel,\ - md.results.TransientSolution[0].Pressure,\ - md.results.TransientSolution[0].Base,\ - md.results.TransientSolution[0].Surface,\ - md.results.TransientSolution[0].Thickness,\ - md.results.TransientSolution[0].Temperature,\ - md.results.TransientSolution[0].BasalforcingsGroundediceMeltingRate,\ - md.results.TransientSolution[0].IceVolume,\ - md.results.TransientSolution[0].IceVolumeScaled,\ - md.results.TransientSolution[0].GroundedArea,\ - md.results.TransientSolution[0].GroundedAreaScaled,\ - md.results.TransientSolution[0].FloatingArea,\ - md.results.TransientSolution[0].FloatingAreaScaled,\ - md.results.TransientSolution[0].TotalSmb,\ - md.results.TransientSolution[0].TotalSmbScaled,\ - md.results.TransientSolution[0].TotalFloatingBmb,\ - md.results.TransientSolution[0].TotalFloatingBmbScaled,\ - md.results.TransientSolution[1].Vx,\ - md.results.TransientSolution[1].Vy,\ - md.results.TransientSolution[1].Vz,\ - md.results.TransientSolution[1].Vel,\ - md.results.TransientSolution[1].Pressure,\ - md.results.TransientSolution[1].Base,\ - md.results.TransientSolution[1].Surface,\ - md.results.TransientSolution[1].Thickness,\ - md.results.TransientSolution[1].Temperature,\ - md.results.TransientSolution[1].BasalforcingsGroundediceMeltingRate,\ - md.results.TransientSolution[1].IceVolume,\ - md.results.TransientSolution[1].IceVolumeScaled,\ - md.results.TransientSolution[1].GroundedArea,\ - md.results.TransientSolution[1].GroundedAreaScaled,\ - md.results.TransientSolution[1].FloatingArea,\ - md.results.TransientSolution[1].FloatingAreaScaled,\ - md.results.TransientSolution[1].TotalSmb,\ - md.results.TransientSolution[1].TotalSmbScaled,\ - md.results.TransientSolution[1].TotalFloatingBmb,\ - md.results.TransientSolution[1].TotalFloatingBmbScaled,\ - ] +field_names = ['Vx1', 'Vy1', 'Vz1', 'Vel1', 'Pressure1', 'Bed1', 'Surface1', 'Thickness1', 'Temperature1', 'BasalforcingsGroundediceMeltingRate1', 'IceVolume1', 'IceVolumeScaled1', 'GroundedArea1', 'GroundedAreaScaled1', 'FloatingArea1', 'FloatingAreaScaled1', 'TotalSmb1', 'TotalSmbScaled1', 'TotalFloatingBmb1', 'TotalFloatingBmbScaled1', + 'Vx2', 'Vy2', 'Vz2', 'Vel2', 'Pressure2', 'Bed2', 'Surface2', 'Thickness2', 'Temperature2', 'BasalforcingsGroundediceMeltingRate2', 'IceVolume2', 'IceVolumeScaled2', 'GroundedArea2', 'GroundedAreaScaled2', 'FloatingArea2', 'FloatingAreaScaled2', 'TotalSmb2', 'TotalSmbScaled2', 'TotalFloatingBmb2', 'TotalFloatingBmbScaled2'] +field_tolerances = [1e-10, 1e-10, 1e-10, 1e-10, 1e-12, 1e-11, 2e-12, 1e-11, 1e-12, 1e-09, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, + 1e-11, 1e-11, 1e-09, 1e-11, 1e-11, 1e-10, 1e-11, 1e-10, 1e-11, 2e-08, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13] +field_values = [md.results.TransientSolution[0].Vx, + md.results.TransientSolution[0].Vy, + md.results.TransientSolution[0].Vz, + md.results.TransientSolution[0].Vel, + md.results.TransientSolution[0].Pressure, + md.results.TransientSolution[0].Base, + md.results.TransientSolution[0].Surface, + md.results.TransientSolution[0].Thickness, + md.results.TransientSolution[0].Temperature, + md.results.TransientSolution[0].BasalforcingsGroundediceMeltingRate, + md.results.TransientSolution[0].IceVolume, + md.results.TransientSolution[0].IceVolumeScaled, + md.results.TransientSolution[0].GroundedArea, + md.results.TransientSolution[0].GroundedAreaScaled, + md.results.TransientSolution[0].FloatingArea, + md.results.TransientSolution[0].FloatingAreaScaled, + md.results.TransientSolution[0].TotalSmb, + md.results.TransientSolution[0].TotalSmbScaled, + md.results.TransientSolution[0].TotalFloatingBmb, + md.results.TransientSolution[0].TotalFloatingBmbScaled, + md.results.TransientSolution[1].Vx, + md.results.TransientSolution[1].Vy, + md.results.TransientSolution[1].Vz, + md.results.TransientSolution[1].Vel, + md.results.TransientSolution[1].Pressure, + md.results.TransientSolution[1].Base, + md.results.TransientSolution[1].Surface, + md.results.TransientSolution[1].Thickness, + md.results.TransientSolution[1].Temperature, + md.results.TransientSolution[1].BasalforcingsGroundediceMeltingRate, + md.results.TransientSolution[1].IceVolume, + md.results.TransientSolution[1].IceVolumeScaled, + md.results.TransientSolution[1].GroundedArea, + md.results.TransientSolution[1].GroundedAreaScaled, + md.results.TransientSolution[1].FloatingArea, + md.results.TransientSolution[1].FloatingAreaScaled, + md.results.TransientSolution[1].TotalSmb, + md.results.TransientSolution[1].TotalSmbScaled, + md.results.TransientSolution[1].TotalFloatingBmb, + md.results.TransientSolution[1].TotalFloatingBmbScaled] Index: /issm/trunk-jpl/test/NightlyRun/test507.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test507.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test507.py (revision 23793) @@ -9,37 +9,35 @@ -md=triangle(model(),'../Exp/Pig.exp',30000.) -md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp') -md=parameterize(md,'../Par/Pig.py') -md.extrude(2,1.) -md=setflowequation(md,'FS','all') -md.groundingline.melt_interpolation='FullMeltOnPartiallyFloating' -md.cluster=generic('name',gethostname(),'np',3) -md=solve(md,'Transient') +md = triangle(model(), '../Exp/Pig.exp', 30000.) +md = setmask(md, '../Exp/PigShelves.exp', '../Exp/PigIslands.exp') +md = parameterize(md, '../Par/Pig.py') +md.extrude(2, 1.) +md = setflowequation(md, 'FS', 'all') +md.groundingline.melt_interpolation = 'FullMeltOnPartiallyFloating' +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'Transient') # Fields and tolerances to track changes -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,1e-08,1e-08,1e-08,1e-08,1e-08,1e-06,1e-06,1e-06,1e-06,1e-06,1e-06,1e-06,1e-06,1e-06,1e-06] -field_values=[\ - md.results.TransientSolution[0].Vx,\ - md.results.TransientSolution[0].Vy,\ - md.results.TransientSolution[0].Vz,\ - md.results.TransientSolution[0].Vel,\ - md.results.TransientSolution[0].Pressure,\ - md.results.TransientSolution[0].Base,\ - md.results.TransientSolution[0].Surface,\ - md.results.TransientSolution[0].Thickness,\ - md.results.TransientSolution[0].Temperature,\ - md.results.TransientSolution[0].BasalforcingsGroundediceMeltingRate,\ - md.results.TransientSolution[1].Vx,\ - md.results.TransientSolution[1].Vy,\ - md.results.TransientSolution[1].Vz,\ - md.results.TransientSolution[1].Vel,\ - md.results.TransientSolution[1].Pressure,\ - md.results.TransientSolution[1].Base,\ - md.results.TransientSolution[1].Surface,\ - md.results.TransientSolution[1].Thickness,\ - md.results.TransientSolution[1].Temperature,\ - md.results.TransientSolution[1].BasalforcingsGroundediceMeltingRate,\ - ] +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, 1e-08, 1e-08, 1e-08, 1e-08, 1e-08, 1e-06, 1e-06, 1e-06, 1e-06, 1e-06, 1e-06, 1e-06, 1e-06, 1e-06, 1e-06] +field_values = [md.results.TransientSolution[0].Vx, + md.results.TransientSolution[0].Vy, + md.results.TransientSolution[0].Vz, + md.results.TransientSolution[0].Vel, + md.results.TransientSolution[0].Pressure, + md.results.TransientSolution[0].Base, + md.results.TransientSolution[0].Surface, + md.results.TransientSolution[0].Thickness, + md.results.TransientSolution[0].Temperature, + md.results.TransientSolution[0].BasalforcingsGroundediceMeltingRate, + md.results.TransientSolution[1].Vx, + md.results.TransientSolution[1].Vy, + md.results.TransientSolution[1].Vz, + md.results.TransientSolution[1].Vel, + md.results.TransientSolution[1].Pressure, + md.results.TransientSolution[1].Base, + md.results.TransientSolution[1].Surface, + md.results.TransientSolution[1].Thickness, + md.results.TransientSolution[1].Temperature, + md.results.TransientSolution[1].BasalforcingsGroundediceMeltingRate] Index: /issm/trunk-jpl/test/NightlyRun/test508.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test508.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test508.py (revision 23793) @@ -9,23 +9,21 @@ -md=triangle(model(),'../Exp/Pig.exp',35000.) -md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp') -md=parameterize(md,'../Par/Pig.py') -md.extrude(3,1.1) -md=setflowequation(md,'SSA','all') -md.cluster=generic('name',gethostname(),'np',3) -md.timestepping.time_step=0. -md=solve(md,'Steadystate') +md = triangle(model(), '../Exp/Pig.exp', 35000.) +md = setmask(md, '../Exp/PigShelves.exp', '../Exp/PigIslands.exp') +md = parameterize(md, '../Par/Pig.py') +md.extrude(3, 1.1) +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) +md.timestepping.time_step = 0. +md = solve(md, 'Steadystate') # Fields and tolerances to track changes -field_names =['Vx','Vy','Vz','Vel','Pressure','Temperature','BasalforcingsGroundediceMeltingRate'] -field_tolerances=[5e-08,1.6e-08,5e-08,5e-08,1e-09,6e-08,5e-07] -field_values=[\ - md.results.SteadystateSolution.Vx,\ - md.results.SteadystateSolution.Vy,\ - md.results.SteadystateSolution.Vz,\ - md.results.SteadystateSolution.Vel,\ - md.results.SteadystateSolution.Pressure,\ - md.results.SteadystateSolution.Temperature,\ - md.results.SteadystateSolution.BasalforcingsGroundediceMeltingRate,\ - ] +field_names = ['Vx', 'Vy', 'Vz', 'Vel', 'Pressure', 'Temperature', 'BasalforcingsGroundediceMeltingRate'] +field_tolerances = [5e-08, 1.6e-08, 5e-08, 5e-08, 1e-09, 6e-08, 5e-07] +field_values = [md.results.SteadystateSolution.Vx, + md.results.SteadystateSolution.Vy, + md.results.SteadystateSolution.Vz, + md.results.SteadystateSolution.Vel, + md.results.SteadystateSolution.Pressure, + md.results.SteadystateSolution.Temperature, + md.results.SteadystateSolution.BasalforcingsGroundediceMeltingRate] Index: /issm/trunk-jpl/test/NightlyRun/test509.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test509.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test509.py (revision 23793) @@ -9,24 +9,22 @@ -md=triangle(model(),'../Exp/Pig.exp',30000.) -md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp') -md=parameterize(md,'../Par/Pig.py') -md.extrude(3,1.) -md=setflowequation(md,'HO','all') -md.cluster=generic('name',gethostname(),'np',3) -md.timestepping.time_step=0. -md.thermal.penalty_threshold=7 -md=solve(md,'Steadystate') +md = triangle(model(), '../Exp/Pig.exp', 30000.) +md = setmask(md, '../Exp/PigShelves.exp', '../Exp/PigIslands.exp') +md = parameterize(md, '../Par/Pig.py') +md.extrude(3, 1.) +md = setflowequation(md, 'HO', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) +md.timestepping.time_step = 0. +md.thermal.penalty_threshold = 7 +md = solve(md, 'Steadystate') # Fields and tolerances to track changes -field_names =['Vx','Vy','Vz','Vel','Pressure','Temperature','BasalforcingsGroundediceMeltingRate'] -field_tolerances=[1e-09,1e-09,5e-08,5e-08,1e-09,5e-09,1e-06] -field_values=[\ - md.results.SteadystateSolution.Vx,\ - md.results.SteadystateSolution.Vy,\ - md.results.SteadystateSolution.Vz,\ - md.results.SteadystateSolution.Vel,\ - md.results.SteadystateSolution.Pressure,\ - md.results.SteadystateSolution.Temperature,\ - md.results.SteadystateSolution.BasalforcingsGroundediceMeltingRate,\ - ] +field_names = ['Vx', 'Vy', 'Vz', 'Vel', 'Pressure', 'Temperature', 'BasalforcingsGroundediceMeltingRate'] +field_tolerances = [1e-09, 1e-09, 5e-08, 5e-08, 1e-09, 5e-09, 1e-06] +field_values = [md.results.SteadystateSolution.Vx, + md.results.SteadystateSolution.Vy, + md.results.SteadystateSolution.Vz, + md.results.SteadystateSolution.Vel, + md.results.SteadystateSolution.Pressure, + md.results.SteadystateSolution.Temperature, + md.results.SteadystateSolution.BasalforcingsGroundediceMeltingRate] Index: /issm/trunk-jpl/test/NightlyRun/test510.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test510.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test510.py (revision 23793) @@ -9,23 +9,21 @@ -md=triangle(model(),'../Exp/Pig.exp',20000.) -md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp') -md=parameterize(md,'../Par/Pig.py') -md.extrude(2,1.) -md=setflowequation(md,'FS','all') -md.cluster=generic('name',gethostname(),'np',3) -md.timestepping.time_step=0. -md=solve(md,'Steadystate') +md = triangle(model(), '../Exp/Pig.exp', 20000.) +md = setmask(md, '../Exp/PigShelves.exp', '../Exp/PigIslands.exp') +md = parameterize(md, '../Par/Pig.py') +md.extrude(2, 1.) +md = setflowequation(md, 'FS', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) +md.timestepping.time_step = 0. +md = solve(md, 'Steadystate') # Fields and tolerances to track changes -field_names =['Vx','Vy','Vz','Vel','Pressure','Temperature','BasalforcingsGroundediceMeltingRate'] -field_tolerances=[1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-06] -field_values=[\ - md.results.SteadystateSolution.Vx,\ - md.results.SteadystateSolution.Vy,\ - md.results.SteadystateSolution.Vz,\ - md.results.SteadystateSolution.Vel,\ - md.results.SteadystateSolution.Pressure,\ - md.results.SteadystateSolution.Temperature,\ - md.results.SteadystateSolution.BasalforcingsGroundediceMeltingRate,\ - ] +field_names = ['Vx', 'Vy', 'Vz', 'Vel', 'Pressure', 'Temperature', 'BasalforcingsGroundediceMeltingRate'] +field_tolerances = [1e-08, 1e-08, 1e-08, 1e-08, 1e-08, 1e-08, 1e-06] +field_values = [md.results.SteadystateSolution.Vx, + md.results.SteadystateSolution.Vy, + md.results.SteadystateSolution.Vz, + md.results.SteadystateSolution.Vel, + md.results.SteadystateSolution.Pressure, + md.results.SteadystateSolution.Temperature, + md.results.SteadystateSolution.BasalforcingsGroundediceMeltingRate] Index: /issm/trunk-jpl/test/NightlyRun/test511.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test511.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test511.py (revision 23793) @@ -9,42 +9,40 @@ from solve import * -md=triangle(model(),'../Exp/Pig.exp',11000.) -md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp') -md=parameterize(md,'../Par/Pig.py') +md = triangle(model(), '../Exp/Pig.exp', 11000.) +md = setmask(md, '../Exp/PigShelves.exp', '../Exp/PigIslands.exp') +md = parameterize(md, '../Par/Pig.py') #impose hydrostatic equilibrium (required by Stokes) -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.) -md=setflowequation(md,'FS','all') -md=md.extract(md.mask.groundedice_levelset<0.) +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.) +md = setflowequation(md, 'FS', 'all') +md = md.extract(md.mask.groundedice_levelset < 0.) #control parameters -md.inversion.iscontrol=1 -md.inversion.control_parameters=['MaterialsRheologyBbar'] -md.inversion.min_parameters=10.**6*np.ones((md.mesh.numberofvertices,len(md.inversion.control_parameters))) -md.inversion.max_parameters=2.*10**9*np.ones((md.mesh.numberofvertices,len(md.inversion.control_parameters))) -md.inversion.nsteps=2 -md.inversion.cost_functions=[101] -md.inversion.cost_functions_coefficients=np.ones((md.mesh.numberofvertices,len(md.inversion.cost_functions))) -md.inversion.gradient_scaling=10.**8*np.ones((md.inversion.nsteps,len(md.inversion.control_parameters))) -md.inversion.maxiter_per_step=2.*np.ones((md.inversion.nsteps)) -md.inversion.step_threshold=0.99*np.ones((md.inversion.nsteps)) -md.inversion.vx_obs=md.initialization.vx -md.inversion.vy_obs=md.initialization.vy +md.inversion.iscontrol = 1 +md.inversion.control_parameters = ['MaterialsRheologyBbar'] +md.inversion.min_parameters = 10.**6 * np.ones((md.mesh.numberofvertices, len(md.inversion.control_parameters))) +md.inversion.max_parameters = 2. * 10**9 * np.ones((md.mesh.numberofvertices, len(md.inversion.control_parameters))) +md.inversion.nsteps = 2 +md.inversion.cost_functions = [101] +md.inversion.cost_functions_coefficients = np.ones((md.mesh.numberofvertices, len(md.inversion.cost_functions))) +md.inversion.gradient_scaling = 10.**8 * np.ones((md.inversion.nsteps, len(md.inversion.control_parameters))) +md.inversion.maxiter_per_step = 2. * np.ones((md.inversion.nsteps)) +md.inversion.step_threshold = 0.99 * np.ones((md.inversion.nsteps)) +md.inversion.vx_obs = md.initialization.vx +md.inversion.vy_obs = md.initialization.vy -md.cluster=generic('name',gethostname(),'np',1) -md=solve(md,'Stressbalance') +md.cluster = generic('name', gethostname(), 'np', 1) +md = solve(md, 'Stressbalance') #Fields and tolerances to track changes -field_names =['Gradient','Misfits','MaterialsRheologyB','Pressure','Vel','Vx','Vy'] -field_tolerances=[5e-11,5e-11,5e-11,1e-09,1e-11,5e-11,1e-11] -field_values=[ - md.results.StressbalanceSolution.Gradient1, - md.results.StressbalanceSolution.J, - md.results.StressbalanceSolution.MaterialsRheologyBbar, - md.results.StressbalanceSolution.Pressure, - md.results.StressbalanceSolution.Vel, - md.results.StressbalanceSolution.Vx, - md.results.StressbalanceSolution.Vy, -] +field_names = ['Gradient', 'Misfits', 'MaterialsRheologyB', 'Pressure', 'Vel', 'Vx', 'Vy'] +field_tolerances = [5e-11, 5e-11, 5e-11, 1e-09, 1e-11, 5e-11, 1e-11] +field_values = [md.results.StressbalanceSolution.Gradient1, + md.results.StressbalanceSolution.J, + md.results.StressbalanceSolution.MaterialsRheologyBbar, + md.results.StressbalanceSolution.Pressure, + md.results.StressbalanceSolution.Vel, + md.results.StressbalanceSolution.Vx, + md.results.StressbalanceSolution.Vy] Index: /issm/trunk-jpl/test/NightlyRun/test512.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test512.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test512.py (revision 23793) @@ -10,38 +10,37 @@ -md=triangle(model(),'../Exp/Pig.exp',20000.) -md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp') -md=parameterize(md,'../Par/Pig.py') -md.extrude(3,1.) -md=setflowequation(md,'HO','all') +md = triangle(model(), '../Exp/Pig.exp', 20000.) +md = setmask(md, '../Exp/PigShelves.exp', '../Exp/PigIslands.exp') +md = parameterize(md, '../Par/Pig.py') +md.extrude(3, 1.) +md = setflowequation(md, 'HO', 'all') # control parameters -md.inversion.iscontrol=1 -md.inversion.control_parameters=['FrictionCoefficient'] -md.inversion.min_parameters=1.*np.ones((md.mesh.numberofvertices,len(md.inversion.control_parameters))) -md.inversion.max_parameters=200.*np.ones((md.mesh.numberofvertices,len(md.inversion.control_parameters))) -md.inversion.nsteps=2 -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.gradient_scaling=3.*np.ones((md.inversion.nsteps,len(md.inversion.control_parameters))) -md.inversion.maxiter_per_step=2.*np.ones((md.inversion.nsteps)) -md.inversion.step_threshold=2.99*np.ones((md.inversion.nsteps)) -md.inversion.vx_obs=md.initialization.vx -md.inversion.vy_obs=md.initialization.vy -md.cluster=generic('name',gethostname(),'np',3) -md=solve(md,'Stressbalance') +md.inversion.iscontrol = 1 +md.inversion.control_parameters = ['FrictionCoefficient'] +md.inversion.min_parameters = 1. * np.ones((md.mesh.numberofvertices, len(md.inversion.control_parameters))) +md.inversion.max_parameters = 200. * np.ones((md.mesh.numberofvertices, len(md.inversion.control_parameters))) +md.inversion.nsteps = 2 +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.gradient_scaling = 3. * np.ones((md.inversion.nsteps, len(md.inversion.control_parameters))) +md.inversion.maxiter_per_step = 2. * np.ones((md.inversion.nsteps)) +md.inversion.step_threshold = 2.99 * np.ones((md.inversion.nsteps)) +md.inversion.vx_obs = md.initialization.vx +md.inversion.vy_obs = md.initialization.vy + +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'Stressbalance') # Fields and tolerances to track changes -field_names =['Gradient','Misfits','FrictionCoefficient','Pressure','Vel','Vx','Vy'] -field_tolerances=[1e-11,1e-11,1e-11,1e-11,1e-11,1e-11,1e-11,1e-11,1e-11,1e-11] -field_values=[\ - md.results.StressbalanceSolution.Gradient1,\ - md.results.StressbalanceSolution.J,\ - md.results.StressbalanceSolution.FrictionCoefficient,\ - md.results.StressbalanceSolution.Pressure,\ - md.results.StressbalanceSolution.Vel,\ - md.results.StressbalanceSolution.Vx,\ - md.results.StressbalanceSolution.Vy -] +field_names = ['Gradient', 'Misfits', 'FrictionCoefficient', 'Pressure', 'Vel', 'Vx', 'Vy'] +field_tolerances = [1e-11, 1e-11, 1e-11, 1e-11, 1e-11, 1e-11, 1e-11, 1e-11, 1e-11, 1e-11] +field_values = [md.results.StressbalanceSolution.Gradient1, + md.results.StressbalanceSolution.J, + md.results.StressbalanceSolution.FrictionCoefficient, + md.results.StressbalanceSolution.Pressure, + md.results.StressbalanceSolution.Vel, + md.results.StressbalanceSolution.Vx, + md.results.StressbalanceSolution.Vy] Index: /issm/trunk-jpl/test/NightlyRun/test513.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test513.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test513.py (revision 23793) @@ -9,43 +9,40 @@ -md=triangle(model(),'../Exp/Pig.exp',30000.) -md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp') -md=parameterize(md,'../Par/Pig.py') -md.extrude(3,1.) -md=setflowequation(md,'SSA','all') +md = triangle(model(), '../Exp/Pig.exp', 30000.) +md = setmask(md, '../Exp/PigShelves.exp', '../Exp/PigIslands.exp') +md = parameterize(md, '../Par/Pig.py') +md.extrude(3, 1.) +md = setflowequation(md, 'SSA', 'all') # control parameters -md.inversion.iscontrol=1 -md.inversion.control_parameters=['FrictionCoefficient'] -md.inversion.min_parameters=1.*np.ones((md.mesh.numberofvertices,len(md.inversion.control_parameters))) -md.inversion.max_parameters=200.*np.ones((md.mesh.numberofvertices,len(md.inversion.control_parameters))) -md.inversion.nsteps=2 -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.gradient_scaling=3.*np.ones((md.inversion.nsteps,len(md.inversion.control_parameters))) -md.inversion.maxiter_per_step=2.*np.ones((md.inversion.nsteps)) -md.inversion.step_threshold=0.99*np.ones((md.inversion.nsteps)) -md.inversion.vx_obs=md.initialization.vx -md.inversion.vy_obs=md.initialization.vy -md.timestepping.time_step=0. - -md.thermal.penalty_lock=5 -md.cluster=generic('name',gethostname(),'np',3) -md=solve(md,'Steadystate') +md.inversion.iscontrol = 1 +md.inversion.control_parameters = ['FrictionCoefficient'] +md.inversion.min_parameters = 1. * np.ones((md.mesh.numberofvertices, len(md.inversion.control_parameters))) +md.inversion.max_parameters = 200. * np.ones((md.mesh.numberofvertices, len(md.inversion.control_parameters))) +md.inversion.nsteps = 2 +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.gradient_scaling = 3. * np.ones((md.inversion.nsteps, len(md.inversion.control_parameters))) +md.inversion.maxiter_per_step = 2. * np.ones((md.inversion.nsteps)) +md.inversion.step_threshold = 0.99 * np.ones((md.inversion.nsteps)) +md.inversion.vx_obs = md.initialization.vx +md.inversion.vy_obs = md.initialization.vy +md.timestepping.time_step = 0. +md.thermal.penalty_lock = 5 +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'Steadystate') # Fields and tolerances to track changes -field_names =['Gradient','Misfits','FrictionCoefficient','Pressure','Vel','Vx','Vy','Vz','Temperature','BasalforcingsGroundediceMeltingRate'] -field_tolerances=[5e-08,4e-10,1e-10,1e-10,3e-6,4e-6,3.4e-6,3e-6,2e-6,2e-06] -field_values=[\ - md.results.SteadystateSolution.Gradient1,\ - md.results.SteadystateSolution.J,\ - md.results.SteadystateSolution.FrictionCoefficient,\ - md.results.SteadystateSolution.Pressure,\ - md.results.SteadystateSolution.Vel,\ - md.results.SteadystateSolution.Vx,\ - md.results.SteadystateSolution.Vy,\ - md.results.SteadystateSolution.Vz,\ - md.results.SteadystateSolution.Temperature,\ - md.results.SteadystateSolution.BasalforcingsGroundediceMeltingRate -] +field_names = ['Gradient', 'Misfits', 'FrictionCoefficient', 'Pressure', 'Vel', 'Vx', 'Vy', 'Vz', 'Temperature', 'BasalforcingsGroundediceMeltingRate'] +field_tolerances = [5e-08, 4e-10, 1e-10, 1e-10, 3e-6, 4e-6, 3.4e-6, 3e-6, 2e-6, 2e-06] +field_values = [md.results.SteadystateSolution.Gradient1, + md.results.SteadystateSolution.J, + md.results.SteadystateSolution.FrictionCoefficient, + md.results.SteadystateSolution.Pressure, + md.results.SteadystateSolution.Vel, + md.results.SteadystateSolution.Vx, + md.results.SteadystateSolution.Vy, + md.results.SteadystateSolution.Vz, + md.results.SteadystateSolution.Temperature, + md.results.SteadystateSolution.BasalforcingsGroundediceMeltingRate] Index: /issm/trunk-jpl/test/NightlyRun/test514.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test514.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test514.py (revision 23793) @@ -3,5 +3,4 @@ import copy from model import * -from socket import gethostname from bamg import * from setmask import * @@ -12,49 +11,49 @@ #Simple mesh 1 -hVertices=10000.*np.ones((27)) -hVertices[0:5]=1000. -md=bamg(model(),'domain','../Exp/Pig.exp','hmax',20000.,'hVertices',hVertices,'gradation',3.) -x1=md.mesh.x -y1=md.mesh.y +hVertices = 10000. * np.ones((27)) +hVertices[0:5] = 1000. +md = bamg(model(), 'domain', '../Exp/Pig.exp', 'hmax', 20000., 'hVertices', hVertices, 'gradation', 3.) +x1 = md.mesh.x +y1 = md.mesh.y #Simple mesh 2 -md=bamg(model(),'domain','../Exp/Pig.exp','hmax',10000.) -md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp') -md=parameterize(md,'../Par/Pig.py') -x2=md.mesh.x -y2=md.mesh.y +md = bamg(model(), 'domain', '../Exp/Pig.exp', 'hmax', 10000.) +md = setmask(md, '../Exp/PigShelves.exp', '../Exp/PigIslands.exp') +md = parameterize(md, '../Par/Pig.py') +x2 = md.mesh.x +y2 = md.mesh.y #refine existing mesh 1 -hessian=ComputeHessian(md.mesh.elements,md.mesh.x,md.mesh.y,md.inversion.vy_obs,'node') -metric=ComputeMetric(hessian,2./9.,1.,1000.,25.*10.**3,[]) -md.miscellaneous.dummy=metric -md2=bamg(copy.deepcopy(md),'metric',md.miscellaneous.dummy,'hmin',1000.,'hmax',20000.,'gradation',3.) -x3=md2.mesh.x -y3=md2.mesh.y +hessian = ComputeHessian(md.mesh.elements, md.mesh.x, md.mesh.y, md.inversion.vy_obs, 'node') +metric = ComputeMetric(hessian, 2. / 9., 1., 1000., 25. * 10.**3, []) +md.miscellaneous.dummy = metric +md2 = bamg(copy.deepcopy(md), 'metric', md.miscellaneous.dummy, 'hmin', 1000., 'hmax', 20000., 'gradation', 3.) +x3 = md2.mesh.x +y3 = md2.mesh.y #refine existing mesh 2 -md2=bamg(copy.deepcopy(md),'metric',md.miscellaneous.dummy,'hmin',1000.,'hmax',20000.,'gradation',3.,'anisomax',1.) -x4=md2.mesh.x -y4=md2.mesh.y +md2 = bamg(copy.deepcopy(md), 'metric', md.miscellaneous.dummy, 'hmin', 1000., 'hmax', 20000., 'gradation', 3., 'anisomax', 1.) +x4 = md2.mesh.x +y4 = md2.mesh.y #refine existing mesh 3 -hVertices=np.nan*np.ones((md.mesh.numberofvertices)) -hVertices[np.nonzero(md.mesh.vertexonboundary)]=500. -md2=bamg(copy.deepcopy(md),'metric',md.miscellaneous.dummy,'hmin',1000.,'hmax',20000.,'gradation',3.,'anisomax',1.,'hVertices',hVertices) -x5=md2.mesh.x -y5=md2.mesh.y +hVertices = np.nan * np.ones((md.mesh.numberofvertices)) +hVertices[np.nonzero(md.mesh.vertexonboundary)] = 500. +md2 = bamg(copy.deepcopy(md), 'metric', md.miscellaneous.dummy, 'hmin', 1000., 'hmax', 20000., 'gradation', 3., 'anisomax', 1., 'hVertices', hVertices) +x5 = md2.mesh.x +y5 = md2.mesh.y #refine existing mesh 4 -md2=bamg(copy.deepcopy(md),'field',md.inversion.vy_obs,'hmin',1000.,'hmax',20000.,'gradation',3.,'Hessiantype',0,'err',np.array([1.])) -x6=md2.mesh.x -y6=md2.mesh.y +md2 = bamg(copy.deepcopy(md), 'field', md.inversion.vy_obs, 'hmin', 1000., 'hmax', 20000., 'gradation', 3., 'Hessiantype', 0, 'err', np.array([1.])) +x6 = md2.mesh.x +y6 = md2.mesh.y #refine existing mesh 5 -md2=bamg(copy.deepcopy(md),'field',np.vstack((md.inversion.vy_obs,md.geometry.thickness)).T,'hmin',1000.,'hmax',20000.,'gradation',3.,'Hessiantype',1,'err',np.array([[10.,100.]])) -x7=md2.mesh.x -y7=md2.mesh.y +md2 = bamg(copy.deepcopy(md), 'field', np.vstack((md.inversion.vy_obs, md.geometry.thickness)).T, 'hmin', 1000., 'hmax', 20000., 'gradation', 3., 'Hessiantype', 1, 'err', np.array([[10., 100.]])) +x7 = md2.mesh.x +y7 = md2.mesh.y #Fields and tolerances to track changes -field_names =['x1','y1','x2','y2','x3','y3','x4','y4','x5','y5','x6','y6','x7','y7'] -field_tolerances = [2e-10,7e-10,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13] -field_values=[x1, y1,x2, y2, x3, y3, x4, y4, x5, y5, x6, y6, x7, y7] +field_names = ['x1', 'y1', 'x2', 'y2', 'x3', 'y3', 'x4', 'y4', 'x5', 'y5', 'x6', 'y6', 'x7', 'y7'] +field_tolerances = [2e-10, 7e-10, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13] +field_values = [x1, y1, x2, y2, x3, y3, x4, y4, x5, y5, x6, y6, x7, y7] Index: /issm/trunk-jpl/test/NightlyRun/test515.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test515.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test515.py (revision 23793) @@ -9,24 +9,24 @@ -md=triangle(model(),'../Exp/Pig.exp',30000.) -md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp') -md=parameterize(md,'../Par/Pig.py') -md.extrude(3,1.) -md=setflowequation(md,'HO','all') -md.thermal.stabilization=2 -md.cluster=generic('name',gethostname(),'np',3) -md.transient.isstressbalance=False -md.transient.ismasstransport=False -md.transient.issmb=True -md.transient.isthermal=True -md.transient.isgroundingline=False -md=solve(md,'Transient') +md = triangle(model(), '../Exp/Pig.exp', 30000.) +md = setmask(md, '../Exp/PigShelves.exp', '../Exp/PigIslands.exp') +md = parameterize(md, '../Par/Pig.py') +md.extrude(3, 1.) +md = setflowequation(md, 'HO', 'all') +md.thermal.stabilization = 2 +md.cluster = generic('name', gethostname(), 'np', 3) +md.transient.isstressbalance = False +md.transient.ismasstransport = False +md.transient.issmb = True +md.transient.isthermal = True +md.transient.isgroundingline = False +md = solve(md, 'Transient') # Fields and tolerances to track changes -field_names =['Temperature1','BasalforcingsGroundediceMeltingRate1', - 'Temperature2','BasalforcingsGroundediceMeltingRate2'] -field_tolerances=[1e-13,1e-8,1e-13,5e-8] -field_values=[md.results.TransientSolution[0].Temperature, - md.results.TransientSolution[0].BasalforcingsGroundediceMeltingRate, - md.results.TransientSolution[1].Temperature, - md.results.TransientSolution[1].BasalforcingsGroundediceMeltingRate] +field_names = ['Temperature1', 'BasalforcingsGroundediceMeltingRate1', + 'Temperature2', 'BasalforcingsGroundediceMeltingRate2'] +field_tolerances = [1e-13, 1e-8, 1e-13, 5e-8] +field_values = [md.results.TransientSolution[0].Temperature, + md.results.TransientSolution[0].BasalforcingsGroundediceMeltingRate, + md.results.TransientSolution[1].Temperature, + md.results.TransientSolution[1].BasalforcingsGroundediceMeltingRate] Index: /issm/trunk-jpl/test/NightlyRun/test516.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test516.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test516.py (revision 23793) @@ -1,4 +1,3 @@ #Test Name: PigTherSteaSUPG -import numpy as np from model import * from socket import gethostname @@ -10,20 +9,18 @@ from solve import * -md=triangle(model(),'../Exp/Pig.exp',30000.) -md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp') -md=parameterize(md,'../Par/Pig.py') -md.extrude(3,1.) -md=setflowequation(md,'HO','all') -md.thermal.stabilization=2 -md.cluster=generic('name',gethostname(),'np',3) -md.timestepping.time_step=0 -md.thermal.penalty_threshold=40 -md=solve(md,'Thermal') +md = triangle(model(), '../Exp/Pig.exp', 30000.) +md = setmask(md, '../Exp/PigShelves.exp', '../Exp/PigIslands.exp') +md = parameterize(md, '../Par/Pig.py') +md.extrude(3, 1.) +md = setflowequation(md, 'HO', 'all') +md.thermal.stabilization = 2 +md.cluster = generic('name', gethostname(), 'np', 3) +md.timestepping.time_step = 0 +md.thermal.penalty_threshold = 40 +md = solve(md, 'Thermal') #Fields and tolerances to track changes -field_names =['Temperature','BasalforcingsGroundediceMeltingRate'] -field_tolerances=[1e-11,1e-11] -field_values=[\ - md.results.ThermalSolution.Temperature,\ - md.results.ThermalSolution.BasalforcingsGroundediceMeltingRate,\ - ] +field_names = ['Temperature', 'BasalforcingsGroundediceMeltingRate'] +field_tolerances = [1e-11, 1e-11] +field_values = [md.results.ThermalSolution.Temperature, + md.results.ThermalSolution.BasalforcingsGroundediceMeltingRate] Index: /issm/trunk-jpl/test/NightlyRun/test530.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test530.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test530.py (revision 23793) @@ -9,17 +9,15 @@ -md=triangle(model(),'../Exp/Pig.exp',20000.) -md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp') -md=parameterize(md,'../Par/Pig.py') -md=setflowequation(md,'SSA','all') -md.cluster=generic('name',gethostname(),'np',3) -md=solve(md,'Balancevelocity') +md = triangle(model(), '../Exp/Pig.exp', 20000.) +md = setmask(md, '../Exp/PigShelves.exp', '../Exp/PigIslands.exp') +md = parameterize(md, '../Par/Pig.py') +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'Balancevelocity') # Fields and tolerances to track changes -field_names =['DrivingStressX','DrivingStressY','Vel'] -field_tolerances=[1e-13,1e-13,1e-13] -field_values=[\ - md.results.BalancevelocitySolution.DrivingStressX,\ - md.results.BalancevelocitySolution.DrivingStressY,\ - md.results.BalancevelocitySolution.Vel,\ - ] +field_names = ['DrivingStressX', 'DrivingStressY', 'Vel'] +field_tolerances = [1e-13, 1e-13, 1e-13] +field_values = [md.results.BalancevelocitySolution.DrivingStressX, + md.results.BalancevelocitySolution.DrivingStressY, + md.results.BalancevelocitySolution.Vel] Index: /issm/trunk-jpl/test/NightlyRun/test531.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test531.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test531.py (revision 23793) @@ -9,19 +9,17 @@ -md=triangle(model(),'../Exp/Pig.exp',20000.) -md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp') -md=parameterize(md,'../Par/Pig.py') -md.initialization.vx[:]=0. -md.initialization.vy[:]=0. -md=setflowequation(md,'SSA','all') -md.cluster=generic('name',gethostname(),'np',3) -md=solve(md,'Balancevelocity') +md = triangle(model(), '../Exp/Pig.exp', 20000.) +md = setmask(md, '../Exp/PigShelves.exp', '../Exp/PigIslands.exp') +md = parameterize(md, '../Par/Pig.py') +md.initialization.vx[:] = 0. +md.initialization.vy[:] = 0. +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'Balancevelocity') # Fields and tolerances to track changes -field_names =['DrivingStressX','DrivingStressY','Vel'] -field_tolerances=[1e-13,1e-13,1e-13] -field_values=[\ - md.results.BalancevelocitySolution.DrivingStressX,\ - md.results.BalancevelocitySolution.DrivingStressY,\ - md.results.BalancevelocitySolution.Vel,\ - ] +field_names = ['DrivingStressX', 'DrivingStressY', 'Vel'] +field_tolerances = [1e-13, 1e-13, 1e-13] +field_values = [md.results.BalancevelocitySolution.DrivingStressX, + md.results.BalancevelocitySolution.DrivingStressY, + md.results.BalancevelocitySolution.Vel] Index: /issm/trunk-jpl/test/NightlyRun/test540.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test540.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test540.py (revision 23793) @@ -9,8 +9,8 @@ from calvingvonmises import * -md = triangle(model(),'../Exp/Pig.exp',10000.) -md = setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp') -md = parameterize(md,'../Par/Pig.py') -md = setflowequation(md,'SSA','all') +md = triangle(model(), '../Exp/Pig.exp', 10000.) +md = setmask(md, '../Exp/PigShelves.exp', '../Exp/PigIslands.exp') +md = parameterize(md, '../Par/Pig.py') +md = setflowequation(md, 'SSA', 'all') md.timestepping.time_step = 2 md.timestepping.final_time = 50 @@ -26,43 +26,37 @@ #Force MUMPS sequential analysis -md.toolkits.DefaultAnalysis.mat_mumps_icntl_28=1 -md.cluster = generic('name',gethostname(),'np',2) -md = solve(md,'Transient') +md.toolkits.DefaultAnalysis.mat_mumps_icntl_28 = 1 +md.cluster = generic('name', gethostname(), 'np', 2) +md = solve(md, 'Transient') #Fields and tolerances to track changes -field_names = [ - 'Vx1' ,'Vy1' ,'Vel1' ,'Pressure1' ,'Bed1' ,'Surface1' ,'Thickness1' ,'MaskIceLevelset1' , - 'Vx2' ,'Vy2' ,'Vel2' ,'Pressure2' ,'Bed2' ,'Surface2' ,'Thickness2' ,'MaskIceLevelset2' , - 'Vx10','Vy10','Vel10','Pressure10','Bed10','Surface10','Thickness10','MaskIceLevelset10', - ] -field_tolerances = [ - 1e-12,2e-12,2e-12,1e-13,1e-13,1e-13,1e-13,1e-13, - 1e-12,1e-12,1e-12,1e-13,1e-13,1e-13,1e-13,1e-12, - 1e-11,1e-11,1e-11,1e-11,1e-11,1e-11,1e-11,1e-9, - ] -field_values = [ - md.results.TransientSolution[0].Vx, - md.results.TransientSolution[0].Vy, - md.results.TransientSolution[0].Vel, - md.results.TransientSolution[0].Pressure, - md.results.TransientSolution[0].Base, - md.results.TransientSolution[0].Surface, - md.results.TransientSolution[0].Thickness, - md.results.TransientSolution[0].MaskIceLevelset, - md.results.TransientSolution[1].Vx, - md.results.TransientSolution[1].Vy, - md.results.TransientSolution[1].Vel, - md.results.TransientSolution[1].Pressure, - md.results.TransientSolution[1].Base, - md.results.TransientSolution[1].Surface, - md.results.TransientSolution[1].Thickness, - md.results.TransientSolution[1].MaskIceLevelset, - md.results.TransientSolution[9].Vx, - md.results.TransientSolution[9].Vy, - md.results.TransientSolution[9].Vel, - md.results.TransientSolution[9].Pressure, - md.results.TransientSolution[9].Base, - md.results.TransientSolution[9].Surface, - md.results.TransientSolution[9].Thickness, - md.results.TransientSolution[9].MaskIceLevelset, - ] +field_names = ['Vx1', 'Vy1', 'Vel1', 'Pressure1', 'Bed1', 'Surface1', 'Thickness1', 'MaskIceLevelset1', + 'Vx2', 'Vy2', 'Vel2', 'Pressure2', 'Bed2', 'Surface2', 'Thickness2', 'MaskIceLevelset2', + 'Vx10', 'Vy10', 'Vel10', 'Pressure10', 'Bed10', 'Surface10', 'Thickness10', 'MaskIceLevelset10'] +field_tolerances = [1e-12, 2e-12, 2e-12, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, + 1e-12, 1e-12, 1e-12, 1e-13, 1e-13, 1e-13, 1e-13, 1e-12, + 1e-11, 1e-11, 1e-11, 1e-11, 1e-11, 1e-11, 1e-11, 1e-9] +field_values = [md.results.TransientSolution[0].Vx, + md.results.TransientSolution[0].Vy, + md.results.TransientSolution[0].Vel, + md.results.TransientSolution[0].Pressure, + md.results.TransientSolution[0].Base, + md.results.TransientSolution[0].Surface, + md.results.TransientSolution[0].Thickness, + md.results.TransientSolution[0].MaskIceLevelset, + md.results.TransientSolution[1].Vx, + md.results.TransientSolution[1].Vy, + md.results.TransientSolution[1].Vel, + md.results.TransientSolution[1].Pressure, + md.results.TransientSolution[1].Base, + md.results.TransientSolution[1].Surface, + md.results.TransientSolution[1].Thickness, + md.results.TransientSolution[1].MaskIceLevelset, + md.results.TransientSolution[9].Vx, + md.results.TransientSolution[9].Vy, + md.results.TransientSolution[9].Vel, + md.results.TransientSolution[9].Pressure, + md.results.TransientSolution[9].Base, + md.results.TransientSolution[9].Surface, + md.results.TransientSolution[9].Thickness, + md.results.TransientSolution[9].MaskIceLevelset] Index: /issm/trunk-jpl/test/NightlyRun/test541.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test541.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test541.py (revision 23793) @@ -9,9 +9,9 @@ from calvingvonmises import * -md = triangle(model(),'../Exp/Pig.exp',10000.) -md = setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp') -md = parameterize(md,'../Par/Pig.py') -md.extrude(5,1.) -md = setflowequation(md,'HO','all') +md = triangle(model(), '../Exp/Pig.exp', 10000.) +md = setmask(md, '../Exp/PigShelves.exp', '../Exp/PigIslands.exp') +md = parameterize(md, '../Par/Pig.py') +md.extrude(5, 1.) +md = setflowequation(md, 'HO', 'all') md.timestepping.time_step = 2 md.timestepping.final_time = 50 @@ -27,43 +27,37 @@ #Force MUMPS sequential analysis -md.toolkits.DefaultAnalysis.mat_mumps_icntl_28=1 -md.cluster = generic('name',gethostname(),'np',2) -md = solve(md,'Transient') +md.toolkits.DefaultAnalysis.mat_mumps_icntl_28 = 1 +md.cluster = generic('name', gethostname(), 'np', 2) +md = solve(md, 'Transient') #Fields and tolerances to track changes -field_names = [ - 'Vx1' ,'Vy1' ,'Vel1' ,'Pressure1' ,'Bed1' ,'Surface1' ,'Thickness1' ,'MaskIceLevelset1' , - 'Vx2' ,'Vy2' ,'Vel2' ,'Pressure2' ,'Bed2' ,'Surface2' ,'Thickness2' ,'MaskIceLevelset2' , - 'Vx10','Vy10','Vel10','Pressure10','Bed10','Surface10','Thickness10','MaskIceLevelset10', - ] -field_tolerances = [ - 1e-11,2e-11,2e-11,1e-12,2e-11,6e-12,9e-12,1e-12, - 2e-11,1e-11,1e-11,9e-12,2e-1,2e-11,2e-11,1e-11, - 2e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-9, - ] -field_values = [ - md.results.TransientSolution[0].Vx, - md.results.TransientSolution[0].Vy, - md.results.TransientSolution[0].Vel, - md.results.TransientSolution[0].Pressure, - md.results.TransientSolution[0].Base, - md.results.TransientSolution[0].Surface, - md.results.TransientSolution[0].Thickness, - md.results.TransientSolution[0].MaskIceLevelset, - md.results.TransientSolution[1].Vx, - md.results.TransientSolution[1].Vy, - md.results.TransientSolution[1].Vel, - md.results.TransientSolution[1].Pressure, - md.results.TransientSolution[1].Base, - md.results.TransientSolution[1].Surface, - md.results.TransientSolution[1].Thickness, - md.results.TransientSolution[1].MaskIceLevelset, - md.results.TransientSolution[9].Vx, - md.results.TransientSolution[9].Vy, - md.results.TransientSolution[9].Vel, - md.results.TransientSolution[9].Pressure, - md.results.TransientSolution[9].Base, - md.results.TransientSolution[9].Surface, - md.results.TransientSolution[9].Thickness, - md.results.TransientSolution[9].MaskIceLevelset, - ] +field_names = ['Vx1', 'Vy1', 'Vel1', 'Pressure1', 'Bed1', 'Surface1', 'Thickness1', 'MaskIceLevelset1', + 'Vx2', 'Vy2', 'Vel2', 'Pressure2', 'Bed2', 'Surface2', 'Thickness2', 'MaskIceLevelset2', + 'Vx10', 'Vy10', 'Vel10', 'Pressure10', 'Bed10', 'Surface10', 'Thickness10', 'MaskIceLevelset10'] +field_tolerances = [1e-11, 2e-11, 2e-11, 1e-12, 2e-11, 6e-12, 9e-12, 1e-12, + 2e-11, 1e-11, 1e-11, 9e-12, 2e-1, 2e-11, 2e-11, 1e-11, + 2e-10, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10, 1e-9] +field_values = [md.results.TransientSolution[0].Vx, + md.results.TransientSolution[0].Vy, + md.results.TransientSolution[0].Vel, + md.results.TransientSolution[0].Pressure, + md.results.TransientSolution[0].Base, + md.results.TransientSolution[0].Surface, + md.results.TransientSolution[0].Thickness, + md.results.TransientSolution[0].MaskIceLevelset, + md.results.TransientSolution[1].Vx, + md.results.TransientSolution[1].Vy, + md.results.TransientSolution[1].Vel, + md.results.TransientSolution[1].Pressure, + md.results.TransientSolution[1].Base, + md.results.TransientSolution[1].Surface, + md.results.TransientSolution[1].Thickness, + md.results.TransientSolution[1].MaskIceLevelset, + md.results.TransientSolution[9].Vx, + md.results.TransientSolution[9].Vy, + md.results.TransientSolution[9].Vel, + md.results.TransientSolution[9].Pressure, + md.results.TransientSolution[9].Base, + md.results.TransientSolution[9].Surface, + md.results.TransientSolution[9].Thickness, + md.results.TransientSolution[9].MaskIceLevelset] Index: /issm/trunk-jpl/test/NightlyRun/test601.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test601.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test601.py (revision 23793) @@ -9,13 +9,13 @@ from solve import * -md=triangle(model(),'../Exp/79North.exp',10000.) -md=setmask(md,'../Exp/79NorthShelf.exp','') -md=parameterize(md,'../Par/79North.py') -md=setflowequation(md,'SSA','all') -md.cluster=generic('name',gethostname(),'np',3) -md=solve(md,'Masstransport') +md = triangle(model(), '../Exp/79North.exp', 10000.) +md = setmask(md, '../Exp/79NorthShelf.exp', '') +md = parameterize(md, '../Par/79North.py') +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'Masstransport') #Fields and tolerances to track changes -field_names =['Thickness'] -field_tolerances=[1e-13] -field_values=[md.results.MasstransportSolution.Thickness] +field_names = ['Thickness'] +field_tolerances = [1e-13] +field_values = [md.results.MasstransportSolution.Thickness] Index: /issm/trunk-jpl/test/NightlyRun/test602.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test602.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test602.py (revision 23793) @@ -1,4 +1,3 @@ #Test Name: 79NorthMasstransp2dDG -import numpy as np from model import * from socket import gethostname @@ -11,18 +10,16 @@ from solve import * -md=triangle(model(),'../Exp/79North.exp',10000.) -md=meshconvert(md) -md=setmask(md,'../Exp/79NorthShelf.exp','') -md=parameterize(md,'../Par/79North.py') -md=setflowequation(md,'SSA','all') -md.masstransport.stabilization=3 -md.masstransport.spcthickness=md.geometry.thickness -md.cluster=generic('name',gethostname(),'np',3) -md=solve(md,'Masstransport') +md = triangle(model(), '../Exp/79North.exp', 10000.) +md = meshconvert(md) +md = setmask(md, '../Exp/79NorthShelf.exp', '') +md = parameterize(md, '../Par/79North.py') +md = setflowequation(md, 'SSA', 'all') +md.masstransport.stabilization = 3 +md.masstransport.spcthickness = md.geometry.thickness +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'Masstransport') #Fields and tolerances to track changes -field_names =['Thickness'] -field_tolerances=[1e-13] -field_values=[\ - md.results.MasstransportSolution.Thickness,\ - ] +field_names = ['Thickness'] +field_tolerances = [1e-13] +field_values = [md.results.MasstransportSolution.Thickness] Index: /issm/trunk-jpl/test/NightlyRun/test603.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test603.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test603.py (revision 23793) @@ -1,4 +1,3 @@ #Test Name: 79NorthMasstransp3d -import numpy as np from model import * from socket import gethostname @@ -10,16 +9,14 @@ from solve import * -md=triangle(model(),'../Exp/79North.exp',10000.) -md=setmask(md,'../Exp/79NorthShelf.exp','') -md=parameterize(md,'../Par/79North.py') -md.extrude(6,1.) -md=setflowequation(md,'SSA','all') -md.cluster=generic('name',gethostname(),'np',3) -md=solve(md,'Masstransport') +md = triangle(model(), '../Exp/79North.exp', 10000.) +md = setmask(md, '../Exp/79NorthShelf.exp', '') +md = parameterize(md, '../Par/79North.py') +md.extrude(6, 1.) +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'Masstransport') #Fields and tolerances to track changes -field_names =['Thickness'] -field_tolerances=[1e-13] -field_values=[\ - md.results.MasstransportSolution.Thickness,\ - ] +field_names = ['Thickness'] +field_tolerances = [1e-13] +field_values = [md.results.MasstransportSolution.Thickness] Index: /issm/trunk-jpl/test/NightlyRun/test604.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test604.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test604.py (revision 23793) @@ -1,4 +1,3 @@ #Test Name: 79NorthSurfSlop2d -import numpy as np from model import * from socket import gethostname @@ -10,16 +9,14 @@ from solve import * -md=triangle(model(),'../Exp/79North.exp',10000.) -md=setmask(md,'../Exp/79NorthShelf.exp','') -md=parameterize(md,'../Par/79North.py') -md=setflowequation(md,'SSA','all') -md.cluster=generic('name',gethostname(),'np',3) -md=solve(md,'SurfaceSlope') +md = triangle(model(), '../Exp/79North.exp', 10000.) +md = setmask(md, '../Exp/79NorthShelf.exp', '') +md = parameterize(md, '../Par/79North.py') +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'SurfaceSlope') #Fields and tolerances to track changes -field_names =['SurfaceSlopeX','SurfaceSlopeY'] -field_tolerances=[1e-13,1e-13] -field_values=[\ - md.results.SurfaceSlopeSolution.SurfaceSlopeX,\ - md.results.SurfaceSlopeSolution.SurfaceSlopeY,\ - ] +field_names = ['SurfaceSlopeX', 'SurfaceSlopeY'] +field_tolerances = [1e-13, 1e-13] +field_values = [md.results.SurfaceSlopeSolution.SurfaceSlopeX, + md.results.SurfaceSlopeSolution.SurfaceSlopeY] Index: /issm/trunk-jpl/test/NightlyRun/test605.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test605.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test605.py (revision 23793) @@ -1,4 +1,3 @@ #Test Name: 79NorthSurfSlop3d -import numpy as np from model import * from socket import gethostname @@ -10,17 +9,15 @@ from solve import * -md=triangle(model(),'../Exp/79North.exp',10000.) -md=setmask(md,'../Exp/79NorthShelf.exp','') -md=parameterize(md,'../Par/79North.py') -md.extrude(5,1.5) -md=setflowequation(md,'HO','all') -md.cluster=generic('name',gethostname(),'np',3) -md=solve(md,'SurfaceSlope') +md = triangle(model(), '../Exp/79North.exp', 10000.) +md = setmask(md, '../Exp/79NorthShelf.exp', '') +md = parameterize(md, '../Par/79North.py') +md.extrude(5, 1.5) +md = setflowequation(md, 'HO', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'SurfaceSlope') #Fields and tolerances to track changes -field_names =['SurfaceSlopeX','SurfaceSlopeY'] -field_tolerances=[1e-13,1e-13] -field_values=[\ - md.results.SurfaceSlopeSolution.SurfaceSlopeX,\ - md.results.SurfaceSlopeSolution.SurfaceSlopeY,\ - ] +field_names = ['SurfaceSlopeX', 'SurfaceSlopeY'] +field_tolerances = [1e-13, 1e-13] +field_values = [md.results.SurfaceSlopeSolution.SurfaceSlopeX, + md.results.SurfaceSlopeSolution.SurfaceSlopeY] Index: /issm/trunk-jpl/test/NightlyRun/test606.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test606.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test606.py (revision 23793) @@ -1,4 +1,3 @@ #Test Name: 79NorthBedSlop2d -import numpy as np from model import * from socket import gethostname @@ -10,16 +9,14 @@ from solve import * -md=triangle(model(),'../Exp/79North.exp',10000.) -md=setmask(md,'../Exp/79NorthShelf.exp','') -md=parameterize(md,'../Par/79North.py') -md=setflowequation(md,'SSA','all') -md.cluster=generic('name',gethostname(),'np',3) -md=solve(md,'BedSlope') +md = triangle(model(), '../Exp/79North.exp', 10000.) +md = setmask(md, '../Exp/79NorthShelf.exp', '') +md = parameterize(md, '../Par/79North.py') +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'BedSlope') #Fields and tolerances to track changes -field_names =['BedSlopeX','BedSlopeY'] -field_tolerances=[1e-13,1e-13] -field_values=[\ - md.results.BedSlopeSolution.BedSlopeX,\ - md.results.BedSlopeSolution.BedSlopeY,\ - ] +field_names = ['BedSlopeX', 'BedSlopeY'] +field_tolerances = [1e-13, 1e-13] +field_values = [md.results.BedSlopeSolution.BedSlopeX, + md.results.BedSlopeSolution.BedSlopeY] Index: /issm/trunk-jpl/test/NightlyRun/test607.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test607.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test607.py (revision 23793) @@ -1,7 +1,5 @@ #Test Name: 79NorthBedSlop3d -import numpy as np from model import * from socket import gethostname - from triangle import * from setmask import * @@ -10,17 +8,15 @@ from solve import * -md=triangle(model(),'../Exp/79North.exp',10000.) -md=setmask(md,'../Exp/79NorthShelf.exp','') -md=parameterize(md,'../Par/79North.py') -md.extrude(2,1.) -md=setflowequation(md,'SSA','all') -md.cluster=generic('name',gethostname(),'np',3) -md=solve(md,'BedSlope') +md = triangle(model(), '../Exp/79North.exp', 10000.) +md = setmask(md, '../Exp/79NorthShelf.exp', '') +md = parameterize(md, '../Par/79North.py') +md.extrude(2, 1.) +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'BedSlope') #Fields and tolerances to track changes -field_names =['BedSlopeX','BedSlopeY'] -field_tolerances=[1e-13,1e-13] -field_values=[\ - md.results.BedSlopeSolution.BedSlopeX,\ - md.results.BedSlopeSolution.BedSlopeY,\ - ] +field_names = ['BedSlopeX', 'BedSlopeY'] +field_tolerances = [1e-13, 1e-13] +field_values = [md.results.BedSlopeSolution.BedSlopeX, + md.results.BedSlopeSolution.BedSlopeY] Index: /issm/trunk-jpl/test/NightlyRun/test608.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test608.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test608.py (revision 23793) @@ -1,4 +1,3 @@ #Test Name: 79NorthBalThic2d -import numpy as np from model import * from socket import gethostname @@ -10,15 +9,13 @@ from solve import * -md=triangle(model(),'../Exp/79North.exp',10000.) -md=setmask(md,'../Exp/79NorthShelf.exp','') -md=parameterize(md,'../Par/79North.py') -md=setflowequation(md,'SSA','all') -md.cluster=generic('name',gethostname(),'np',3) -md=solve(md,'Balancethickness') +md = triangle(model(), '../Exp/79North.exp', 10000.) +md = setmask(md, '../Exp/79NorthShelf.exp', '') +md = parameterize(md, '../Par/79North.py') +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'Balancethickness') #Fields and tolerances to track changes -field_names =['Thickness'] -field_tolerances=[1e-12] -field_values=[\ - md.results.BalancethicknessSolution.Thickness,\ - ] +field_names = ['Thickness'] +field_tolerances = [1e-12] +field_values = [md.results.BalancethicknessSolution.Thickness] Index: /issm/trunk-jpl/test/NightlyRun/test611.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test611.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test611.py (revision 23793) @@ -3,5 +3,4 @@ from model import * from socket import gethostname - from triangle import * from setmask import * @@ -10,31 +9,31 @@ from solve import * -md=triangle(model(),'../Exp/79North.exp',10000.) -md=setmask(md,'../Exp/79NorthShelf.exp','') -md=parameterize(md,'../Par/79North.py') -md=setflowequation(md,'SSA','all') +md = triangle(model(), '../Exp/79North.exp', 10000.) +md = setmask(md, '../Exp/79NorthShelf.exp', '') +md = parameterize(md, '../Par/79North.py') +md = setflowequation(md, 'SSA', 'all') #control parameters -md.inversion.nsteps=2 -md.masstransport.stabilization=1 -md.inversion.iscontrol=1 -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.max_parameters=50.*np.ones((md.mesh.numberofvertices,len(md.inversion.control_parameters))) -md.inversion.cost_functions=[201] -md.inversion.cost_functions_coefficients=np.ones((md.mesh.numberofvertices,len(md.inversion.cost_functions))) -md.inversion.gradient_scaling=10./md.constants.yts*np.ones((md.inversion.nsteps,len(md.inversion.control_parameters))) -md.inversion.maxiter_per_step=4*np.ones((md.inversion.nsteps)) -md.inversion.step_threshold=0.99*np.ones((md.inversion.nsteps)) +md.inversion.nsteps = 2 +md.masstransport.stabilization = 1 +md.inversion.iscontrol = 1 +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.max_parameters = 50. * np.ones((md.mesh.numberofvertices, len(md.inversion.control_parameters))) +md.inversion.cost_functions = [201] +md.inversion.cost_functions_coefficients = np.ones((md.mesh.numberofvertices, len(md.inversion.cost_functions))) +md.inversion.gradient_scaling = 10. / md.constants.yts * np.ones((md.inversion.nsteps, len(md.inversion.control_parameters))) +md.inversion.maxiter_per_step = 4 * np.ones((md.inversion.nsteps)) +md.inversion.step_threshold = 0.99 * np.ones((md.inversion.nsteps)) -md.cluster=generic('name',gethostname(),'np',3) -md=solve(md,'Balancethickness') +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'Balancethickness') #Fields and tolerances to track changes -field_names =['Gradient','Misfits','BalancethicknessThickeningRate','Thickness'] -field_tolerances=[1e-12,1e-12,1e-12,1e-12,1e-12,1e-12] -field_values=[md.results.BalancethicknessSolution.Gradient1, - md.results.BalancethicknessSolution.J, - md.results.BalancethicknessSolution.BalancethicknessThickeningRate, - md.results.BalancethicknessSolution.Thickness] +field_names = ['Gradient', 'Misfits', 'BalancethicknessThickeningRate', 'Thickness'] +field_tolerances = [1e-12, 1e-12, 1e-12, 1e-12, 1e-12, 1e-12] +field_values = [md.results.BalancethicknessSolution.Gradient1, + md.results.BalancethicknessSolution.J, + md.results.BalancethicknessSolution.BalancethicknessThickeningRate, + md.results.BalancethicknessSolution.Thickness] Index: /issm/trunk-jpl/test/NightlyRun/test613.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test613.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test613.py (revision 23793) @@ -12,40 +12,40 @@ -md=triangle(model(),'../Exp/79North.exp',10000.) -md=meshconvert(md) -md=setmask(md,'../Exp/79NorthShelf.exp','') -md=parameterize(md,'../Par/79North.py') -md=setflowequation(md,'SSA','all') +md = triangle(model(), '../Exp/79North.exp', 10000.) +md = meshconvert(md) +md = setmask(md, '../Exp/79NorthShelf.exp', '') +md = parameterize(md, '../Par/79North.py') +md = setflowequation(md, 'SSA', 'all') #Ice sheet only -md=model.extract(md,md.mask.groundedice_levelset>0.) -pos=np.nonzero(md.mesh.vertexonboundary) -md.balancethickness.spcthickness[pos]=md.geometry.thickness[pos] +md = model.extract(md, md.mask.groundedice_levelset > 0.) +pos = np.nonzero(md.mesh.vertexonboundary) +md.balancethickness.spcthickness[pos] = md.geometry.thickness[pos] #control parameters -md.inversion.thickness_obs=copy.deepcopy(md.geometry.thickness) -md.inversion.iscontrol=1 -md.inversion.nsteps=2 -md.inversion.control_parameters=['Vx','Vy'] -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.cost_functions=[201] -md.inversion.cost_functions_coefficients=np.ones((md.mesh.numberofvertices,len(md.inversion.cost_functions))) -md.inversion.maxiter_per_step=4*np.ones((md.inversion.nsteps)) -md.inversion.step_threshold=0.99*np.ones((md.inversion.nsteps)) +md.inversion.thickness_obs = copy.deepcopy(md.geometry.thickness) +md.inversion.iscontrol = 1 +md.inversion.nsteps = 2 +md.inversion.control_parameters = ['Vx', 'Vy'] +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.cost_functions = [201] +md.inversion.cost_functions_coefficients = np.ones((md.mesh.numberofvertices, len(md.inversion.cost_functions))) +md.inversion.maxiter_per_step = 4 * np.ones((md.inversion.nsteps)) +md.inversion.step_threshold = 0.99 * np.ones((md.inversion.nsteps)) -md.verbose.control=1 -md.cluster=generic('name',gethostname(),'np',3) -md=solve(md,'Balancethickness') +md.verbose.control = 1 +md.cluster = generic('name', gethostname(), 'np', 3) +md = solve(md, 'Balancethickness') #Fields and tolerances to track changes -field_names =['Gradient1','Gradient2','Misfits','Vx','Vy','Thickness'] -field_tolerances=[1e-12,1e-12,1e-12,1e-12,1e-12,1e-12] -field_values=[md.results.BalancethicknessSolution.Gradient1, - md.results.BalancethicknessSolution.Gradient2, - md.results.BalancethicknessSolution.J, - md.results.BalancethicknessSolution.Vx, - md.results.BalancethicknessSolution.Vy, - md.results.BalancethicknessSolution.Thickness] +field_names = ['Gradient1', 'Gradient2', 'Misfits', 'Vx', 'Vy', 'Thickness'] +field_tolerances = [1e-12, 1e-12, 1e-12, 1e-12, 1e-12, 1e-12] +field_values = [md.results.BalancethicknessSolution.Gradient1, + md.results.BalancethicknessSolution.Gradient2, + md.results.BalancethicknessSolution.J, + md.results.BalancethicknessSolution.Vx, + md.results.BalancethicknessSolution.Vy, + md.results.BalancethicknessSolution.Thickness] Index: /issm/trunk-jpl/test/NightlyRun/test701.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test701.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test701.py (revision 23793) @@ -7,14 +7,14 @@ from paterson import * -x = np.arange(1,3001,100).T -h = np.linspace(1000,300,np.size(x)).T -b = -917./1023.*h +x = np.arange(1, 3001, 100).T +h = np.linspace(1000, 300, np.size(x)).T +b = -917. / 1023. * h -md = bamgflowband(model(),x,b+h,b,'hmax',80.) +md = bamgflowband(model(), x, b + h, b, 'hmax', 80.) -#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) -md.geometry.thickness = md.geometry.surface-md.geometry.base +#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) +md.geometry.thickness = md.geometry.surface - md.geometry.base #mask @@ -24,7 +24,7 @@ #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 @@ -35,6 +35,6 @@ #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.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,)) @@ -42,8 +42,8 @@ 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 -md = setflowequation(md,'FS','all') +md = setflowequation(md, 'FS', 'all') md.stressbalance.abstol = np.nan #md.stressbalance.reltol = 10**-16 @@ -51,8 +51,8 @@ md.stressbalance.maxiter = 20 md.flowequation.augmented_lagrangian_r = 10000. -md.miscellaneous.name = 'test701' -md.verbose = verbose('convergence',True) -md.cluster = generic('np',2) -md.groundingline.migration='None' +md.miscellaneous.name = 'test701' +md.verbose = verbose('convergence', True) +md.cluster = generic('np', 2) +md.groundingline.migration = 'None' #Go solve @@ -61,13 +61,13 @@ field_values = [] #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=====') - md.flowequation.fe_FS = i - md = solve(md,'Stressbalance') - field_names = field_names + [['Vx'+i],['Vy'+i],['Vel'+i],['Pressure'+i]] - field_tolerances = field_tolerances + [9e-5,9e-5,9e-5,1e-10] - field_values = field_values + [md.results.StressbalanceSolution.Vx, - md.results.StressbalanceSolution.Vy, - md.results.StressbalanceSolution.Vel, - md.results.StressbalanceSolution.Pressure] +for i in ['MINI', 'MINIcondensed', 'TaylorHood', 'LATaylorHood', 'CrouzeixRaviart', 'LACrouzeixRaviart']: + print(' ') + print('======Testing ' + i + ' Full-Stokes Finite element=====') + md.flowequation.fe_FS = i + md = solve(md, 'Stressbalance') + field_names = field_names + [['Vx' + i], ['Vy' + i], ['Vel' + i], ['Pressure' + i]] + field_tolerances = field_tolerances + [9e-5, 9e-5, 9e-5, 1e-10] + field_values = field_values + [md.results.StressbalanceSolution.Vx, + md.results.StressbalanceSolution.Vy, + md.results.StressbalanceSolution.Vel, + md.results.StressbalanceSolution.Pressure] Index: /issm/trunk-jpl/test/NightlyRun/test702.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test702.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test702.py (revision 23793) @@ -2,7 +2,7 @@ import numpy as np #from scipy.interpolate import interp1d -from model import * -from setflowequation import * -from solve import * +from model import * +from setflowequation import * +from solve import * from NowickiProfile import * from bamgflowband import * @@ -10,16 +10,16 @@ #mesh parameters -x = np.arange(-5,5.5,.5).T -[b,h,sea] = NowickiProfile(x) +x = np.arange(-5, 5.5, .5).T +[b, h, sea] = NowickiProfile(x) x = x * 10**3 h = h * 10**3 -b = (b-sea) * 10**3 +b = (b - sea) * 10**3 #mesh domain -md = bamgflowband(model(),x,b+h,b,'hmax',150.) +md = bamgflowband(model(), x, b + h, b, 'hmax', 150.) #parameterize -md.geometry.surface = np.interp(md.mesh.x,x,b+h) -md.geometry.base = np.interp(md.mesh.x,x,b) +md.geometry.surface = np.interp(md.mesh.x, x, b + h) +md.geometry.base = np.interp(md.mesh.x, x, b) md.geometry.thickness = md.geometry.surface - md.geometry.base @@ -27,6 +27,6 @@ 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[np.where(md.mesh.x<0)]=0.5 +md.mask.groundedice_levelset = -0.5 * np.ones((md.mesh.numberofvertices)) +md.mask.groundedice_levelset[np.where(md.mesh.x < 0)] = 0.5 #materials @@ -49,12 +49,12 @@ 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.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 -md = setflowequation(md,'FS','all') +md = setflowequation(md, 'FS', 'all') md.stressbalance.abstol = float('NaN') md.stressbalance.FSreconditioning = 1 @@ -65,5 +65,5 @@ md.miscellaneous.name = 'test702' md.groundingline.migration = 'None' -md.cluster = generic('np',2) +md.cluster = generic('np', 2) #Fields and tolerances to track changes @@ -71,15 +71,13 @@ field_tolerances = [] field_values = [] -for i in ['MINI','MINIcondensed','TaylorHood','XTaylorHood','LATaylorHood']: - print(' ') - print('======Testing ' +i+ ' Full-Stokes Finite element=====') - md.flowequation.fe_FS = i - md = solve(md,'Stressbalance') - field_names.extend(['Vx'+i,'Vy'+i,'Vel'+i,'Pressure'+i]) - field_tolerances.extend([8e-5,8e-5,8e-5,1e-08]) - field_values.extend([ - md.results.StressbalanceSolution.Vx, - md.results.StressbalanceSolution.Vy, - md.results.StressbalanceSolution.Vel, - md.results.StressbalanceSolution.Pressure - ]) +for i in ['MINI', 'MINIcondensed', 'TaylorHood', 'XTaylorHood', 'LATaylorHood']: + print(' ') + print('======Testing ' + i + ' Full-Stokes Finite element=====') + md.flowequation.fe_FS = i + md = solve(md, 'Stressbalance') + field_names.extend(['Vx' + i, 'Vy' + i, 'Vel' + i, 'Pressure' + i]) + field_tolerances.extend([8e-5, 8e-5, 8e-5, 1e-08]) + field_values.extend([md.results.StressbalanceSolution.Vx, + md.results.StressbalanceSolution.Vy, + md.results.StressbalanceSolution.Vel, + md.results.StressbalanceSolution.Pressure]) Index: /issm/trunk-jpl/test/NightlyRun/test703.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test703.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test703.py (revision 23793) @@ -1,7 +1,7 @@ #Test Name: FlowbandFSsheetshelfTrans import numpy as np -from model import * -from setflowequation import * -from solve import * +from model import * +from setflowequation import * +from solve import * from NowickiProfile import * from bamgflowband import * @@ -9,17 +9,17 @@ #mesh parameters -x = np.arange(-5,5.5,.5).T -[b,h,sea] = NowickiProfile(x) +x = np.arange(-5, 5.5, .5).T +[b, h, sea] = NowickiProfile(x) x = x * 10**3 h = h * 10**3 -b = (b-sea) * 10**3 +b = (b - sea) * 10**3 #for i in x: - #print i +#print i #for i in b: - #print '%.12f' % i +#print '%.12f' % i #for i in h: - #print '%.11f' % i +#print '%.11f' % i #print '%.12f' % sea @@ -30,9 +30,9 @@ #mesh domain -md = bamgflowband(model(),x,b+h,b,'hmax',150.) +md = bamgflowband(model(), x, b + h, b, 'hmax', 150.) #geometry -md.geometry.surface = np.interp(md.mesh.x,x,b+h) -md.geometry.base = np.interp(md.mesh.x,x,b) +md.geometry.surface = np.interp(md.mesh.x, x, b + h) +md.geometry.base = np.interp(md.mesh.x, x, b) md.geometry.thickness = md.geometry.surface - md.geometry.base @@ -40,6 +40,6 @@ 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[np.where(md.mesh.x<0)]=0.5 +md.mask.groundedice_levelset = -0.5 * np.ones((md.mesh.numberofvertices)) +md.mask.groundedice_levelset[np.where(md.mesh.x < 0)] = 0.5 #materials @@ -58,11 +58,11 @@ md.stressbalance.spcvy = np.nan * np.ones((md.mesh.numberofvertices)) md.stressbalance.spcvz = np.nan * np.ones((md.mesh.numberofvertices)) -md.stressbalance.referential = np.nan * np.ones((md.mesh.numberofvertices,6)) -md.stressbalance.loadingforce = np.zeros((md.mesh.numberofvertices,3)) +md.stressbalance.referential = np.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. #Misc -md = setflowequation(md,'FS','all') +md = setflowequation(md, 'FS', 'all') md.flowequation.fe_FS = 'TaylorHood' md.stressbalance.abstol = np.nan @@ -77,5 +77,5 @@ md.basalforcings.floatingice_melting_rate = np.zeros((md.mesh.numberofvertices)) md.basalforcings.geothermalflux = np.zeros((md.mesh.numberofvertices)) -posb = np.where(np.logical_and(md.mesh.x > 0.,md.mesh.vertexonbase))[0] +posb = np.where(np.logical_and(md.mesh.x > 0., md.mesh.vertexonbase))[0] md.basalforcings.groundedice_melting_rate[posb] = 18. md.basalforcings.floatingice_melting_rate[posb] = 18. @@ -87,68 +87,68 @@ md.transient.isthermal = 0 md.masstransport.isfreesurface = 1 -md.groundingline.migration='None' +md.groundingline.migration = 'None' #Go solve -md.cluster = generic('np',3) +md.cluster = generic('np', 3) md.stressbalance.shelf_dampening = 1 -md1=copy.deepcopy(md) -md1 = solve(md1,'Transient') +md1 = copy.deepcopy(md) +md1 = solve(md1, 'Transient') md.stressbalance.shelf_dampening = 0 -md = solve(md,'Transient') +md = solve(md, 'Transient') #Fields and tolerances to track changes -field_names = ['Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1', - 'Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2', - 'Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3', - 'Vx1_damp','Vy1_damp','Vel1_damp','Pressure1_damp','Bed1_damp','Surface1_damp','Thickness1_damp', - 'Vx2_damp','Vy2_damp','Vel2_damp','Pressure2_damp','Bed2_damp','Surface2_damp','Thickness2_damp', - 'Vx3_damp','Vy3_damp','Vel3_damp','Pressure3_damp','Bed3_damp','Surface3_damp','Thickness3_damp'] -field_tolerances = [2e-08,2e-08,2e-08,1e-08,1e-10,1e-10,1e-10, - 2e-08,2e-08,2e-08,1e-08,1e-10,1e-10,1e-10, - 2e-08,2e-08,2e-08,1e-08,1e-10,1e-10,1e-10, - 5e-08,5e-08,5e-08,1e-08,1e-10,1e-10,1e-10, - 5e-08,5e-08,5e-08,1e-08,1e-10,1e-10,1e-10, - 5e-08,5e-08,5e-08,1e-08,1e-10,1e-10,1e-10] +field_names = ['Vx1', 'Vy1', 'Vel1', 'Pressure1', 'Bed1', 'Surface1', 'Thickness1', + 'Vx2', 'Vy2', 'Vel2', 'Pressure2', 'Bed2', 'Surface2', 'Thickness2', + 'Vx3', 'Vy3', 'Vel3', 'Pressure3', 'Bed3', 'Surface3', 'Thickness3', + 'Vx1_damp', 'Vy1_damp', 'Vel1_damp', 'Pressure1_damp', 'Bed1_damp', 'Surface1_damp', 'Thickness1_damp', + 'Vx2_damp', 'Vy2_damp', 'Vel2_damp', 'Pressure2_damp', 'Bed2_damp', 'Surface2_damp', 'Thickness2_damp', + 'Vx3_damp', 'Vy3_damp', 'Vel3_damp', 'Pressure3_damp', 'Bed3_damp', 'Surface3_damp', 'Thickness3_damp'] +field_tolerances = [2e-08, 2e-08, 2e-08, 1e-08, 1e-10, 1e-10, 1e-10, + 2e-08, 2e-08, 2e-08, 1e-08, 1e-10, 1e-10, 1e-10, + 2e-08, 2e-08, 2e-08, 1e-08, 1e-10, 1e-10, 1e-10, + 5e-08, 5e-08, 5e-08, 1e-08, 1e-10, 1e-10, 1e-10, + 5e-08, 5e-08, 5e-08, 1e-08, 1e-10, 1e-10, 1e-10, + 5e-08, 5e-08, 5e-08, 1e-08, 1e-10, 1e-10, 1e-10] field_values = [md.results.TransientSolution[0].Vx, - md.results.TransientSolution[0].Vy, - md.results.TransientSolution[0].Vel, - md.results.TransientSolution[0].Pressure, - md.results.TransientSolution[0].Base, - md.results.TransientSolution[0].Surface, - md.results.TransientSolution[0].Thickness, - md.results.TransientSolution[1].Vx, - md.results.TransientSolution[1].Vy, - md.results.TransientSolution[1].Vel, - md.results.TransientSolution[1].Pressure, - md.results.TransientSolution[1].Base, - md.results.TransientSolution[1].Surface, - md.results.TransientSolution[1].Thickness, - md.results.TransientSolution[2].Vx, - md.results.TransientSolution[2].Vy, - md.results.TransientSolution[2].Vel, - md.results.TransientSolution[2].Pressure, - md.results.TransientSolution[2].Base, - md.results.TransientSolution[2].Surface, - md.results.TransientSolution[2].Thickness, - md1.results.TransientSolution[0].Vx, - md1.results.TransientSolution[0].Vy, - md1.results.TransientSolution[0].Vel, - md1.results.TransientSolution[0].Pressure, - md1.results.TransientSolution[0].Base, - md1.results.TransientSolution[0].Surface, - md1.results.TransientSolution[0].Thickness, - md1.results.TransientSolution[1].Vx, - md1.results.TransientSolution[1].Vy, - md1.results.TransientSolution[1].Vel, - md1.results.TransientSolution[1].Pressure, - md1.results.TransientSolution[1].Base, - md1.results.TransientSolution[1].Surface, - md1.results.TransientSolution[1].Thickness, - md1.results.TransientSolution[2].Vx, - md1.results.TransientSolution[2].Vy, - md1.results.TransientSolution[2].Vel, - md1.results.TransientSolution[2].Pressure, - md1.results.TransientSolution[2].Base, - md1.results.TransientSolution[2].Surface, - md1.results.TransientSolution[2].Thickness] + md.results.TransientSolution[0].Vy, + md.results.TransientSolution[0].Vel, + md.results.TransientSolution[0].Pressure, + md.results.TransientSolution[0].Base, + md.results.TransientSolution[0].Surface, + md.results.TransientSolution[0].Thickness, + md.results.TransientSolution[1].Vx, + md.results.TransientSolution[1].Vy, + md.results.TransientSolution[1].Vel, + md.results.TransientSolution[1].Pressure, + md.results.TransientSolution[1].Base, + md.results.TransientSolution[1].Surface, + md.results.TransientSolution[1].Thickness, + md.results.TransientSolution[2].Vx, + md.results.TransientSolution[2].Vy, + md.results.TransientSolution[2].Vel, + md.results.TransientSolution[2].Pressure, + md.results.TransientSolution[2].Base, + md.results.TransientSolution[2].Surface, + md.results.TransientSolution[2].Thickness, + md1.results.TransientSolution[0].Vx, + md1.results.TransientSolution[0].Vy, + md1.results.TransientSolution[0].Vel, + md1.results.TransientSolution[0].Pressure, + md1.results.TransientSolution[0].Base, + md1.results.TransientSolution[0].Surface, + md1.results.TransientSolution[0].Thickness, + md1.results.TransientSolution[1].Vx, + md1.results.TransientSolution[1].Vy, + md1.results.TransientSolution[1].Vel, + md1.results.TransientSolution[1].Pressure, + md1.results.TransientSolution[1].Base, + md1.results.TransientSolution[1].Surface, + md1.results.TransientSolution[1].Thickness, + md1.results.TransientSolution[2].Vx, + md1.results.TransientSolution[2].Vy, + md1.results.TransientSolution[2].Vel, + md1.results.TransientSolution[2].Pressure, + md1.results.TransientSolution[2].Base, + md1.results.TransientSolution[2].Surface, + md1.results.TransientSolution[2].Thickness] Index: /issm/trunk-jpl/test/NightlyRun/test801.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test801.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test801.py (revision 23793) @@ -8,48 +8,48 @@ from solve import * -md=triangle(model(),'../Exp/Square.exp',50000) -md=setmask(md,'','') -md=parameterize(md,'../Par/ValleyGlacierShelf.py') -md.levelset.stabilization=2 -md=setflowequation(md,'SSA','all') -md.cluster=generic('name',gethostname(),'np',3) +md = triangle(model(), '../Exp/Square.exp', 50000) +md = setmask(md, '', '') +md = parameterize(md, '../Par/ValleyGlacierShelf.py') +md.levelset.stabilization = 2 +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) #Transient -md.transient.isstressbalance=True -md.transient.ismovingfront=True -md.transient.ismasstransport=True -md.transient.issmb=True -md.transient.isthermal=False -md.transient.isgroundingline=True -md.transient.isgia=False +md.transient.isstressbalance = True +md.transient.ismovingfront = True +md.transient.ismasstransport = True +md.transient.issmb = True +md.transient.isthermal = False +md.transient.isgroundingline = True +md.transient.isgia = False -md=solve(md,'Transient') +md = solve(md, 'Transient') #Fields and tolerances to track changes -field_names =['Vx1','Vy1','Vel1','Pressure1','Thickness1','Surface1','MaskIceLevelset1', - 'Vx2','Vy2','Vel2','Pressure2','Thickness2','Surface2','MaskIceLevelset2', - 'Vx3','Vy3','Vel3','Pressure3','Thickness3','Surface3','MaskIceLevelset3'] -field_tolerances=[1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12, - 1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12, - 1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12] -field_values=[md.results.TransientSolution[0].Vx, - md.results.TransientSolution[0].Vy, - md.results.TransientSolution[0].Vel, - md.results.TransientSolution[0].Pressure, - md.results.TransientSolution[0].Thickness, - md.results.TransientSolution[0].Surface, - md.results.TransientSolution[0].MaskIceLevelset, - md.results.TransientSolution[1].Vx, - md.results.TransientSolution[1].Vy, - md.results.TransientSolution[1].Vel, - md.results.TransientSolution[1].Pressure, - md.results.TransientSolution[1].Thickness, - md.results.TransientSolution[1].Surface, - md.results.TransientSolution[1].MaskIceLevelset, - md.results.TransientSolution[2].Vx, - md.results.TransientSolution[2].Vy, - md.results.TransientSolution[2].Vel, - md.results.TransientSolution[2].Pressure, - md.results.TransientSolution[2].Thickness, - md.results.TransientSolution[2].Surface, - md.results.TransientSolution[2].MaskIceLevelset] +field_names = ['Vx1', 'Vy1', 'Vel1', 'Pressure1', 'Thickness1', 'Surface1', 'MaskIceLevelset1', + 'Vx2', 'Vy2', 'Vel2', 'Pressure2', 'Thickness2', 'Surface2', 'MaskIceLevelset2', + 'Vx3', 'Vy3', 'Vel3', 'Pressure3', 'Thickness3', 'Surface3', 'MaskIceLevelset3'] +field_tolerances = [1e-12, 1e-12, 1e-12, 1e-12, 1e-12, 1e-12, 1e-12, + 1e-12, 1e-12, 1e-12, 1e-12, 1e-12, 1e-12, 1e-12, + 1e-12, 1e-12, 1e-12, 1e-12, 1e-12, 1e-12, 1e-12] +field_values = [md.results.TransientSolution[0].Vx, + md.results.TransientSolution[0].Vy, + md.results.TransientSolution[0].Vel, + md.results.TransientSolution[0].Pressure, + md.results.TransientSolution[0].Thickness, + md.results.TransientSolution[0].Surface, + md.results.TransientSolution[0].MaskIceLevelset, + md.results.TransientSolution[1].Vx, + md.results.TransientSolution[1].Vy, + md.results.TransientSolution[1].Vel, + md.results.TransientSolution[1].Pressure, + md.results.TransientSolution[1].Thickness, + md.results.TransientSolution[1].Surface, + md.results.TransientSolution[1].MaskIceLevelset, + md.results.TransientSolution[2].Vx, + md.results.TransientSolution[2].Vy, + md.results.TransientSolution[2].Vel, + md.results.TransientSolution[2].Pressure, + md.results.TransientSolution[2].Thickness, + md.results.TransientSolution[2].Surface, + md.results.TransientSolution[2].MaskIceLevelset] Index: /issm/trunk-jpl/test/NightlyRun/test802.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test802.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test802.py (revision 23793) @@ -9,56 +9,56 @@ -md=triangle(model(),'../Exp/Square.exp',50000) -md=setmask(md,'','') -md=parameterize(md,'../Par/ValleyGlacierShelf.py') -md.extrude(3,2.) -md=setflowequation(md,'SSA','all') -md.cluster=generic('name',gethostname(),'np',3) +md = triangle(model(), '../Exp/Square.exp', 50000) +md = setmask(md, '', '') +md = parameterize(md, '../Par/ValleyGlacierShelf.py') +md.extrude(3, 2.) +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) #Thermal model -pos_surf=np.nonzero(md.mesh.vertexonsurface)[0] -md.thermal.spctemperature[pos_surf]=md.initialization.temperature[pos_surf] +pos_surf = np.nonzero(md.mesh.vertexonsurface)[0] +md.thermal.spctemperature[pos_surf] = md.initialization.temperature[pos_surf] #Transient -md.transient.isstressbalance=True -md.transient.ismovingfront=True -md.transient.ismasstransport=True -md.transient.issmb=True -md.transient.isthermal=True -md.transient.isgroundingline=True -md.transient.isgia=False -md.groundingline.melt_interpolation='SubelementMelt1' +md.transient.isstressbalance = True +md.transient.ismovingfront = True +md.transient.ismasstransport = True +md.transient.issmb = True +md.transient.isthermal = True +md.transient.isgroundingline = True +md.transient.isgia = False +md.groundingline.melt_interpolation = 'SubelementMelt1' -md=solve(md,'Transient') +md = solve(md, 'Transient') #Fields and tolerances to track changes -field_names =['Vx1','Vy1','Vel1','Pressure1','Thickness1','Surface1','MaskIceLevelset1','Temperature1', - 'Vx2','Vy2','Vel2','Pressure2','Thickness2','Surface2','MaskIceLevelset2','Temperature2', - 'Vx3','Vy3','Vel3','Pressure3','Thickness3','Surface3','MaskIceLevelset3','Temperature3'] -field_tolerances=[1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12, - 1e-9,1e-9,1e-10,1e-10,1e-10,1e-10,1e-10,1e-9, - 1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10] -field_values=[md.results.TransientSolution[0].Vx, - md.results.TransientSolution[0].Vy, - md.results.TransientSolution[0].Vel, - md.results.TransientSolution[0].Pressure, - md.results.TransientSolution[0].Thickness, - md.results.TransientSolution[0].Surface, - md.results.TransientSolution[0].MaskIceLevelset, - md.results.TransientSolution[0].Temperature, - md.results.TransientSolution[1].Vx, - md.results.TransientSolution[1].Vy, - md.results.TransientSolution[1].Vel, - md.results.TransientSolution[1].Pressure, - md.results.TransientSolution[1].Thickness, - md.results.TransientSolution[1].Surface, - md.results.TransientSolution[1].MaskIceLevelset, - md.results.TransientSolution[1].Temperature, - md.results.TransientSolution[2].Vx, - md.results.TransientSolution[2].Vy, - md.results.TransientSolution[2].Vel, - md.results.TransientSolution[2].Pressure, - md.results.TransientSolution[2].Thickness, - md.results.TransientSolution[2].Surface, - md.results.TransientSolution[2].MaskIceLevelset, - md.results.TransientSolution[2].Temperature] +field_names = ['Vx1', 'Vy1', 'Vel1', 'Pressure1', 'Thickness1', 'Surface1', 'MaskIceLevelset1', 'Temperature1', + 'Vx2', 'Vy2', 'Vel2', 'Pressure2', 'Thickness2', 'Surface2', 'MaskIceLevelset2', 'Temperature2', + 'Vx3', 'Vy3', 'Vel3', 'Pressure3', 'Thickness3', 'Surface3', 'MaskIceLevelset3', 'Temperature3'] +field_tolerances = [1e-12, 1e-12, 1e-12, 1e-12, 1e-12, 1e-12, 1e-12, 1e-12, + 1e-9, 1e-9, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10, 1e-9, + 1e-10, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10] +field_values = [md.results.TransientSolution[0].Vx, + md.results.TransientSolution[0].Vy, + md.results.TransientSolution[0].Vel, + md.results.TransientSolution[0].Pressure, + md.results.TransientSolution[0].Thickness, + md.results.TransientSolution[0].Surface, + md.results.TransientSolution[0].MaskIceLevelset, + md.results.TransientSolution[0].Temperature, + md.results.TransientSolution[1].Vx, + md.results.TransientSolution[1].Vy, + md.results.TransientSolution[1].Vel, + md.results.TransientSolution[1].Pressure, + md.results.TransientSolution[1].Thickness, + md.results.TransientSolution[1].Surface, + md.results.TransientSolution[1].MaskIceLevelset, + md.results.TransientSolution[1].Temperature, + md.results.TransientSolution[2].Vx, + md.results.TransientSolution[2].Vy, + md.results.TransientSolution[2].Vel, + md.results.TransientSolution[2].Pressure, + md.results.TransientSolution[2].Thickness, + md.results.TransientSolution[2].Surface, + md.results.TransientSolution[2].MaskIceLevelset, + md.results.TransientSolution[2].Temperature] Index: /issm/trunk-jpl/test/NightlyRun/test803.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test803.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test803.py (revision 23793) @@ -9,61 +9,61 @@ -md=triangle(model(),'../Exp/Square.exp',50000) -md=setmask(md,'','') -md=parameterize(md,'../Par/ValleyGlacierShelf.py') -md.extrude(3,2.) -md=setflowequation(md,'HO','all') -md.cluster=generic('name',gethostname(),'np',3) +md = triangle(model(), '../Exp/Square.exp', 50000) +md = setmask(md, '', '') +md = parameterize(md, '../Par/ValleyGlacierShelf.py') +md.extrude(3, 2.) +md = setflowequation(md, 'HO', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) #Thermal model -pos_surf=np.where(md.mesh.vertexonsurface)[0] -md.thermal.spctemperature[pos_surf]=md.initialization.temperature[pos_surf] -md.thermal.isenthalpy=True -md.thermal.isdynamicbasalspc=True +pos_surf = np.where(md.mesh.vertexonsurface)[0] +md.thermal.spctemperature[pos_surf] = md.initialization.temperature[pos_surf] +md.thermal.isenthalpy = True +md.thermal.isdynamicbasalspc = True #Transient -md.transient.isstressbalance=True -md.transient.ismovingfront=True -md.transient.ismasstransport=True -md.transient.issmb=True -md.transient.isthermal=True -md.transient.isgroundingline=True -md.transient.isgia=False -md.groundingline.melt_interpolation='SubelementMelt1' +md.transient.isstressbalance = True +md.transient.ismovingfront = True +md.transient.ismasstransport = True +md.transient.issmb = True +md.transient.isthermal = True +md.transient.isgroundingline = True +md.transient.isgia = False +md.groundingline.melt_interpolation = 'SubelementMelt1' -md=solve(md,'Transient') +md = solve(md, 'Transient') #Fields and tolerances to track changes -field_names =['Vx1','Vy1','Vel1','Pressure1','Thickness1','Surface1','MaskIceLevelset1','Enthalpy1','Watercolumn1', - 'Vx2','Vy2','Vel2','Pressure2','Thickness2','Surface2','MaskIceLevelset2','Enthalpy2','Watercolumn2', - 'Vx3','Vy3','Vel3','Pressure3','Thickness3','Surface3','MaskIceLevelset3','Enthalpy3','Watercolumn3'] -field_tolerances=[1e-10,1e-10,1e-10,1e-13,1e-12,1e-12,1e-13,1e-13,1e-13, - 1e-9,1e-9,1e-10,1e-10,1e-10,1e-10,1e-10,1e-9,1e-10, - 1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10] -field_values=[md.results.TransientSolution[0].Vx, - md.results.TransientSolution[0].Vy, - md.results.TransientSolution[0].Vel, - md.results.TransientSolution[0].Pressure, - md.results.TransientSolution[0].Thickness, - md.results.TransientSolution[0].Surface, - md.results.TransientSolution[0].MaskIceLevelset, - md.results.TransientSolution[0].Enthalpy, - md.results.TransientSolution[0].Watercolumn, - md.results.TransientSolution[1].Vx, - md.results.TransientSolution[1].Vy, - md.results.TransientSolution[1].Vel, - md.results.TransientSolution[1].Pressure, - md.results.TransientSolution[1].Thickness, - md.results.TransientSolution[1].Surface, - md.results.TransientSolution[1].MaskIceLevelset, - md.results.TransientSolution[1].Enthalpy, - md.results.TransientSolution[1].Watercolumn, - md.results.TransientSolution[2].Vx, - md.results.TransientSolution[2].Vy, - md.results.TransientSolution[2].Vel, - md.results.TransientSolution[2].Pressure, - md.results.TransientSolution[2].Thickness, - md.results.TransientSolution[2].Surface, - md.results.TransientSolution[2].MaskIceLevelset, - md.results.TransientSolution[2].Enthalpy, - md.results.TransientSolution[2].Watercolumn] +field_names = ['Vx1', 'Vy1', 'Vel1', 'Pressure1', 'Thickness1', 'Surface1', 'MaskIceLevelset1', 'Enthalpy1', 'Watercolumn1', + 'Vx2', 'Vy2', 'Vel2', 'Pressure2', 'Thickness2', 'Surface2', 'MaskIceLevelset2', 'Enthalpy2', 'Watercolumn2', + 'Vx3', 'Vy3', 'Vel3', 'Pressure3', 'Thickness3', 'Surface3', 'MaskIceLevelset3', 'Enthalpy3', 'Watercolumn3'] +field_tolerances = [1e-10, 1e-10, 1e-10, 1e-13, 1e-12, 1e-12, 1e-13, 1e-13, 1e-13, + 1e-9, 1e-9, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10, 1e-9, 1e-10, + 1e-10, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10] +field_values = [md.results.TransientSolution[0].Vx, + md.results.TransientSolution[0].Vy, + md.results.TransientSolution[0].Vel, + md.results.TransientSolution[0].Pressure, + md.results.TransientSolution[0].Thickness, + md.results.TransientSolution[0].Surface, + md.results.TransientSolution[0].MaskIceLevelset, + md.results.TransientSolution[0].Enthalpy, + md.results.TransientSolution[0].Watercolumn, + md.results.TransientSolution[1].Vx, + md.results.TransientSolution[1].Vy, + md.results.TransientSolution[1].Vel, + md.results.TransientSolution[1].Pressure, + md.results.TransientSolution[1].Thickness, + md.results.TransientSolution[1].Surface, + md.results.TransientSolution[1].MaskIceLevelset, + md.results.TransientSolution[1].Enthalpy, + md.results.TransientSolution[1].Watercolumn, + md.results.TransientSolution[2].Vx, + md.results.TransientSolution[2].Vy, + md.results.TransientSolution[2].Vel, + md.results.TransientSolution[2].Pressure, + md.results.TransientSolution[2].Thickness, + md.results.TransientSolution[2].Surface, + md.results.TransientSolution[2].MaskIceLevelset, + md.results.TransientSolution[2].Enthalpy, + md.results.TransientSolution[2].Watercolumn] Index: /issm/trunk-jpl/test/NightlyRun/test804.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test804.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test804.py (revision 23793) @@ -9,50 +9,50 @@ -md=triangle(model(),'../Exp/Square.exp',50000) -md=setmask(md,'','') -md=parameterize(md,'../Par/ValleyGlacierShelf.py') -md=setflowequation(md,'SIA','all') -md.cluster=generic('name',gethostname(),'np',3) +md = triangle(model(), '../Exp/Square.exp', 50000) +md = setmask(md, '', '') +md = parameterize(md, '../Par/ValleyGlacierShelf.py') +md = setflowequation(md, 'SIA', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) #Transient -md.transient.isstressbalance=True -md.transient.ismasstransport=True -md.transient.issmb=True -md.transient.isthermal=False -md.transient.isgroundingline=True -md.transient.isgia=False -md.transient.ismovingfront=True +md.transient.isstressbalance = True +md.transient.ismasstransport = True +md.transient.issmb = True +md.transient.isthermal = False +md.transient.isgroundingline = True +md.transient.isgia = False +md.transient.ismovingfront = True -md.calving.calvingrate=1000.*np.ones((md.mesh.numberofvertices)) -md.frontalforcings.meltingrate=np.zeros((md.mesh.numberofvertices)) +md.calving.calvingrate = 1000. * np.ones((md.mesh.numberofvertices)) +md.frontalforcings.meltingrate = np.zeros((md.mesh.numberofvertices)) -md=solve(md,'Transient') +md = solve(md, 'Transient') #Fields and tolerances to track changes -field_names =['Vx1','Vy1','Vel1','Pressure1','Thickness1','Surface1','MaskIceLevelset1', - 'Vx2','Vy2','Vel2','Pressure2','Thickness2','Surface2','MaskIceLevelset2', - 'Vx3','Vy3','Vel3','Pressure3','Thickness3','Surface3','MaskIceLevelset3'] -field_tolerances=[1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13, - 2e-13,2e-13,2e-13,1e-13,1e-13,1e-13,1e-13, - 2e-13,2e-13,2e-13,1e-13,1e-13,1e-13,1e-13] -field_values=[md.results.TransientSolution[0].Vx, - md.results.TransientSolution[0].Vy, - md.results.TransientSolution[0].Vel, - md.results.TransientSolution[0].Pressure, - md.results.TransientSolution[0].Thickness, - md.results.TransientSolution[0].Surface, - md.results.TransientSolution[0].MaskIceLevelset, - md.results.TransientSolution[1].Vx, - md.results.TransientSolution[1].Vy, - md.results.TransientSolution[1].Vel, - md.results.TransientSolution[1].Pressure, - md.results.TransientSolution[1].Thickness, - md.results.TransientSolution[1].Surface, - md.results.TransientSolution[1].MaskIceLevelset, - md.results.TransientSolution[2].Vx, - md.results.TransientSolution[2].Vy, - md.results.TransientSolution[2].Vel, - md.results.TransientSolution[2].Pressure, - md.results.TransientSolution[2].Thickness, - md.results.TransientSolution[2].Surface, - md.results.TransientSolution[2].MaskIceLevelset] +field_names = ['Vx1', 'Vy1', 'Vel1', 'Pressure1', 'Thickness1', 'Surface1', 'MaskIceLevelset1', + 'Vx2', 'Vy2', 'Vel2', 'Pressure2', 'Thickness2', 'Surface2', 'MaskIceLevelset2', + 'Vx3', 'Vy3', 'Vel3', 'Pressure3', 'Thickness3', 'Surface3', 'MaskIceLevelset3'] +field_tolerances = [1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, + 2e-13, 2e-13, 2e-13, 1e-13, 1e-13, 1e-13, 1e-13, + 2e-13, 2e-13, 2e-13, 1e-13, 1e-13, 1e-13, 1e-13] +field_values = [md.results.TransientSolution[0].Vx, + md.results.TransientSolution[0].Vy, + md.results.TransientSolution[0].Vel, + md.results.TransientSolution[0].Pressure, + md.results.TransientSolution[0].Thickness, + md.results.TransientSolution[0].Surface, + md.results.TransientSolution[0].MaskIceLevelset, + md.results.TransientSolution[1].Vx, + md.results.TransientSolution[1].Vy, + md.results.TransientSolution[1].Vel, + md.results.TransientSolution[1].Pressure, + md.results.TransientSolution[1].Thickness, + md.results.TransientSolution[1].Surface, + md.results.TransientSolution[1].MaskIceLevelset, + md.results.TransientSolution[2].Vx, + md.results.TransientSolution[2].Vy, + md.results.TransientSolution[2].Vel, + md.results.TransientSolution[2].Pressure, + md.results.TransientSolution[2].Thickness, + md.results.TransientSolution[2].Surface, + md.results.TransientSolution[2].MaskIceLevelset] Index: /issm/trunk-jpl/test/NightlyRun/test805.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test805.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test805.py (revision 23793) @@ -9,65 +9,65 @@ -md=triangle(model(),'../Exp/Square.exp',50000) -md=setmask(md,'','') -md=parameterize(md,'../Par/ValleyGlacierShelf.py') -md.extrude(3,2.) -md=setflowequation(md,'HO','all') -md.cluster=generic('name',gethostname(),'np',3) +md = triangle(model(), '../Exp/Square.exp', 50000) +md = setmask(md, '', '') +md = parameterize(md, '../Par/ValleyGlacierShelf.py') +md.extrude(3, 2.) +md = setflowequation(md, 'HO', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) #Thermal model -pos_surf=np.nonzero(md.mesh.vertexonsurface)[0] -md.thermal.spctemperature[pos_surf]=md.initialization.temperature[pos_surf] -md.thermal.isenthalpy=True -md.thermal.isdynamicbasalspc=True +pos_surf = np.nonzero(md.mesh.vertexonsurface)[0] +md.thermal.spctemperature[pos_surf] = md.initialization.temperature[pos_surf] +md.thermal.isenthalpy = True +md.thermal.isdynamicbasalspc = True #Transient -md.transient.isstressbalance=True -md.transient.ismasstransport=True -md.transient.issmb=True -md.transient.isthermal=True -md.transient.isgroundingline=True -md.transient.isgia=False -md.transient.ismovingfront=True +md.transient.isstressbalance = True +md.transient.ismasstransport = True +md.transient.issmb = True +md.transient.isthermal = True +md.transient.isgroundingline = True +md.transient.isgia = False +md.transient.ismovingfront = True -md.calving.calvingrate=1000.*np.ones((md.mesh.numberofvertices)) -md.frontalforcings.meltingrate=np.zeros((md.mesh.numberofvertices)) -md.groundingline.melt_interpolation='SubelementMelt1' -md.levelset.stabilization=2 +md.calving.calvingrate = 1000. * np.ones((md.mesh.numberofvertices)) +md.frontalforcings.meltingrate = np.zeros((md.mesh.numberofvertices)) +md.groundingline.melt_interpolation = 'SubelementMelt1' +md.levelset.stabilization = 2 -md=solve(md,'Transient') +md = solve(md, 'Transient') #Fields and tolerances to track changes -field_names =['Vx1','Vy1','Vel1','Pressure1','Thickness1','Surface1','MaskIceLevelset1','Enthalpy1','Watercolumn1', - 'Vx2','Vy2','Vel2','Pressure2','Thickness2','Surface2','MaskIceLevelset2','Enthalpy2','Watercolumn2', - 'Vx3','Vy3','Vel3','Pressure3','Thickness3','Surface3','MaskIceLevelset3','Enthalpy3','Watercolumn3'] -field_tolerances=[1e-11,1e-11,1e-11,1e-11,1e-11,1e-11,1e-11,1e-11,1e-11, - 1e-9,1e-9,1e-10,1e-10,1e-10,1e-10,1e-10,1e-9,1e-10, - 1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10] -field_values=[md.results.TransientSolution[0].Vx, - md.results.TransientSolution[0].Vy, - md.results.TransientSolution[0].Vel, - md.results.TransientSolution[0].Pressure, - md.results.TransientSolution[0].Thickness, - md.results.TransientSolution[0].Surface, - md.results.TransientSolution[0].MaskIceLevelset, - md.results.TransientSolution[0].Enthalpy, - md.results.TransientSolution[0].Watercolumn, - md.results.TransientSolution[1].Vx, - md.results.TransientSolution[1].Vy, - md.results.TransientSolution[1].Vel, - md.results.TransientSolution[1].Pressure, - md.results.TransientSolution[1].Thickness, - md.results.TransientSolution[1].Surface, - md.results.TransientSolution[1].MaskIceLevelset, - md.results.TransientSolution[1].Enthalpy, - md.results.TransientSolution[1].Watercolumn, - md.results.TransientSolution[2].Vx, - md.results.TransientSolution[2].Vy, - md.results.TransientSolution[2].Vel, - md.results.TransientSolution[2].Pressure, - md.results.TransientSolution[2].Thickness, - md.results.TransientSolution[2].Surface, - md.results.TransientSolution[2].MaskIceLevelset, - md.results.TransientSolution[2].Enthalpy, - md.results.TransientSolution[2].Watercolumn] +field_names = ['Vx1', 'Vy1', 'Vel1', 'Pressure1', 'Thickness1', 'Surface1', 'MaskIceLevelset1', 'Enthalpy1', 'Watercolumn1', + 'Vx2', 'Vy2', 'Vel2', 'Pressure2', 'Thickness2', 'Surface2', 'MaskIceLevelset2', 'Enthalpy2', 'Watercolumn2', + 'Vx3', 'Vy3', 'Vel3', 'Pressure3', 'Thickness3', 'Surface3', 'MaskIceLevelset3', 'Enthalpy3', 'Watercolumn3'] +field_tolerances = [1e-11, 1e-11, 1e-11, 1e-11, 1e-11, 1e-11, 1e-11, 1e-11, 1e-11, + 1e-9, 1e-9, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10, 1e-9, 1e-10, + 1e-10, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10] +field_values = [md.results.TransientSolution[0].Vx, + md.results.TransientSolution[0].Vy, + md.results.TransientSolution[0].Vel, + md.results.TransientSolution[0].Pressure, + md.results.TransientSolution[0].Thickness, + md.results.TransientSolution[0].Surface, + md.results.TransientSolution[0].MaskIceLevelset, + md.results.TransientSolution[0].Enthalpy, + md.results.TransientSolution[0].Watercolumn, + md.results.TransientSolution[1].Vx, + md.results.TransientSolution[1].Vy, + md.results.TransientSolution[1].Vel, + md.results.TransientSolution[1].Pressure, + md.results.TransientSolution[1].Thickness, + md.results.TransientSolution[1].Surface, + md.results.TransientSolution[1].MaskIceLevelset, + md.results.TransientSolution[1].Enthalpy, + md.results.TransientSolution[1].Watercolumn, + md.results.TransientSolution[2].Vx, + md.results.TransientSolution[2].Vy, + md.results.TransientSolution[2].Vel, + md.results.TransientSolution[2].Pressure, + md.results.TransientSolution[2].Thickness, + md.results.TransientSolution[2].Surface, + md.results.TransientSolution[2].MaskIceLevelset, + md.results.TransientSolution[2].Enthalpy, + md.results.TransientSolution[2].Watercolumn] Index: /issm/trunk-jpl/test/NightlyRun/test806.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test806.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test806.py (revision 23793) @@ -10,73 +10,73 @@ import numpy as np -md=triangle(model(),'../Exp/Square.exp',50000.) -md=setmask(md,'all','') -md=parameterize(md,'../Par/SquareShelf.py') -md=setflowequation(md,'SSA','all') -md.cluster=generic('name',gethostname(),'np',3) +md = triangle(model(), '../Exp/Square.exp', 50000.) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelf.py') +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) x = md.mesh.x xmin = min(x) xmax = max(x) -Lx = (xmax-xmin) -alpha = 2./3. -md.mask.ice_levelset = np.float_((x - alpha*Lx)>0) - np.float_((x - alpha*Lx)<0) +Lx = (xmax - xmin) +alpha = 2. / 3. +md.mask.ice_levelset = np.float_((x - alpha * Lx) > 0) - np.float_((x - alpha * Lx) < 0) -md.timestepping.time_step=10 -md.timestepping.final_time=30 +md.timestepping.time_step = 10 +md.timestepping.final_time = 30 #Transient -md.transient.isstressbalance=True -md.transient.ismasstransport=True -md.transient.issmb=True -md.transient.isthermal=False -md.transient.isgroundingline=False -md.transient.isgia=False -md.transient.ismovingfront=True +md.transient.isstressbalance = True +md.transient.ismasstransport = True +md.transient.issmb = True +md.transient.isthermal = False +md.transient.isgroundingline = False +md.transient.isgia = False +md.transient.ismovingfront = True -md.calving=calvinglevermann() -md.calving.coeff=4.89e13*np.ones((md.mesh.numberofvertices)) -md.frontalforcings.meltingrate=np.zeros((md.mesh.numberofvertices)) -md.levelset.spclevelset=np.nan*np.ones((md.mesh.numberofvertices)) +md.calving = calvinglevermann() +md.calving.coeff = 4.89e13 * np.ones((md.mesh.numberofvertices)) +md.frontalforcings.meltingrate = np.zeros((md.mesh.numberofvertices)) +md.levelset.spclevelset = np.nan * np.ones((md.mesh.numberofvertices)) -md.transient.requested_outputs=['default','StrainRateparallel','StrainRateperpendicular','Calvingratex','Calvingratey','CalvingCalvingrate'] +md.transient.requested_outputs = ['default', 'StrainRateparallel', 'StrainRateperpendicular', 'Calvingratex', 'Calvingratey', 'CalvingCalvingrate'] -md=solve(md,'Transient') +md = solve(md, 'Transient') #Fields and tolerances to track changes -field_names =['Vx1','Vy1','Vel1','Pressure1','Thickness1','Surface1','MaskIceLevelset1','StrainRateparallel1','StrainRateperpendicular1','CalvingCalvingrate1', - 'Vx2','Vy2','Vel2','Pressure2','Thickness2','Surface2','MaskIceLevelset2','StrainRateparallel2','StrainRateperpendicular2','CalvingCalvingrate2', - 'Vx3','Vy3','Vel3','Pressure3','Thickness3','Surface3','MaskIceLevelset3','StrainRateparallel3','StrainRateperpendicular3','CalvingCalvingrate3'] -field_tolerances=[1e-11,1e-11,1e-11,1e-11,1e-11,1e-11,1e-11,1e-11,1e-11,1e-11, - 2e-11,2e-11,2e-11,1e-11,1e-11,1e-11,1e-11,1e-11,1e-11,1e-11, - 2e-11,2e-11,2e-11,1e-11,1e-11,1e-11,1e-11,5e-11,5e-11,1e-11] -field_values=[md.results.TransientSolution[0].Vx, - md.results.TransientSolution[0].Vy, - md.results.TransientSolution[0].Vel, - md.results.TransientSolution[0].Pressure, - md.results.TransientSolution[0].Thickness, - md.results.TransientSolution[0].Surface, - md.results.TransientSolution[0].MaskIceLevelset, - md.results.TransientSolution[0].StrainRateparallel, - md.results.TransientSolution[0].StrainRateperpendicular, - md.results.TransientSolution[0].CalvingCalvingrate, - md.results.TransientSolution[1].Vx, - md.results.TransientSolution[1].Vy, - md.results.TransientSolution[1].Vel, - md.results.TransientSolution[1].Pressure, - md.results.TransientSolution[1].Thickness, - md.results.TransientSolution[1].Surface, - md.results.TransientSolution[1].MaskIceLevelset, - md.results.TransientSolution[1].StrainRateparallel, - md.results.TransientSolution[1].StrainRateperpendicular, - md.results.TransientSolution[1].CalvingCalvingrate, - md.results.TransientSolution[2].Vx, - md.results.TransientSolution[2].Vy, - md.results.TransientSolution[2].Vel, - md.results.TransientSolution[2].Pressure, - md.results.TransientSolution[2].Thickness, - md.results.TransientSolution[2].Surface, - md.results.TransientSolution[2].MaskIceLevelset, - md.results.TransientSolution[2].StrainRateparallel, - md.results.TransientSolution[2].StrainRateperpendicular, - md.results.TransientSolution[2].CalvingCalvingrate] +field_names = ['Vx1', 'Vy1', 'Vel1', 'Pressure1', 'Thickness1', 'Surface1', 'MaskIceLevelset1', 'StrainRateparallel1', 'StrainRateperpendicular1', 'CalvingCalvingrate1', + 'Vx2', 'Vy2', 'Vel2', 'Pressure2', 'Thickness2', 'Surface2', 'MaskIceLevelset2', 'StrainRateparallel2', 'StrainRateperpendicular2', 'CalvingCalvingrate2', + 'Vx3', 'Vy3', 'Vel3', 'Pressure3', 'Thickness3', 'Surface3', 'MaskIceLevelset3', 'StrainRateparallel3', 'StrainRateperpendicular3', 'CalvingCalvingrate3'] +field_tolerances = [1e-11, 1e-11, 1e-11, 1e-11, 1e-11, 1e-11, 1e-11, 1e-11, 1e-11, 1e-11, + 2e-11, 2e-11, 2e-11, 1e-11, 1e-11, 1e-11, 1e-11, 1e-11, 1e-11, 1e-11, + 2e-11, 2e-11, 2e-11, 1e-11, 1e-11, 1e-11, 1e-11, 5e-11, 5e-11, 1e-11] +field_values = [md.results.TransientSolution[0].Vx, + md.results.TransientSolution[0].Vy, + md.results.TransientSolution[0].Vel, + md.results.TransientSolution[0].Pressure, + md.results.TransientSolution[0].Thickness, + md.results.TransientSolution[0].Surface, + md.results.TransientSolution[0].MaskIceLevelset, + md.results.TransientSolution[0].StrainRateparallel, + md.results.TransientSolution[0].StrainRateperpendicular, + md.results.TransientSolution[0].CalvingCalvingrate, + md.results.TransientSolution[1].Vx, + md.results.TransientSolution[1].Vy, + md.results.TransientSolution[1].Vel, + md.results.TransientSolution[1].Pressure, + md.results.TransientSolution[1].Thickness, + md.results.TransientSolution[1].Surface, + md.results.TransientSolution[1].MaskIceLevelset, + md.results.TransientSolution[1].StrainRateparallel, + md.results.TransientSolution[1].StrainRateperpendicular, + md.results.TransientSolution[1].CalvingCalvingrate, + md.results.TransientSolution[2].Vx, + md.results.TransientSolution[2].Vy, + md.results.TransientSolution[2].Vel, + md.results.TransientSolution[2].Pressure, + md.results.TransientSolution[2].Thickness, + md.results.TransientSolution[2].Surface, + md.results.TransientSolution[2].MaskIceLevelset, + md.results.TransientSolution[2].StrainRateparallel, + md.results.TransientSolution[2].StrainRateperpendicular, + md.results.TransientSolution[2].CalvingCalvingrate] Index: /issm/trunk-jpl/test/NightlyRun/test807.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test807.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test807.py (revision 23793) @@ -10,61 +10,61 @@ import numpy as np -md=triangle(model(),'../Exp/Square.exp',50000.) -md=setmask(md,'all','') -md=parameterize(md,'../Par/SquareShelf.py') -md=setflowequation(md,'SSA','all') -md.cluster=generic('name',gethostname(),'np',3) +md = triangle(model(), '../Exp/Square.exp', 50000.) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelf.py') +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) x = md.mesh.x xmin = min(x) xmax = max(x) -Lx = (xmax-xmin) -alpha = 2./3. -md.mask.ice_levelset = np.float_((x - alpha*Lx)>0) - np.float_((x - alpha*Lx)<0) +Lx = (xmax - xmin) +alpha = 2. / 3. +md.mask.ice_levelset = np.float_((x - alpha * Lx) > 0) - np.float_((x - alpha * Lx) < 0) -md.timestepping.time_step=10 -md.timestepping.final_time=30 +md.timestepping.time_step = 10 +md.timestepping.final_time = 30 #Transient -md.transient.isstressbalance=True -md.transient.ismasstransport=True -md.transient.issmb=True -md.transient.isthermal=False -md.transient.isgroundingline=False -md.transient.isgia=False -md.transient.ismovingfront=True +md.transient.isstressbalance = True +md.transient.ismasstransport = True +md.transient.issmb = True +md.transient.isthermal = False +md.transient.isgroundingline = False +md.transient.isgia = False +md.transient.ismovingfront = True -md.calving.calvingrate=np.zeros((md.mesh.numberofvertices)) -md.frontalforcings.meltingrate=10000*np.ones((md.mesh.numberofvertices)) -md.levelset.spclevelset=np.nan*np.ones((md.mesh.numberofvertices)) +md.calving.calvingrate = np.zeros((md.mesh.numberofvertices)) +md.frontalforcings.meltingrate = 10000 * np.ones((md.mesh.numberofvertices)) +md.levelset.spclevelset = np.nan * np.ones((md.mesh.numberofvertices)) -md=solve(md,'Transient') +md = solve(md, 'Transient') #Fields and tolerances to track changes -field_names =['Vx1','Vy1','Vel1','Pressure1','Thickness1','Surface1','MaskIceLevelset1', - 'Vx2','Vy2','Vel2','Pressure2','Thickness2','Surface2','MaskIceLevelset2', - 'Vx3','Vy3','Vel3','Pressure3','Thickness3','Surface3','MaskIceLevelset3'] -field_tolerances=[1e-11,1e-11,1e-11,1e-11,1e-11,1e-11,1e-11, - 2e-11,2e-11,2e-11,1e-11,1e-11,1e-11,5e-11, - 2e-11,2e-11,2e-11,1e-11,1e-11,1e-11,5e-11] -field_values=[md.results.TransientSolution[0].Vx, - md.results.TransientSolution[0].Vy, - md.results.TransientSolution[0].Vel, - md.results.TransientSolution[0].Pressure, - md.results.TransientSolution[0].Thickness, - md.results.TransientSolution[0].Surface, - md.results.TransientSolution[0].MaskIceLevelset, - md.results.TransientSolution[1].Vx, - md.results.TransientSolution[1].Vy, - md.results.TransientSolution[1].Vel, - md.results.TransientSolution[1].Pressure, - md.results.TransientSolution[1].Thickness, - md.results.TransientSolution[1].Surface, - md.results.TransientSolution[1].MaskIceLevelset, - md.results.TransientSolution[2].Vx, - md.results.TransientSolution[2].Vy, - md.results.TransientSolution[2].Vel, - md.results.TransientSolution[2].Pressure, - md.results.TransientSolution[2].Thickness, - md.results.TransientSolution[2].Surface, - md.results.TransientSolution[2].MaskIceLevelset] +field_names = ['Vx1', 'Vy1', 'Vel1', 'Pressure1', 'Thickness1', 'Surface1', 'MaskIceLevelset1', + 'Vx2', 'Vy2', 'Vel2', 'Pressure2', 'Thickness2', 'Surface2', 'MaskIceLevelset2', + 'Vx3', 'Vy3', 'Vel3', 'Pressure3', 'Thickness3', 'Surface3', 'MaskIceLevelset3'] +field_tolerances = [1e-11, 1e-11, 1e-11, 1e-11, 1e-11, 1e-11, 1e-11, + 2e-11, 2e-11, 2e-11, 1e-11, 1e-11, 1e-11, 5e-11, + 2e-11, 2e-11, 2e-11, 1e-11, 1e-11, 1e-11, 5e-11] +field_values = [md.results.TransientSolution[0].Vx, + md.results.TransientSolution[0].Vy, + md.results.TransientSolution[0].Vel, + md.results.TransientSolution[0].Pressure, + md.results.TransientSolution[0].Thickness, + md.results.TransientSolution[0].Surface, + md.results.TransientSolution[0].MaskIceLevelset, + md.results.TransientSolution[1].Vx, + md.results.TransientSolution[1].Vy, + md.results.TransientSolution[1].Vel, + md.results.TransientSolution[1].Pressure, + md.results.TransientSolution[1].Thickness, + md.results.TransientSolution[1].Surface, + md.results.TransientSolution[1].MaskIceLevelset, + md.results.TransientSolution[2].Vx, + md.results.TransientSolution[2].Vy, + md.results.TransientSolution[2].Vel, + md.results.TransientSolution[2].Pressure, + md.results.TransientSolution[2].Thickness, + md.results.TransientSolution[2].Surface, + md.results.TransientSolution[2].MaskIceLevelset] Index: /issm/trunk-jpl/test/NightlyRun/test808.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test808.py (revision 23792) +++ /issm/trunk-jpl/test/NightlyRun/test808.py (revision 23793) @@ -10,9 +10,9 @@ from calvingminthickness import * -md = triangle(model(),'../Exp/Square.exp',30000.) -md = setmask(md,'all','') -md = parameterize(md,'../Par/SquareShelf.py') -md = setflowequation(md,'SSA','all') -md.cluster = generic('name',gethostname(),'np',3) +md = triangle(model(), '../Exp/Square.exp', 30000.) +md = setmask(md, 'all', '') +md = parameterize(md, '../Par/SquareShelf.py') +md = setflowequation(md, 'SSA', 'all') +md.cluster = generic('name', gethostname(), 'np', 3) x = md.mesh.x @@ -38,35 +38,35 @@ md.calving.min_thickness = 400 md.frontalforcings.meltingrate = np.zeros((md.mesh.numberofvertices,)) -md.levelset.spclevelset = float('NaN')* np.ones((md.mesh.numberofvertices,)) +md.levelset.spclevelset = float('NaN') * np.ones((md.mesh.numberofvertices,)) md.levelset.reinit_frequency = 1 -md = solve(md,'Transient') +md = solve(md, 'Transient') #Fields and tolerances to track changes -field_names = [ 'Vx1','Vy1','Vel1','Pressure1','Thickness1','Surface1','MaskIceLevelset1' - 'Vx2','Vy2','Vel2','Pressure2','Thickness2','Surface2','MaskIceLevelset2' - 'Vx3','Vy3','Vel3','Pressure3','Thickness3','Surface3','MaskIceLevelset3'] -field_tolerances = [1e-8,1e-8,1e-8,1e-9,1e-9,1e-9,3e-9, - 1e-8,1e-8,1e-8,1e-9,1e-9,1e-9,3e-9, - 1e-8,1e-8,1e-8,1e-9,1e-9,1e-9,3e-9] +field_names = ['Vx1', 'Vy1', 'Vel1', 'Pressure1', 'Thickness1', 'Surface1', 'MaskIceLevelset1' + 'Vx2', 'Vy2', 'Vel2', 'Pressure2', 'Thickness2', 'Surface2', 'MaskIceLevelset2' + 'Vx3', 'Vy3', 'Vel3', 'Pressure3', 'Thickness3', 'Surface3', 'MaskIceLevelset3'] +field_tolerances = [1e-8, 1e-8, 1e-8, 1e-9, 1e-9, 1e-9, 3e-9, + 1e-8, 1e-8, 1e-8, 1e-9, 1e-9, 1e-9, 3e-9, + 1e-8, 1e-8, 1e-8, 1e-9, 1e-9, 1e-9, 3e-9] field_values = [md.results.TransientSolution[0].Vx, - md.results.TransientSolution[0].Vy, - md.results.TransientSolution[0].Vel, - md.results.TransientSolution[0].Pressure, - md.results.TransientSolution[0].Thickness, - md.results.TransientSolution[0].Surface, - md.results.TransientSolution[0].MaskIceLevelset, - md.results.TransientSolution[1].Vx, - md.results.TransientSolution[1].Vy, - md.results.TransientSolution[1].Vel, - md.results.TransientSolution[1].Pressure, - md.results.TransientSolution[1].Thickness, - md.results.TransientSolution[1].Surface, - md.results.TransientSolution[1].MaskIceLevelset, - md.results.TransientSolution[2].Vx, - md.results.TransientSolution[2].Vy, - md.results.TransientSolution[2].Vel, - md.results.TransientSolution[2].Pressure, - md.results.TransientSolution[2].Thickness, - md.results.TransientSolution[2].Surface, - md.results.TransientSolution[2].MaskIceLevelset] + md.results.TransientSolution[0].Vy, + md.results.TransientSolution[0].Vel, + md.results.TransientSolution[0].Pressure, + md.results.TransientSolution[0].Thickness, + md.results.TransientSolution[0].Surface, + md.results.TransientSolution[0].MaskIceLevelset, + md.results.TransientSolution[1].Vx, + md.results.TransientSolution[1].Vy, + md.results.TransientSolution[1].Vel, + md.results.TransientSolution[1].Pressure, + md.results.TransientSolution[1].Thickness, + md.results.TransientSolution[1].Surface, + md.results.TransientSolution[1].MaskIceLevelset, + md.results.TransientSolution[2].Vx, + md.results.TransientSolution[2].Vy, + md.results.TransientSolution[2].Vel, + md.results.TransientSolution[2].Pressure, + md.results.TransientSolution[2].Thickness, + md.results.TransientSolution[2].Surface, + md.results.TransientSolution[2].MaskIceLevelset]