From d9582558c0f89b5afa00b149cf5b5ae6308544ef Mon Sep 17 00:00:00 2001 From: "christophe.benoit@onera.fr" Date: Mon, 2 Sep 2024 13:08:50 +0200 Subject: [PATCH] All: minor --- .../Apps/test/FastIBMWireMeshModel_t1.py | 9 ++++---- Cassiopee/Apps/test/FastIBM_m2.py | 6 ++--- Cassiopee/Converter/doc/source/Converter.rst | 2 +- Cassiopee/KCore/installBase.py | 23 +++++++++---------- 4 files changed, 19 insertions(+), 21 deletions(-) diff --git a/Cassiopee/Apps/test/FastIBMWireMeshModel_t1.py b/Cassiopee/Apps/test/FastIBMWireMeshModel_t1.py index 76b6f079c..aec61d2bc 100644 --- a/Cassiopee/Apps/test/FastIBMWireMeshModel_t1.py +++ b/Cassiopee/Apps/test/FastIBMWireMeshModel_t1.py @@ -17,7 +17,7 @@ ##Geometry - Vertical Line tb = Internal.newCGNSTree() -Internal.newCGNSBase('IBCFil_Base1', 3, 3, parent=tb); +Internal.newCGNSBase('IBCFil_Base1', 3, 3, parent=tb) C._addState(tb, 'EquationDimension', 2) C._addState(tb, 'GoverningEquations', 'NSTurbulent') C._addState(tb, 'TurbulenceModel', 'OneEquation_SpalartAllmaras') @@ -38,9 +38,9 @@ tboffset = C.newPyTree(['Base', tboffset]) ##PREP -dfars = 5 -snears = 1 -vmin = 11 +dfars = 5 +snears = 1 +vmin = 11 t,tc = X_IBM.prepareIBMData(tb , None , None , tbox=tboffset, snears=snears , dfars=dfars , vmin=vmin, @@ -48,7 +48,6 @@ test.testT(t , 1) test.testT(tc, 2) - ##COMPUTE NIT = 25 # number of iterations modulo_verif = 5 # iteration frequency to display modulo_verif diff --git a/Cassiopee/Apps/test/FastIBM_m2.py b/Cassiopee/Apps/test/FastIBM_m2.py index b6bfa5690..8118e9897 100644 --- a/Cassiopee/Apps/test/FastIBM_m2.py +++ b/Cassiopee/Apps/test/FastIBM_m2.py @@ -45,7 +45,7 @@ C._addState(tb, adim='adim1', MInf=0.1, alphaZ=0., alphaY=0., ReInf=40000., MutSMuInf=0.1, TurbLevelInf=1.e-4) -if Cmpi.rank==0: C.convertPyTree2File(tb, FILEB) +if Cmpi.rank == 0: C.convertPyTree2File(tb, FILEB) Cmpi.barrier() # Prepare @@ -66,9 +66,9 @@ Internal._rmNodesByName(t, '.Solver#Param') Internal._rmNodesByName(t, '.Solver#ownData') Internal._rmNodesByName(t, '.Solver#dtloc') - test.testT(t,2) + test.testT(t, 2) graphIBCDPost, ts = P_IBM.prepareSkinReconstruction(tb, tc, dimPb=3) P_IBM._computeSkinVariables(ts, tc, graphIBCDPost, dimPb=3) Cmpi.barrier() -if Cmpi.rank==0: test.testT(ts,3) +if Cmpi.rank == 0: test.testT(ts, 3) diff --git a/Cassiopee/Converter/doc/source/Converter.rst b/Cassiopee/Converter/doc/source/Converter.rst index 271428a68..0ba0044ab 100644 --- a/Cassiopee/Converter/doc/source/Converter.rst +++ b/Cassiopee/Converter/doc/source/Converter.rst @@ -112,7 +112,7 @@ recognised. Naming convention is described in the following table. +--------------------------------------------------------------------+----------------------------------+-------------------+ | Molecular viscosity | ViscosityMolecular | | +--------------------------------------------------------------------+----------------------------------+-------------------+ -| Cell nature field (0:blanked, 1:discretised, 2:interpolated) | | cellN, cellnf | +| Cell nature field (0:blanked, 1:discretised, 2:interpolated) | | cellN, celln | +--------------------------------------------------------------------+----------------------------------+-------------------+ | Cell nature field (0:blanked, 1:discretised, -Id interp block) | | cellNF, cellnf | +--------------------------------------------------------------------+----------------------------------+-------------------+ diff --git a/Cassiopee/KCore/installBase.py b/Cassiopee/KCore/installBase.py index 55968d0b5..61d25d877 100644 --- a/Cassiopee/KCore/installBase.py +++ b/Cassiopee/KCore/installBase.py @@ -1007,7 +1007,7 @@ False, # static [], # additionalIncludePaths [], # additionalLibs -[], # additionalLibPaths +[], # additionalLibPaths False, # useCuda [] # NvccAdditionalOptions ], @@ -1022,7 +1022,7 @@ False, # static [], # additionalIncludePaths [], # additionalLibs -[], # additionalLibPaths +[], # additionalLibPaths True, # useCuda [] # NvccAdditionalOptions ], @@ -1037,7 +1037,7 @@ False, # static [], # additionalIncludePaths [], # additionalLibs -[], # additionalLibPaths +[], # additionalLibPaths True, # useCuda [] # NvccAdditionalOptions ], @@ -1052,7 +1052,7 @@ False, # static [], # additionalIncludePaths [], # additionalLibs -[], # additionalLibPaths +[], # additionalLibPaths False, # useCuda [] # NvccAdditionalOptions ], @@ -1067,7 +1067,7 @@ False, # static [], # additionalIncludePaths [], # additionalLibs -[], # additionalLibPaths +[], # additionalLibPaths False, # useCuda [] # NvccAdditionalOptions ], @@ -1082,7 +1082,7 @@ False, # static [], # additionalIncludePaths [], # additionalLibs -[], # additionalLibPaths +[], # additionalLibPaths False, # useCuda [] # NvccAdditionalOptions ], @@ -1098,7 +1098,7 @@ False, # static [], # additionalIncludePaths [], # additionalLibs -[], # additionalLibPaths +[], # additionalLibPaths False, # useCuda [] # NvccAdditionalOptions ], @@ -1113,7 +1113,7 @@ False, # static [], # additionalIncludePaths [], # additionalLibs -[], # additionalLibPaths +[], # additionalLibPaths False, # useCuda [] # NvccAdditionalOptions ], @@ -1128,7 +1128,7 @@ False, # static [], # additionalIncludePaths [], # additionalLibs -[], # additionalLibPaths +[], # additionalLibPaths True, # useCuda [] # NvccAdditionalOptions ], @@ -1143,7 +1143,7 @@ False, # static [], # additionalIncludePaths [], # additionalLibs -[], # additionalLibPaths +[], # additionalLibPaths False, # useCuda [] # NvccAdditionalOptions ], @@ -1174,8 +1174,7 @@ False, # static ['/usr/include/hdf5/serial/'], # additionalIncludePaths [], # additionalLibs -['/usr/lib/gcc/x86_64-linux-gnu/7', - '/usr/lib/x86_64-linux-gnu/'], # additionalLibPaths +['/usr/lib/gcc/x86_64-linux-gnu/7', '/usr/lib/x86_64-linux-gnu/'], # additionalLibPaths False, # useCuda [] # NvccAdditionalOptions ],