Changeset 21412

Timestamp:

11/22/16 07:04:11 (8 years ago)

Author:

bdef

Message:

BUG:minor typos and changing print formating in runme.py

Location:

issm/trunk-jpl/test/NightlyRun

Files:

• runme.py (modified) (6 diffs)
• test803.py (modified) (1 diff)
• test806.py (modified) (1 diff)
• test807.py (modified) (1 diff)

issm/trunk-jpl/test/NightlyRun/runme.py

@@ -54 +54 @@
         #GET benchmark {{{
         if not benchmark in ['all','nightly','ismip','eismint','thermal','mesh','validation','tranforcing','adolc','slr']:
-                print "runme warning: benchmark '%s' not supported, defaulting to test 'nightly'." % benchmark
+                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 '%s' not supported, defaulting to test 'check'." % procedure
+                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 '%s' not supported, defaulting to test 'none'." % output
+                print("runme warning: output '{}' not supported, defaulting to test 'none'.".format(output))
                 output='none'
         # }}}
@@ -167 +167 @@
 
                                 for k,fieldname in enumerate(field_names):
-
+                                        print fieldname
                                         try:
+                                                print('getting {}'.format(fieldname))
                                                 #Get field and tolerance
                                                 field=np.array(field_values[k])
@@ -183 +184 @@
                                                 if archive == None:
                                                         raise NameError("Field name '"+archive_name+'_field'+str(k+1)+"' does not exist in archive file.")
-                                                error_diff=np.amax(np.abs(archive-field),axis=0)/ \
-                                                                   (np.amax(np.abs(archive),axis=0)+float_info.epsilon)
+                                                error_diff=np.amax(np.abs(archive-field),axis=0)/(np.amax(np.abs(archive),axis=0)+float_info.epsilon)
 
                                                 #disp test result
                                                 if (np.any(error_diff>tolerance) or np.isnan(error_diff)):
-                                                        print 'ERROR   difference: %-7.2g > %7.2g test id: %i test name: %s field: %s' % \
-                                                                (error_diff,tolerance,id,id_string,fieldname)
+                                                        print('ERROR   difference: {} > {} test id: {} test name: {} field: {}'.format(error_diff,tolerance,id,id_string,fieldname))
                                                 else:
-                                                        print 'SUCCESS difference: %-7.2g < %7.2g test id: %i test name: %s field: %s' % \
-                                                                (error_diff,tolerance,id,id_string,fieldname)
+                                                        print('SUCCESS difference: {} < {} test id: {} test name: {} field: {}'.format(error_diff,tolerance,id,id_string,fieldname))
 
                                         except Exception as message:
@@ -204 +202 @@
                                                         fid.write('\n------------------------------------------------------------------\n')
                                                         fid.close()
-                                                        print 'FAILURE difference: N/A test id: %i test name: %s field: %s' % (id,id_string,fieldname)
+                                                        print('FAILURE difference: N/A test id: {} test name: {} field: {}'.format(id,id_string,fieldname))
                                                 else:
-                                                        print 'FAILURE difference: N/A test id: %i test name: %s field: %s' % (id,id_string,fieldname)
+                                                        print('FAILURE difference: N/A test id: {} test name: {} field: {}'.format(id,id_string,fieldname))
                                                         raise RuntimeError(message)
 
@@ -220 +218 @@
                                 fid.write('\n------------------------------------------------------------------\n')
                                 fid.close()
-                                print 'FAILURE difference: N/A test id: %i test name: %s field: %s' % (id,id_string,'N/A')
+                                print('FAILURE difference: N/A test id: {} test name: {} field: {}'.format(id,id_string,'N/A'))
                         else:
-                                print 'FAILURE difference: N/A test id: %i test name: %s field: %s' % (id,id_string,'N/A')
+                                print('FAILURE difference: N/A test id: {} test name: {} field: {}'.format(id,id_string,'N/A'))
                                 raise RuntimeError(message)
 
@@ -239 +237 @@
                                 print "PYTHONSTARTUP error: ",e
                 else:
-                        print "PYTHONSTARTUP file '%s' does not exist." % PYTHONSTARTUP
+                        print("PYTHONSTARTUP file '{}' does not exist.".format(PYTHONSTARTUP))
 
         parser = argparse.ArgumentParser(description='RUNME - test deck for ISSM nightly runs')

issm/trunk-jpl/test/NightlyRun/test803.py

@@ -17 +17 @@
 
 #Thermal model
-pos_surf=np.nonzero(md.mesh.vertexonsurface)[0]
+pos_surf=np.where(md.mesh.vertexonsurface)[0]
 md.thermal.spctemperature[pos_surf]=md.initialization.temperature[pos_surf]
 md.thermal.isenthalpy=True

issm/trunk-jpl/test/NightlyRun/test806.py

@@ -38 +38 @@
 md.calving.coeff=4.89e13*np.ones((md.mesh.numberofvertices))
 md.calving.meltingrate=np.zeros((md.mesh.numberofvertices))
-md.levelset.spclevelset=np.np.nan*np.ones((md.mesh.numberofvertices))
+md.levelset.spclevelset=np.nan*np.ones((md.mesh.numberofvertices))
 
 md.transient.requested_outputs=['default','StrainRateparallel','StrainRateperpendicular','Calvingratex','Calvingratey','CalvingCalvingrate']

issm/trunk-jpl/test/NightlyRun/test807.py

@@ -37 +37 @@
 md.calving.calvingrate=np.zeros((md.mesh.numberofvertices))
 md.calving.meltingrate=10000*np.ones((md.mesh.numberofvertices))
-md.levelset.spclevelset=np.np.nan*np.ones((md.mesh.numberofvertices))
+md.levelset.spclevelset=np.nan*np.ones((md.mesh.numberofvertices))
 
 md=solve(md,'Transient')