m2cce/openfoam_project
Archived
1
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Removed distutils

Browse source
This commit is contained in:
Edgar P. Burkhart 2022-01-23 13:38:06 +01:00
parent 60e0eeafe2
commit 3520843a6e
Signed by: edpibu
GPG key ID: 9833D3C5A25BD227
1 changed files with 18 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
openfoam/run/__main__.py
View file

@ -8,7 +8,6 @@ from time import time
from datetime import timedelta from datetime import timedelta
from pathlib import Path from pathlib import Path
from distutils import dir_util
import subprocess as sp import subprocess as sp
_t0 = time() _t0 = time()
@ -43,25 +42,27 @@ if not work_dir.exists():
case_dir = work_dir.joinpath(config.get('main', 'case')) case_dir = work_dir.joinpath(config.get('main', 'case'))
if case_dir.exists(): if case_dir.exists():
log.info(f'Deleting case ({case_dir})') log.info(f'Deleting case ({case_dir})')
dir_util.remove_tree(str(case_dir)) sp.run(
('rm', '-r', case_dir)
)
log.info(f'Copying case ({input_dir} -> {case_dir})') log.info(f'Copying case ({input_dir} -> {case_dir})')
dir_util.copy_tree( sp.run(
str(input_dir), ('cp', '-r', input_dir, case_dir)
str(case_dir),
) )
if config.getboolean('stl', 'copy', fallback=False): if config.getboolean('stl', 'copy', fallback=False):
stl_dir = case_dir.joinpath('constant', 'triSurface') stl_dir = case_dir.joinpath('constant', 'triSurface')
if stl_dir.exists(): if stl_dir.exists():
log.info(f'Deleting stl directory ({stl_dir})') log.info(f'Deleting stl directory ({stl_dir})')
dir_util.remove_tree(str(stl_dir)) sp.run(
('rm', '-r', stl_dir)
)
stl_in = Path(config.get('stl', 'from')) stl_in = Path(config.get('stl', 'from'))
log.info(f'Copying stl directory ({stl_in} -> {stl_dir})') log.info(f'Copying stl directory ({stl_in} -> {stl_dir})')
dir_util.copy_tree( sp.run(
str(stl_in), ('cp', '-r', stl_in, stl_dir)
str(stl_dir),
) )
if config.getboolean('blockMesh', 'enable', fallback=False): if config.getboolean('blockMesh', 'enable', fallback=False):
@ -105,9 +106,11 @@ if config.getboolean('snappyHexMesh', 'enable', fallback=False):
log.info(f'snappyHexMesh finished successfully') log.info(f'snappyHexMesh finished successfully')
log.info('Copying 0.org -> 0') log.info('Copying 0.org -> 0')
dir_util.copy_tree( sp.run(
str(case_dir.joinpath('0.org')), ('cp', '-r',
str(case_dir.joinpath('0')), case_dir.joinpath('0.org'),
case_dir.joinpath('0'),
)
) )
if config.getboolean('setFields', 'enable', fallback=False): if config.getboolean('setFields', 'enable', fallback=False):
@ -198,7 +201,9 @@ if config.getboolean('olaFlow', 'enable', fallback=False):
log.info(f'Deleting processor directories') log.info(f'Deleting processor directories')
for proc_dir in case_dir.glob(r'processor*'): for proc_dir in case_dir.glob(r'processor*'):
log.info(f'Deleting {proc_dir}') log.info(f'Deleting {proc_dir}')
dir_util.remove_tree(str(proc_dir)) sp.run(
('rm', '-r', proc_dir)
)
_t1 = time() _t1 = time()
log.info(f'Program ended successfully after {timedelta(seconds=_t1-_t0)}') log.info(f'Program ended successfully after {timedelta(seconds=_t1-_t0)}')