Skip to content

Commit 36bb26b

Browse files
hmarbonahmarbona
authored
Merge branch 'develop' into main
2 parents 3adb6c1 + 00c1a9b commit 36bb26b

30 files changed

Lines changed: 10096 additions & 403 deletions

‎.github/workflows/CI_parallel_MU.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ on:
88
# Triggers the workflow on push or pull request events but only for the master branch
99
# Comment lines 10-13 to deactivate automatic running until Metis webpage is online again.
1010
push:
11-
branches: [ main ]
11+
branches: [ main, develop ]
1212
pull_request:
13-
branches: [ main ]
13+
branches: [ main, develop ]
1414

1515
# Allows you to run this workflow manually from the Actions tab
1616
workflow_dispatch:

‎.github/workflows/CI_parallel_NS.yml‎

Lines changed: 76 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ on:
88
# Triggers the workflow on push or pull request events but only for the master branch
99
# Comment lines 10-13 to deactivate automatic running until Metis webpage is online again.
1010
push:
11-
branches: [ main ]
11+
branches: [ main, develop ]
1212
pull_request:
13-
branches: [ main ]
13+
branches: [ main, develop ]
1414

1515
# Allows you to run this workflow manually from the Actions tab
1616
workflow_dispatch:
@@ -30,8 +30,10 @@ jobs:
3030
mode: ['RELEASE']
3131
comm: ['PARALLEL']
3232
enable_threads: ['NO']
33+
mkl: ['NO']
34+
hdf5: ['YES']
3335

34-
name: NS - ${{ matrix.compiler }} - ${{ matrix.mode }} - ${{ matrix.comm }} - ${{ matrix.enable_threads }}
36+
name: NS - ${{ matrix.compiler }} - ${{ matrix.mode }} - ${{ matrix.comm }} - OpenMP = ${{ matrix.enable_threads }}
3537

3638
env:
3739
METIS_HOME: /home/runner/work/horses3d-gpu/horses3d-gpu/metis-5.1.0/build/Linux-x86_64
@@ -42,6 +44,14 @@ jobs:
4244
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
4345
- uses: actions/checkout@v3
4446

47+
- name: Install hdf5 (only gfortran)
48+
if: (matrix.compiler == 'gfortran')
49+
run: |
50+
sudo apt-get update
51+
sudo apt install libhdf5-dev
52+
dpkg -L libhdf5-dev
53+
echo "HDF5_ROOT="/usr/lib/x86_64-linux-gnu/hdf5/serial/"" >> $GITHUB_ENV
54+
4555
# IF COMPILER = GFORTRAN -> INSTALL OPEN-MPI #
4656
- name: install openmpi
4757
if: (matrix.compiler == 'gfortran')
@@ -133,8 +143,8 @@ jobs:
133143
working-directory: ./Solver
134144
run: |
135145
source /opt/intel/oneapi/setvars.sh || true
136-
make allclean MODE=${{matrix.mode}} COMPILER=${{matrix.compiler}} COMM=${{matrix.comm}} ENABLE_THREADS=${{matrix.enable_threads}} WITH_METIS=YES
137-
make ns MODE=${{matrix.mode}} COMPILER=${{matrix.compiler}} COMM=${{matrix.comm}} ENABLE_THREADS=${{matrix.enable_threads}} WITH_METIS=YES
146+
make allclean MODE=${{matrix.mode}} COMPILER=${{matrix.compiler}} COMM=${{matrix.comm}} ENABLE_THREADS=${{matrix.enable_threads}} WITH_METIS=YES WITH_MKL=${{matrix.mkl}} WITH_HDF5=${{matrix.hdf5}}
147+
make ns MODE=${{matrix.mode}} COMPILER=${{matrix.compiler}} COMM=${{matrix.comm}} ENABLE_THREADS=${{matrix.enable_threads}} WITH_METIS=YES WITH_MKL=${{matrix.mkl}} WITH_HDF5=${{matrix.hdf5}}
138148
139149
140150
# GRC 30/10/2025 - DEACTIVATE EULER TEST CASES - NOT WORKING IN GPU
@@ -338,6 +348,31 @@ jobs:
338348
# mpiexec -n 8 ./horses3d.ns Convergence.control
339349
# if: '!cancelled()'
340350

