diff --git a/dart/api/core.py b/dart/api/core.py index d7e6c9af23f0747596ed0b4293ade7c25ef5b549..af1922a94c01469f6d82753f1d9a2526028339d3 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 0608778da79c03ffbce21176d8db08c2de6465b6..36f048aa3666e342cda7650de1eddc6e49a00024 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 5788fe27441057128a222cd330e4d421add55673..f2ed009ed4f7fd00b350dbd6ac2f5c01a09c63b3 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 ae4d0c9ec5ce1d7ce9888b47678003cde07d046c..9fbf80b6c2391f371dd058dc50b09bd243dc26cd 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 07d43117a1d25ebf38f3f0e24cdbb843fc383762..6a10c2b432dc9da509ccae0a388b300429fd1c30 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 1c8ee82f1b62023c79550761527bd1288585ea9b..e7655142a438dfd60831ac818acf5ebd0c70b287 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 c82f27719227c722d27d4db4d80d0d17d546d4d3..63c9b47408f4652c440fc871545f7d5e24c685a9 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 2710fcbc16126072583f14e4a928b3301b71d615..2f39482ab0a1f26ea8c1daf17d43dc87d1b9596c 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 1677f290debd46cfa69b2ef138211e4d8a52092d..33a83b483196a1f19ac55efe1b89b6ed49a73eb1 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 4d8e8c291a79afe0b4ffe3b430e401b2ddb6967e..7bb85ba18422030359f68f4a983fb93046752545 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 86d5b9b767a88ab9107adba31809b85365a4d772..fb1fb03e48dbaf7e1dd78c8e89b0b3021f136581 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 6957094a6f26428f4bc3814c8ca757320c9cc1eb..8bb1fadc0f30c4603fe088c1f5345aec76212979 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 6da145263ba67c32ad3c6b8af64e83f3a9b2913e..7dbafd30acd41e369b54962af8a0994af1aa55e8 160000 --- a/ext/amfe +++ b/ext/amfe @@ -1 +1 @@ -Subproject commit 6da145263ba67c32ad3c6b8af64e83f3a9b2913e +Subproject commit 7dbafd30acd41e369b54962af8a0994af1aa55e8