Skip to content

Commit

Permalink
updates python print statements for future use with python3
Browse files Browse the repository at this point in the history
  • Loading branch information
@danielpeter
danielpeter committed Nov 6, 2019
1 parent efc6efd commit d2a344b
Show file tree
Hide file tree
Showing 73 changed files with 930 additions and 1,285 deletions.
24 changes: 21 additions & 3 deletions CUBIT_GEOCUBIT/GEOCUBIT.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,24 @@
- numpy 1.0+ - http://downloads.sourceforge.net/numpy
"""
from __future__ import print_function

import sys

print("GEOCUBIT")

# version info
python_major_version = sys.version_info[0]
python_minor_version = sys.version_info[1]
print("Python version: ","{}.{}".format(python_major_version,python_minor_version))

# in case importing menu fails due to import utilities errors to find,
# this will add the geocubitlib/ folder to the sys.path:
import geocubitlib
sys.path.append(geocubitlib.__path__[0])
#print(sys.path)
print('')

import geocubitlib.menu as menu
import geocubitlib.start as start

Expand All @@ -41,7 +59,7 @@

if __name__ == '__main__':

print 'VERSION 4.1'
print('VERSION 4.1')

# GEOMETRY
if menu.build_surface:
Expand Down Expand Up @@ -81,8 +99,8 @@

if menu.export2SPECFEM3D and not menu.collect:
from geocubitlib.exportlib import e2SEM
print menu.cubfiles
print 'hex27 ', menu.hex27
print(menu.cubfiles)
print('hex27 ', menu.hex27)
e2SEM(files=menu.cubfiles,
listblock=menu.listblock,
listflag=menu.listflag,
Expand Down
7 changes: 4 additions & 3 deletions CUBIT_GEOCUBIT/geocubitlib/LatLongUTMconversion.py
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#!/usr/bin/env python

#
# Lat Long - UTM, UTM - Lat Long conversions
from __future__ import print_function

from math import pi, sin, cos, tan, sqrt

Expand Down Expand Up @@ -246,6 +247,6 @@ def UTMtoLL(ReferenceEllipsoid, northing, easting, zone):

if __name__ == '__main__':
(z, e, n) = LLtoUTM(23, 45.00, -75.00)
print z, e, n
print(z, e, n)
(lat, lon) = UTMtoLL(23, n, e, z)
print lat, lon
print(lat, lon)
100 changes: 51 additions & 49 deletions CUBIT_GEOCUBIT/geocubitlib/boundary_definition.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,16 @@
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #
# #
#############################################################################
from __future__ import print_function

try:
import start as start
cubit = start.start_cubit()
except:
try:
import cubit
except:
print 'error importing cubit, check if cubit is installed'
print('error importing cubit, check if cubit is installed')
pass

from utilities import list2str
Expand Down Expand Up @@ -112,15 +114,15 @@ def lateral_boundary_are_absorbing(iproc=0, cpuxmin=0, cpuxmax=1,
#
if iproc in iproc_xmin:
abs_xmin = xmin
print 'proc ', iproc, ' has absorbing boundary xmin'
print('proc ', iproc, ' has absorbing boundary xmin')
if iproc in iproc_ymin:
print 'proc ', iproc, ' has absorbing boundary ymin'
print('proc ', iproc, ' has absorbing boundary ymin')
abs_ymin = ymin
if iproc in iproc_xmax:
print 'proc ', iproc, ' has absorbing boundary xmax'
print('proc ', iproc, ' has absorbing boundary xmax')
abs_xmax = xmax
if iproc in iproc_ymax:
print 'proc ', iproc, ' has absorbing boundary ymax'
print('proc ', iproc, ' has absorbing boundary ymax')
abs_ymax = ymax
return abs_xmin, abs_xmax, abs_ymin, abs_ymax

Expand Down Expand Up @@ -279,9 +281,9 @@ def build_block(vol_list, name, id_0=1, top_surf=None, optionsea=False):
seathres = False

#
print 'build blocks'
print('build blocks')
block_list = cubit.get_block_id_list()
print block_list, vol_list
print(block_list, vol_list)
if len(block_list) > 0:
id_block = max(max(block_list), 2) + id_0
else:
Expand Down Expand Up @@ -318,11 +320,11 @@ def build_block(vol_list, name, id_0=1, top_surf=None, optionsea=False):
if version_cubit >= 15:
command = 'block ' + str(id_block) + ' hex in vol ' + \
str(v)
print command
print(command)
else:
command = 'block ' + str(id_block) + ' hex in vol ' + \
str(v) + ' except hex in vol ' + str(list(v_other))
print command
print(command)
command = command.replace("[", " ").replace("]", " ")
cubit.cmd(command)
command = "block " + str(id_block) + " name '" + n + "'"
Expand Down Expand Up @@ -390,76 +392,76 @@ def define_bc(*args, **keys):
cpux=cpux, cpuy=cpuy)
id_0 = cubit.get_next_block_id()
v_list, name_list = define_block()
print 'define block', v_list, name_list
print('define block', v_list, name_list)
build_block(v_list, name_list, id_0, top_surf, optionsea=optionsea)
# entities
entities = ['face']
if type(args) == list:
if len(args) > 0:
entities = args[0]
print entities
print(entities)
for entity in entities:
print "##entity: " + str(entity)
print("##entity: " + str(entity))
# block for free surface (w/ topography)
# print '## topo surface block: ' + str(topo)
# print('## topo surface block: ' + str(topo))
if len(top_surf) == 0:
print ""
print "no topo surface found,\
please create block face_topo manually..."
print ""
print("")
print("no topo surface found,\
please create block face_topo manually...")
print("")
else:
build_block_side(top_surf, entity + '_topo',
obj=entity, id_0=1001)
# model has parallel sides (e.g. a block model )
# xmin - blocks
if len(xmin) == 0:
print ""
print "0 abs_xmin surface found, please create block manually"
print ""
print("")
print("0 abs_xmin surface found, please create block manually")
print("")
else:
build_block_side(xmin, entity + '_abs_xmin',
obj=entity, id_0=1003)
# xmax - blocks
if len(xmax) == 0:
print ""
print "0 abs_xmax surface found, please create block manually"
print ""
print("")
print("0 abs_xmax surface found, please create block manually")
print("")
else:
build_block_side(xmax, entity + '_abs_xmax',
obj=entity, id_0=1005)
# ymin - blocks
if len(ymin) == 0:
print ""
print "0 abs_xmin surface found, please create block manually"
print ""
print("")
print("0 abs_xmin surface found, please create block manually")
print("")
else:
build_block_side(ymin, entity + '_abs_ymin',
obj=entity, id_0=1004)
# ymax - blocks
if len(ymax) == 0:
print ""
print "0 abs_ymax surface found, please create block manually"
print ""
print("")
print("0 abs_ymax surface found, please create block manually")
print("")
else:
build_block_side(ymax, entity + '_abs_ymax',
obj=entity, id_0=1006)
# bottom - blocks
if len(bottom_surf) == 0:
print ""
print "0 abs_bottom surf found, please create block manually"
print ""
print("")
print("0 abs_bottom surf found, please create block manually")
print("")
else:
build_block_side(bottom_surf, entity +
'_abs_bottom', obj=entity, id_0=1002)
elif closed:
print "##closed region not ready"
print("##closed region not ready")
# surf = define_absorbing_surf_sphere()
# v_list, name_list = define_block()
# build_block(v_list, name_list, id_0)
# # entities
# entities = args[0]
# id_side = 1001
# print entities
# print(entities)
# for entity in entities:
# build_block_side(surf, entity + '_closedvol',
# obj=entity, id_0=id_side)
Expand Down Expand Up @@ -528,7 +530,7 @@ def get_ordered_node_surf(lsurface, icurve):
if k != 0:
cubit.cmd('del group sl')
else:
print 'initializing group sl'
print('initializing group sl')
cubit.cmd("group 'sl' add node in surf " + lsurf)
group1 = cubit.get_id_from_name("sl")
nodes_ls = list(cubit.get_group_nodes(group1))
Expand All @@ -540,7 +542,7 @@ def get_ordered_node_surf(lsurface, icurve):
if k != 0:
cubit.cmd('del group n1')
else:
print 'initializing group n1'
print('initializing group n1')
cubit.cmd("group 'n1' add node in curve " + icurvestr)
x = cubit.get_bounding_box('curve', icurve)
if x[2] > x[5]:
Expand Down Expand Up @@ -600,7 +602,7 @@ def get_ordered_node_surf(lsurface, icurve):
if k != 0:
cubit.cmd('del group curve_vertical')
else:
print 'initializing group curve_vertical'
print('initializing group curve_vertical')
cubit.cmd("group 'curve_vertical' add node in curve " + kcurve)
group1 = cubit.get_id_from_name('curve_vertical')
nodes_curve = list(cubit.get_group_nodes(group1))
Expand Down Expand Up @@ -632,14 +634,14 @@ def check_bc(iproc, xmin, xmax, ymin, ymax,
curve_bottom_xmin, curve_bottom_ymin, curve_bottom_xmax, \
curve_bottom_ymax = \
extract_bottom_curves(surf_xmin, surf_ymin, surf_xmax, surf_ymax)
# print 'absorbing surfaces: ', absorbing_surf
print 'absorbing surfaces xmin : ', abs_xmin
print 'absorbing surfaces xmax : ', abs_xmax
print 'absorbing surfaces ymin : ', abs_ymin
print 'absorbing surfaces ymax : ', abs_ymax
print 'absorbing surfaces top : ', top_surf
print 'absorbing surfaces bottom : ', bottom_surf
# print 'bottom curves: ', surf_xmin, surf_ymin, surf_xmax, surf_ymax
# print('absorbing surfaces: ', absorbing_surf)
print('absorbing surfaces xmin : ', abs_xmin)
print('absorbing surfaces xmax : ', abs_xmax)
print('absorbing surfaces ymin : ', abs_ymin)
print('absorbing surfaces ymax : ', abs_ymax)
print('absorbing surfaces top : ', top_surf)
print('absorbing surfaces bottom : ', bottom_surf)
# print('bottom curves: ', surf_xmin, surf_ymin, surf_xmax, surf_ymax)
#
#
#
Expand Down Expand Up @@ -717,10 +719,10 @@ def check_bc(iproc, xmin, xmax, ymin, ymax,
boundary['node_curve_xmaxymin'] = c_xmaxymin
boundary['node_curve_xmaxymax'] = c_xmaxymax

# print boundary['node_curve_xminymin']
# print boundary['node_curve_xminymax']
# print boundary['node_curve_xmaxymin']
# print boundary['node_curve_xmaxymax']
# print(boundary['node_curve_xminymin'])
# print(boundary['node_curve_xminymax'])
# print(boundary['node_curve_xmaxymin'])
# print(boundary['node_curve_xmaxymax'])
entities = ['face']
#
for entity in entities:
Expand Down
Loading

0 comments on commit d2a344b

Please sign in to comment.