351+
#
352+
# 0) Uniform Flow
353+
# ---------------
354+
355+
- name: Build NSUniformFlow
356+
working-directory: ./Solver/test/NavierStokes/UniformFlow/SETUP
357+
run: |
358+
source /opt/intel/oneapi/setvars.sh || true
359+
make ns MODE=${{matrix.mode}} COMPILER=${{matrix.compiler}} COMM=${{matrix.comm}} ENABLE_THREADS=${{matrix.enable_threads}} WITH_METIS=YES WITH_MKL=${{matrix.mkl}} WITH_HDF5=${{matrix.hdf5}}
360+
if: '!cancelled()'
361+
362+
- name: Run NSUniformFlow_parallel
363+
working-directory: ./Solver/test/NavierStokes/UniformFlow
364+
run: |
365+
source /opt/intel/oneapi/setvars.sh || true
366+
mpiexec -n 3 ./horses3d.ns UniformFlow_HDF5.control
367+
if: '!cancelled()'
368+
369+
- name: Run NSUniformFlow_serial
370+
working-directory: ./Solver/test/NavierStokes/UniformFlow
371+
run: |
372+
source /opt/intel/oneapi/setvars.sh || true
373+
mpiexec -n 1 ./horses3d.ns UniformFlow_HDF5.control
374+
if: '!cancelled()'
375+
341376
#
342377
# 1) CYLINDER
343378
# -----------
@@ -346,7 +381,7 @@ jobs:
346381
working-directory: ./Solver/test/NavierStokes/Cylinder/SETUP
347382
run: |
348383
source /opt/intel/oneapi/setvars.sh || true
349-
make ns MODE=${{matrix.mode}} COMPILER=${{matrix.compiler}} COMM=${{matrix.comm}} ENABLE_THREADS=${{matrix.enable_threads}} WITH_MKL=${{matrix.mkl}} WITH_HDF5=${{matrix.hdf5}}
384+
make ns MODE=${{matrix.mode}} COMPILER=${{matrix.compiler}} COMM=${{matrix.comm}} ENABLE_THREADS=${{matrix.enable_threads}} WITH_METIS=YES WITH_MKL=${{matrix.mkl}} WITH_HDF5=${{matrix.hdf5}}
350385
if: '!cancelled()'
351386

352387
- name: Run NSCylinder
@@ -398,20 +433,19 @@ jobs:
398433
# 4) CYLINDER DUCROS
399434
# ------------------
400435

401-
# GPU
402-
# - name: Build NSCylinderDucros
403-
# working-directory: ./Solver/test/NavierStokes/CylinderDucros/SETUP
404-
# run: |
405-
# source /opt/intel/oneapi/setvars.sh || true
406-
# make ns MODE=${{matrix.mode}} COMPILER=${{matrix.compiler}} COMM=${{matrix.comm}} ENABLE_THREADS=${{matrix.enable_threads}} WITH_METIS=YES
407-
# if: '!cancelled()'
436+
- name: Build NSCylinderDucros
437+
working-directory: ./Solver/test/NavierStokes/CylinderDucros/SETUP
438+
run: |
439+
source /opt/intel/oneapi/setvars.sh || true
440+
make ns MODE=${{matrix.mode}} COMPILER=${{matrix.compiler}} COMM=${{matrix.comm}} ENABLE_THREADS=${{matrix.enable_threads}} WITH_METIS=YES WITH_MKL=${{matrix.mkl}} WITH_HDF5=${{matrix.hdf5}}
441+
if: '!cancelled()'
408442

409-
# - name: Run NSCylinderDucros
410-
# working-directory: ./Solver/test/NavierStokes/CylinderDucros
411-
# run: |
412-
# source /opt/intel/oneapi/setvars.sh || true
413-
# mpiexec -n 8 ./horses3d.ns CylinderDucros.control
414-
# if: '!cancelled()'
443+
- name: Run NSCylinderDucros
444+
working-directory: ./Solver/test/NavierStokes/CylinderDucros
445+
run: |
446+
source /opt/intel/oneapi/setvars.sh || true
447+
mpiexec -n 8 ./horses3d.ns CylinderDucros.control
448+
if: '!cancelled()'
415449

416450
#
417451
# 5) CYLINDER Smagorinsky
@@ -421,7 +455,7 @@ jobs:
421455
working-directory: ./Solver/test/NavierStokes/CylinderSmagorinsky/SETUP
422456
run: |
423457
source /opt/intel/oneapi/setvars.sh || true
424-
make ns MODE=${{matrix.mode}} COMPILER=${{matrix.compiler}} COMM=${{matrix.comm}} ENABLE_THREADS=${{matrix.enable_threads}} WITH_METIS=YES
458+
make ns MODE=${{matrix.mode}} COMPILER=${{matrix.compiler}} COMM=${{matrix.comm}} ENABLE_THREADS=${{matrix.enable_threads}} WITH_METIS=YES WITH_MKL=${{matrix.mkl}} WITH_HDF5=${{matrix.hdf5}}
425459
if: '!cancelled()'
426460

