Skip to content

Commit

Permalink
All: minor
Browse files Browse the repository at this point in the history
  • Loading branch information
benoit128 committed Sep 2, 2024
1 parent cf6b8ea commit d958255
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 21 deletions.
9 changes: 4 additions & 5 deletions Cassiopee/Apps/test/FastIBMWireMeshModel_t1.py
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand All @@ -38,17 +38,16 @@
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,
check=False , frontType=1)
test.testT(t , 1)
test.testT(tc, 2)


##COMPUTE
NIT = 25 # number of iterations
modulo_verif = 5 # iteration frequency to display modulo_verif
Expand Down
6 changes: 3 additions & 3 deletions Cassiopee/Apps/test/FastIBM_m2.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)
2 changes: 1 addition & 1 deletion Cassiopee/Converter/doc/source/Converter.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
+--------------------------------------------------------------------+----------------------------------+-------------------+
Expand Down
23 changes: 11 additions & 12 deletions Cassiopee/KCore/installBase.py
Original file line number Diff line number Diff line change
Expand Up @@ -1007,7 +1007,7 @@
False, # static
[], # additionalIncludePaths
[], # additionalLibs
[], # additionalLibPaths
[], # additionalLibPaths
False, # useCuda
[] # NvccAdditionalOptions
],
Expand All @@ -1022,7 +1022,7 @@
False, # static
[], # additionalIncludePaths
[], # additionalLibs
[], # additionalLibPaths
[], # additionalLibPaths
True, # useCuda
[] # NvccAdditionalOptions
],
Expand All @@ -1037,7 +1037,7 @@
False, # static
[], # additionalIncludePaths
[], # additionalLibs
[], # additionalLibPaths
[], # additionalLibPaths
True, # useCuda
[] # NvccAdditionalOptions
],
Expand All @@ -1052,7 +1052,7 @@
False, # static
[], # additionalIncludePaths
[], # additionalLibs
[], # additionalLibPaths
[], # additionalLibPaths
False, # useCuda
[] # NvccAdditionalOptions
],
Expand All @@ -1067,7 +1067,7 @@
False, # static
[], # additionalIncludePaths
[], # additionalLibs
[], # additionalLibPaths
[], # additionalLibPaths
False, # useCuda
[] # NvccAdditionalOptions
],
Expand All @@ -1082,7 +1082,7 @@
False, # static
[], # additionalIncludePaths
[], # additionalLibs
[], # additionalLibPaths
[], # additionalLibPaths
False, # useCuda
[] # NvccAdditionalOptions
],
Expand All @@ -1098,7 +1098,7 @@
False, # static
[], # additionalIncludePaths
[], # additionalLibs
[], # additionalLibPaths
[], # additionalLibPaths
False, # useCuda
[] # NvccAdditionalOptions
],
Expand All @@ -1113,7 +1113,7 @@
False, # static
[], # additionalIncludePaths
[], # additionalLibs
[], # additionalLibPaths
[], # additionalLibPaths
False, # useCuda
[] # NvccAdditionalOptions
],
Expand All @@ -1128,7 +1128,7 @@
False, # static
[], # additionalIncludePaths
[], # additionalLibs
[], # additionalLibPaths
[], # additionalLibPaths
True, # useCuda
[] # NvccAdditionalOptions
],
Expand All @@ -1143,7 +1143,7 @@
False, # static
[], # additionalIncludePaths
[], # additionalLibs
[], # additionalLibPaths
[], # additionalLibPaths
False, # useCuda
[] # NvccAdditionalOptions
],
Expand Down Expand Up @@ -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
],
Expand Down

0 comments on commit d958255

Please sign in to comment.