From 92534434e6d5a30b493b0922691db0b76d3bf36b Mon Sep 17 00:00:00 2001 From: acrovato <a.crovato@uliege.be> Date: Fri, 6 May 2022 14:45:06 +0200 Subject: [PATCH] Update module import order for consistency --- dart/api/core.py | 6 ++---- dart/benchmark/onera.py | 2 +- dart/tests/adjoint.py | 2 +- dart/tests/bli.py | 2 +- dart/tests/cylinder.py | 2 +- dart/tests/lift.py | 2 +- dart/tests/morpher.py | 2 +- dart/tests/nonlift.py | 2 +- dart/tests/rae_25.py | 12 ++++++------ dart/tests/rae_3.py | 12 ++++++------ dart/validation/agard.py | 2 +- dart/validation/onera.py | 2 +- ext/amfe | 2 +- 13 files changed, 24 insertions(+), 26 deletions(-) diff --git a/dart/api/core.py b/dart/api/core.py index d7e6c9a..af1922a 100644 --- a/dart/api/core.py +++ b/dart/api/core.py @@ -53,11 +53,10 @@ def initDart(cfg, scenario='aerodynamic', task='analysis'): Adjoint solver """ # Imports - import math - import fwk.wutils as wu + import dart import tbox import tbox.gmsh as gmsh - import dart + import math # Basic checks and config # dimension @@ -101,7 +100,6 @@ def initDart(cfg, scenario='aerodynamic', task='analysis'): nthrd = cfg['Threads'] else: nthrd = 1 - wu.initMKL(nthrd) # initialize threading layer and number of threads # verbosity if 'Verb' in cfg: verb = cfg['Verb'] diff --git a/dart/benchmark/onera.py b/dart/benchmark/onera.py index 0608778..36f048a 100644 --- a/dart/benchmark/onera.py +++ b/dart/benchmark/onera.py @@ -19,13 +19,13 @@ ## Compute flow around the Onera M6 wing at 3 degrees AOA and Mach 0.84 for benchmark # Adrien Crovato -import numpy as np import dart.default as floD import dart.utils as floU import tbox.utils as tbxU import fwk from fwk.testing import * from fwk.coloring import ccolors +import numpy as np def newton(pbl): from fwk.wutils import parseargs diff --git a/dart/tests/adjoint.py b/dart/tests/adjoint.py index 5788fe2..f2ed009 100644 --- a/dart/tests/adjoint.py +++ b/dart/tests/adjoint.py @@ -25,13 +25,13 @@ # This test is provided to ensure that the solver works properly. # Mesh refinement may have to be performed to obtain physical results. -import numpy as np import dart.utils as floU import dart.default as floD import tbox.utils as tboxU import fwk from fwk.testing import * from fwk.coloring import ccolors +import numpy as np def main(): # timer diff --git a/dart/tests/bli.py b/dart/tests/bli.py index ae4d0c9..9fbf80b 100644 --- a/dart/tests/bli.py +++ b/dart/tests/bli.py @@ -34,7 +34,6 @@ # This test is provided to ensure that the solver works properly. # Mesh refinement may have to be performed to obtain physical results. -import math import dart.utils as floU import dart.default as floD import dart.viscous.solver as floVS @@ -43,6 +42,7 @@ import tbox.utils as tboxU import fwk from fwk.testing import * from fwk.coloring import ccolors +import math def main(): # timer diff --git a/dart/tests/cylinder.py b/dart/tests/cylinder.py index 07d4311..6a10c2b 100644 --- a/dart/tests/cylinder.py +++ b/dart/tests/cylinder.py @@ -25,11 +25,11 @@ # This test is provided to ensure that the solver works properly. # Mesh refinement may have to be performed to obtain physical results. -import math import dart.default as floD import fwk from fwk.testing import * from fwk.coloring import ccolors +import math def main(): # timer diff --git a/dart/tests/lift.py b/dart/tests/lift.py index 1c8ee82..e765514 100644 --- a/dart/tests/lift.py +++ b/dart/tests/lift.py @@ -25,13 +25,13 @@ # This test is provided to ensure that the solver works properly. # Mesh refinement may have to be performed to obtain physical results. -import math import dart.utils as floU import dart.default as floD import tbox.utils as tboxU import fwk from fwk.testing import * from fwk.coloring import ccolors +import math def main(): # timer diff --git a/dart/tests/morpher.py b/dart/tests/morpher.py index c82f277..63c9b47 100644 --- a/dart/tests/morpher.py +++ b/dart/tests/morpher.py @@ -25,13 +25,13 @@ # This test is provided to ensure that the solver works properly. # Mesh refinement may have to be performed to obtain physical results. -import numpy as np import dart.utils as floU import dart.default as floD import tbox.utils as tboxU import fwk from fwk.testing import * from fwk.coloring import ccolors +import numpy as np def main(): # timer diff --git a/dart/tests/nonlift.py b/dart/tests/nonlift.py index 2710fcb..2f39482 100644 --- a/dart/tests/nonlift.py +++ b/dart/tests/nonlift.py @@ -26,13 +26,13 @@ # Mesh refinement may have to be performed to obtain physical results. # The residual might not fully converge if this test is used with gmsh4 -import math import dart.utils as floU import dart.default as floD import tbox.utils as tboxU import fwk from fwk.testing import * from fwk.coloring import ccolors +import math def main(): # timer diff --git a/dart/tests/rae_25.py b/dart/tests/rae_25.py index 1677f29..33a83b4 100644 --- a/dart/tests/rae_25.py +++ b/dart/tests/rae_25.py @@ -2,13 +2,13 @@ # -*- coding: utf-8 -*- # Copyright 2020 University of Liège -# +# # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -25,11 +25,11 @@ # This test is provided to ensure that the solver works properly. # Mesh refinement may have to be performed to obtain physical results. -import numpy as np import dart.default as floD import fwk from fwk.testing import * -from fwk.coloring import ccolors +from fwk.coloring import ccolors +import numpy as np def main(): # timer @@ -49,7 +49,7 @@ def main(): c_ref = 1.0 # reference length S_ref = spn # reference area fms = 1.0 # farfield mesh size - nms = 0.01 # nearfield mesh size + nms = 0.01 # nearfield mesh size # mesh the geometry print(ccolors.ANSI_BLUE + 'PyMeshing...' + ccolors.ANSI_RESET) diff --git a/dart/tests/rae_3.py b/dart/tests/rae_3.py index 4d8e8c2..7bb85ba 100644 --- a/dart/tests/rae_3.py +++ b/dart/tests/rae_3.py @@ -2,13 +2,13 @@ # -*- coding: utf-8 -*- # Copyright 2020 University of Liège -# +# # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -25,11 +25,11 @@ # This test is provided to ensure that the solver works properly. # Mesh refinement may have to be performed to obtain physical results. -import numpy as np import dart.default as floD import fwk from fwk.testing import * -from fwk.coloring import ccolors +from fwk.coloring import ccolors +import numpy as np def main(): # timer @@ -49,7 +49,7 @@ def main(): c_ref = 1.0 # reference length S_ref = spn # reference area fms = 1.0 # farfield mesh size - nms = 0.02 # nearfield mesh size + nms = 0.02 # nearfield mesh size # parameters for mesh deformation alfa = 1*np.pi/180 diff --git a/dart/validation/agard.py b/dart/validation/agard.py index 86d5b9b..fb1fb03 100644 --- a/dart/validation/agard.py +++ b/dart/validation/agard.py @@ -19,13 +19,13 @@ ## Compute flow around the Agard 445 wing at 1 degrees AOA and Mach 0.80 # Adrien Crovato -import numpy as np import dart.utils as floU import dart.default as floD import tbox.utils as tbxU import fwk from fwk.testing import * from fwk.coloring import ccolors +import numpy as np try: import tboxVtk diff --git a/dart/validation/onera.py b/dart/validation/onera.py index 6957094..8bb1fad 100644 --- a/dart/validation/onera.py +++ b/dart/validation/onera.py @@ -19,13 +19,13 @@ ## Compute flow around the Onera M6 wing at 3 degrees AOA and Mach 0.84 # Adrien Crovato -import numpy as np import dart.utils as floU import dart.default as floD import tbox.utils as tbxU import fwk from fwk.testing import * from fwk.coloring import ccolors +import numpy as np try: import tboxVtk diff --git a/ext/amfe b/ext/amfe index 6da1452..7dbafd3 160000 --- a/ext/amfe +++ b/ext/amfe @@ -1 +1 @@ -Subproject commit 6da145263ba67c32ad3c6b8af64e83f3a9b2913e +Subproject commit 7dbafd30acd41e369b54962af8a0994af1aa55e8 -- GitLab