427461
- name: Run NSCylinderSmagorinsky
@@ -439,7 +473,7 @@ jobs:
439473
working-directory: ./Solver/test/NavierStokes/CylinderWALE/SETUP
440474
run: |
441475
source /opt/intel/oneapi/setvars.sh || true
442-
make ns MODE=${{matrix.mode}} COMPILER=${{matrix.compiler}} COMM=${{matrix.comm}} ENABLE_THREADS=${{matrix.enable_threads}} WITH_METIS=YES
476+
make ns MODE=${{matrix.mode}} COMPILER=${{matrix.compiler}} COMM=${{matrix.comm}} ENABLE_THREADS=${{matrix.enable_threads}} WITH_METIS=YES WITH_MKL=${{matrix.mkl}} WITH_HDF5=${{matrix.hdf5}}
443477
if: '!cancelled()'
444478

445479
- name: Run NSCylinderWALE
@@ -457,7 +491,7 @@ jobs:
457491
working-directory: ./Solver/test/NavierStokes/CylinderVreman/SETUP
458492
run: |
459493
source /opt/intel/oneapi/setvars.sh || true
460-
make ns MODE=${{matrix.mode}} COMPILER=${{matrix.compiler}} COMM=${{matrix.comm}} ENABLE_THREADS=${{matrix.enable_threads}} WITH_METIS=YES
494+
make ns MODE=${{matrix.mode}} COMPILER=${{matrix.compiler}} COMM=${{matrix.comm}} ENABLE_THREADS=${{matrix.enable_threads}} WITH_METIS=YES WITH_MKL=${{matrix.mkl}} WITH_HDF5=${{matrix.hdf5}}
461495
if: '!cancelled()'
462496

463497
- name: Run NSCylinderVreman
@@ -475,7 +509,7 @@ jobs:
475509
working-directory: ./Solver/test/NavierStokes/CylinderChandrasekarRoe/SETUP
476510
run: |
477511
source /opt/intel/oneapi/setvars.sh || true
478-
make ns MODE=${{matrix.mode}} COMPILER=${{matrix.compiler}} COMM=${{matrix.comm}} ENABLE_THREADS=${{matrix.enable_threads}} WITH_MKL=${{matrix.mkl}} WITH_HDF5=${{matrix.hdf5}}
512+
make ns MODE=${{matrix.mode}} COMPILER=${{matrix.compiler}} COMM=${{matrix.comm}} ENABLE_THREADS=${{matrix.enable_threads}} WITH_METIS=YES WITH_MKL=${{matrix.mkl}} WITH_HDF5=${{matrix.hdf5}}
479513
if: '!cancelled()'
480514

481515
- name: Run NSCylinderChandrasekarRoe
@@ -493,7 +527,7 @@ jobs:
493527
working-directory: ./Solver/test/NavierStokes/TaylorGreen/SETUP
494528
run: |
495529
source /opt/intel/oneapi/setvars.sh || true
496-
make ns MODE=${{matrix.mode}} COMPILER=${{matrix.compiler}} COMM=${{matrix.comm}} ENABLE_THREADS=${{matrix.enable_threads}} WITH_METIS=YES
530+
make ns MODE=${{matrix.mode}} COMPILER=${{matrix.compiler}} COMM=${{matrix.comm}} ENABLE_THREADS=${{matrix.enable_threads}} WITH_METIS=YES WITH_MKL=${{matrix.mkl}} WITH_HDF5=${{matrix.hdf5}}
497531
if: '!cancelled()'
498532

499533
- name: Run TaylorGreen
@@ -652,7 +686,7 @@ jobs:
652686
working-directory: ./Solver/test/NavierStokes/DualTimeStepping/SETUP
653687
run: |
654688
source /opt/intel/oneapi/setvars.sh || true
655-
make ns MODE=${{matrix.mode}} COMPILER=${{matrix.compiler}} COMM=${{matrix.comm}} ENABLE_THREADS=${{matrix.enable_threads}} WITH_METIS=YES
689+
make ns MODE=${{matrix.mode}} COMPILER=${{matrix.compiler}} COMM=${{matrix.comm}} ENABLE_THREADS=${{matrix.enable_threads}} WITH_METIS=YES WITH_MKL=${{matrix.mkl}} WITH_HDF5=${{matrix.hdf5}}
656690
if: '!cancelled()'
657691

