From f61296f5c5c370aa3620b2829be14de67a9c16e9 Mon Sep 17 00:00:00 2001 From: Philip Eisenlohr Date: Wed, 25 Aug 2021 08:26:25 -0400 Subject: [PATCH 1/3] added help to submit_job --- python/damask/solver/_marc.py | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/python/damask/solver/_marc.py b/python/damask/solver/_marc.py index 03dad2fea..7493fb3b7 100644 --- a/python/damask/solver/_marc.py +++ b/python/damask/solver/_marc.py @@ -8,7 +8,7 @@ _msc_root = '/opt/msc' _damask_root = str(Path(__file__).parents[3]) class Marc: - """Wrapper to run DAMASK with MSCMarc.""" + """Wrapper to run DAMASK with MSC.Marc.""" def __init__(self,msc_version=_msc_version,msc_root=_msc_root,damask_root=_damask_root): """ @@ -47,7 +47,22 @@ class Marc: def submit_job(self, model, job, compile = False, optimization = ''): + """ + Assemble command line arguments and call Marc executable. + Parameters + ---------- + model : str + Name of model. + job : str + Name of job. + compile : bool, optional + Compile DAMASK_Marc user subroutine (and save for later use). + Defaults to False. + optimization : str, optional + Optimization level. + + """ usersub = (self.damask_root/'src/DAMASK_Marc').with_suffix('.f90' if compile else '.marc') if not usersub.is_file(): raise FileNotFoundError(f'subroutine ({"source" if compile else "binary"}) "{usersub}" not found') From 3be2fd81e9a22466379858e3984c96bd7809538d Mon Sep 17 00:00:00 2001 From: Franz Roters Date: Wed, 25 Aug 2021 16:10:39 +0200 Subject: [PATCH 2/3] added help on optimization levels --- python/damask/solver/_marc.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/python/damask/solver/_marc.py b/python/damask/solver/_marc.py index 7493fb3b7..65218fd9b 100644 --- a/python/damask/solver/_marc.py +++ b/python/damask/solver/_marc.py @@ -60,7 +60,8 @@ class Marc: Compile DAMASK_Marc user subroutine (and save for later use). Defaults to False. optimization : str, optional - Optimization level. + Optimization level '' (-O0), l (-O1), or 'h' (-O3). + Defaults to ''. """ usersub = (self.damask_root/'src/DAMASK_Marc').with_suffix('.f90' if compile else '.marc') From ad707f543b9c9bbe5f7a4dd89198dd530dd0fb94 Mon Sep 17 00:00:00 2001 From: Philip Eisenlohr Date: Wed, 25 Aug 2021 14:57:38 +0000 Subject: [PATCH 3/3] [skip ci] added quotes around second list value ("l") --- python/damask/solver/_marc.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/python/damask/solver/_marc.py b/python/damask/solver/_marc.py index 65218fd9b..c2de52dc6 100644 --- a/python/damask/solver/_marc.py +++ b/python/damask/solver/_marc.py @@ -57,10 +57,10 @@ class Marc: job : str Name of job. compile : bool, optional - Compile DAMASK_Marc user subroutine (and save for later use). + Compile DAMASK_Marc user subroutine (and save for future use). Defaults to False. optimization : str, optional - Optimization level '' (-O0), l (-O1), or 'h' (-O3). + Optimization level '' (-O0), 'l' (-O1), or 'h' (-O3). Defaults to ''. """