658692
- name: Run DualTimeStepping
@@ -792,7 +826,7 @@ jobs:
792826
working-directory: ./Solver/test/NavierStokes/IBM_Cylinder/SETUP
793827
run: |
794828
source /opt/intel/oneapi/setvars.sh || true
795-
make ns MODE=${{matrix.mode}} COMPILER=${{matrix.compiler}} COMM=${{matrix.comm}} ENABLE_THREADS=${{matrix.enable_threads}} WITH_METIS=YES
829+
make ns MODE=${{matrix.mode}} COMPILER=${{matrix.compiler}} COMM=${{matrix.comm}} ENABLE_THREADS=${{matrix.enable_threads}} WITH_METIS=YES WITH_MKL=${{matrix.mkl}} WITH_HDF5=${{matrix.hdf5}}
796830
if: '!cancelled()'
797831

798832
- name: Run IBM_Cylinder
@@ -1031,4 +1065,20 @@ jobs:
10311065
# source /opt/intel/oneapi/setvars.sh || true
10321066
# mpiexec -n 64 ./horses3d.ns ActuatorLineController.control
10331067
# if: '!cancelled()'
1068+
#
1069+
# 39) CHANNEL
1070+
# -----------
1071+
1072+
- name: Build Channel
1073+
working-directory: ./Solver/test/NavierStokes/Channel/SETUP
1074+
run: |
1075+
source /opt/intel/oneapi/setvars.sh || true
1076+
make ns MODE=${{matrix.mode}} COMPILER=${{matrix.compiler}} COMM=${{matrix.comm}} ENABLE_THREADS=${{matrix.enable_threads}} WITH_METIS=YES WITH_MKL=${{matrix.mkl}} WITH_HDF5=${{matrix.hdf5}}
1077+
if: '!cancelled()'
10341078

1079+
- name: Run Channel
1080+
working-directory: ./Solver/test/NavierStokes/Channel
1081+
run: |
1082+
source /opt/intel/oneapi/setvars.sh || true
1083+
mpiexec -n 8 ./horses3d.ns Channel.control
1084+
if: '!cancelled()'

‎.github/workflows/CI_serial_MU.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ on:
88
# Triggers the workflow on push or pull request events but only for the master branch
99
# Comment lines 10-13 to deactivate automatic running until Metis webpage is online again.
1010
push:
11-
branches: [ main ]
11+
branches: [ main, develop ]
1212
pull_request:
13-
branches: [ main ]
13+
branches: [ main, develop ]
1414

1515
# Allows you to run this workflow manually from the Actions tab
1616
workflow_dispatch:

‎Solver/Makefile.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ endif
248248
## Select HORSES libraries ##
249249
##########################################
250250
HORSES_LIBS_GENERAL = ftobject foundation mpiutils ml spectral io physics/multiphase physics/incns physics/navierstokes physics/cahnhilliard physics/spallartalmaras physics/acoustic
251-
HORSES_LIBS_PARTICULAR = physics/common mesh physics/common/bcs particles sources monitors problemfile discretization jacobian timeintegrator
251+
HORSES_LIBS_PARTICULAR = physics/common mesh physics/common/bcs particles monitors sources problemfile discretization jacobian timeintegrator
252252
HORSES_LIBS=$(HORSES_LIBS_GENERAL) $(HORSES_LIBS_PARTICULAR)
253253
HORSES_LIBS_iNS=-L$(HOME_DIR)/lib -ltimeintegrator_ins -ljacobian_ins -ldiscretization_ins -lmonitors_ins -lparticles_ins -lmesh_ins -lphysics_ins -lphysicsins -lio -lspectral -lmpiutils -lfoundation -lftobject -lsources_ins -lml
254254
HORSES_LIBS_NS=-L$(HOME_DIR)/lib -ltimeintegrator_ns -ljacobian_ns -ldiscretization_ns -lmonitors_ns -lparticles_ns -lphysics_bcs_ns -lmesh_ns -lphysics_ns -lphysicsns -lio -lspectral -lmpiutils -lfoundation -lftobject -lsources_ns -lml

‎Solver/configure‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ TEST_CASES="./Euler/BoxAroundCircle \
4040
./Euler/JFNK \
4141
./Euler/TaylorGreenKEPEC \
4242
./Euler/Cylinder_ErrorEstimation_pAdaptationRL \
43+
./NavierStokes/UniformFlow \
4344
./NavierStokes/Convergence \
4445
./NavierStokes/Convergence_energy \
4546
./NavierStokes/Convergence_entropy \
@@ -82,6 +83,7 @@ TEST_CASES="./Euler/BoxAroundCircle \
8283
./NavierStokes/Cylinder_AdaptiveTimeStep_pAdaptationRL \
8384
./NavierStokes/ABLBoundaryMapping \
8485
./NavierStokes/ActuatorLineController \
86+
./NavierStokes/Channel \
8587
./IncompressibleNS/Convergence \
8688
./IncompressibleNS/Kovasznay \
8789
./IncompressibleNS/TaylorGreen \

‎Solver/src/NavierStokesSolver/SpatialDiscretization.f90‎

Lines changed: 62 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -376,6 +376,8 @@ subroutine TimeDerivative_ComputeQDot( mesh , particles, t)
376376
use TripForceClass, only: randomTrip
377377
use ActuatorLine, only: farm, ForcesFarm
378378
use SpongeClass, only: sponge
379+
use ChannelForcing, only: channelSource
380+
use IBMClass, only: IBM_SourceTerm
379381
implicit none
380382
type(HexMesh) :: mesh
381383
type(Particles_t) :: particles
@@ -596,6 +598,7 @@ subroutine TimeDerivative_ComputeQDot( mesh , particles, t)
596598
! for the sponge, loops are in the internal subroutine as values are precalculated
597599
! call sponge % addSource(mesh)
598600
call ForcesFarm(farm, mesh, t)
601+
call channelSource(mesh)
599602
!
600603
! Add Particles source
601604
! ********************
@@ -1627,6 +1630,7 @@ SUBROUTINE computeBoundaryFlux(mesh, time)
16271630
USE RiemannSolvers_NS
16281631
use WallFunctionBC
16291632
use WallFunctionConnectivity
1633+
use WallFunctionDefinitions, only: useAverageV
16301634
IMPLICIT NONE
16311635
!
16321636
! ---------
@@ -1642,20 +1646,58 @@ SUBROUTINE computeBoundaryFlux(mesh, time)
16421646
!
16431647
INTEGER :: i, j, eq
16441648
INTEGER :: nZones, zoneID, zonefID, fID
1645-
integer :: Sidearray(2)
1649+
INTEGER :: fID_zoneStart , faceID_wm
1650+
INTEGER :: Sidearray(2)
1651+
REAL(KIND=RP) :: dWall, V(3), Vavg(3), mu, Q(NCONS), kappa, x(3), utau
16461652
!
16471653
! -------------------
16481654
! Get external states
16491655
! -------------------
1650-
!
1656+
!
1657+
fID_zoneStart = 0
1658+
16511659
nZones = size(mesh % zones)
16521660
do zoneID=1, nZones
16531661

1654-
!$acc parallel loop gang present(mesh) async(1)
1655-
do zonefID = 1, mesh % zones(zoneID) % no_of_faces
1656-
fID = mesh % zones(zoneID) % faces(zonefID)
1662+
if (mesh %zones(zoneID) % useWallFunction) then
1663+
1664+
!$acc parallel loop gang present(mesh) async(1)
1665+
do zonefID = 1, mesh % zones(zoneID) % no_of_faces
1666+
fID = mesh % zones(zoneID) % faces(zonefID)
1667+
1668+
!$acc loop vector collapse(2) private(Q, V, Vavg, x)
1669+
do j = 0, mesh % faces(fID) % Nf(2) ; do i = 0, mesh % faces(fID) % Nf(1)
1670+
1671+
faceID_wm = fID_zoneStart + zonefID
1672+
1673+
call WallGetFaceConnectedQ(mesh, mesh % faces(fID), Q, x, faceID_wm, i, j)
1674+
V = Q(IRHOU:IRHOW) / Q(IRHO)
1675+
call get_laminar_mu_kappa(Q,mu,kappa)
1676+
dWall = norm2(x - mesh % faces(fID) % geom % x(:,i,j))
1677+
1678+
if (useAverageV) then
1679+
Vavg = meanVelocity(:,faceID_wm,i,j)
1680+
else
1681+
Vavg = 0.0_RP
1682+
end if
1683+
utau = mesh % faces(fID) % storage(1) % u_tau_NS(i,j)
1684+
call WallViscousFlux(V, dWall, mesh % faces(fID) % geom % normal(:,i,j), Q(IRHO), &
1685+
mu, Vavg, mesh % faces(fID) % storage(2) % FStar(:,i,j), &
1686+
utau)
1687+
mesh % faces(fID) % storage(1) % u_tau_NS(i,j) = utau
1688+
1689+
end do ; end do
1690+
end do
1691+
!$acc end parallel loop
1692+
1693+
fID_zoneStart = fID_zoneStart + mesh % zones(zoneID) % no_of_faces
1694+
1695+
else
1696+
!$acc parallel loop gang present(mesh) async(1)
1697+
do zonefID = 1, mesh % zones(zoneID) % no_of_faces
1698+
fID = mesh % zones(zoneID) % faces(zonefID)
16571699

1658-
call ViscousFlux_selector( NCONS, NGRAD, mesh % faces(fID) % Nf(1), &
1700+
call ViscousFlux_selector( NCONS, NGRAD, mesh % faces(fID) % Nf(1), &
16591701
mesh % faces(fID) % Nf(2), 0, &
16601702
mesh % faces(fID) % storage(1) % Q , &
16611703
mesh % faces(fID) % storage(1) % U_x, &
@@ -1664,18 +1706,19 @@ SUBROUTINE computeBoundaryFlux(mesh, time)
16641706
mesh % faces(fID) % storage(1) % mu_NS, &
16651707
mesh % faces(fID) % storage(1) % unStar)
16661708

1667-
!$acc loop vector collapse(2)
1668-
do j = 0, mesh % faces(fID) % Nf(2) ; do i = 0, mesh % faces(fID) % Nf(1)
1669-
!$acc loop seq
1670-
do eq = 1, NCONS
1671-
mesh % faces(fID) % storage(2) % FStar(eq,i,j) = mesh % faces(fID) % storage(1) % unStar(eq,IX,i,j)* mesh % faces(fID) % geom % normal(IX,i,j) &
1672-
+ mesh % faces(fID) % storage(1) % unStar(eq,IY,i,j)* mesh % faces(fID) % geom % normal(IY,i,j) &
1673-
+ mesh % faces(fID) % storage(1) % unStar(eq,IZ,i,j)* mesh % faces(fID) % geom % normal(IZ,i,j)
1674-
enddo
1675-
enddo ; enddo
16761709

1677-
enddo
1678-
!$acc end parallel loop
1710+
!$acc loop vector collapse(2)
1711+
do j = 0, mesh % faces(fID) % Nf(2) ; do i = 0, mesh % faces(fID) % Nf(1)
1712+
!$acc loop seq
1713+
do eq = 1, NCONS
1714+
mesh % faces(fID) % storage(2) % FStar(eq,i,j) = mesh % faces(fID) % storage(1) % unStar(eq,IX,i,j)* mesh % faces(fID) % geom % normal(IX,i,j) &
1715+
+ mesh % faces(fID) % storage(1) % unStar(eq,IY,i,j)* mesh % faces(fID) % geom % normal(IY,i,j) &
1716+
+ mesh % faces(fID) % storage(1) % unStar(eq,IZ,i,j)* mesh % faces(fID) % geom % normal(IZ,i,j)
1717+
end do
1718+
end do ; end do
1719+
end do
1720+
!$acc end parallel loop
1721+
end if
16791722

16801723
CALL BCs(zoneID) % bc % FlowNeumann(mesh, mesh % zones(zoneID))
16811724

@@ -1712,6 +1755,8 @@ SUBROUTINE computeBoundaryFlux(mesh, time)
17121755
enddo
17131756
!$acc end parallel loop
17141757
enddo
1758+
1759+
!$acc wait
17151760

17161761
end subroutine computeBoundaryFlux
17171762

‎Solver/src/NavierStokesSolverRANS/SpatialDiscretization.f90‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1315,9 +1315,9 @@ SUBROUTINE computeBoundaryFlux_NSSA(f, time, mesh)
13151315
end if
13161316
end do
13171317
end if
1318-
if (useWallFuncFace) then
1319-
call WallFunctionGatherFlowVariables(mesh, f, wallFunV, wallFunRho, wallFunMu, wallFunY, wallFunVavg)
1320-
end if
1318+
!if (useWallFuncFace) then
1319+
! call WallFunctionGatherFlowVariables(mesh, f, wallFunV, wallFunRho, wallFunMu, wallFunY, wallFunVavg)
1320+
!end if
13211321

13221322
DO j = 0, f % Nf(2)
13231323
DO i = 0, f % Nf(1)

0 commit comments

Comments
 (0)