Skip to content

Commit

Permalink
Merge pull request #1653 from ExtremeFLOW/release/0.9
Browse files Browse the repository at this point in the history
NEKO v0.9.1
  • Loading branch information
njansson authored Dec 29, 2024
2 parents 8b46a18 + bea5139 commit d53a2ea
Show file tree
Hide file tree
Showing 14 changed files with 25 additions and 17 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/check_nvidia.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,13 @@ jobs:
curl https://developer.download.nvidia.com/hpc-sdk/ubuntu/DEB-GPG-KEY-NVIDIA-HPC-SDK | sudo gpg --dearmor -o /usr/share/keyrings/nvidia-hpcsdk-archive-keyring.gpg
echo 'deb [signed-by=/usr/share/keyrings/nvidia-hpcsdk-archive-keyring.gpg] https://developer.download.nvidia.com/hpc-sdk/ubuntu/amd64 /' | sudo tee /etc/apt/sources.list.d/nvhpc.list
sudo apt-get update -y
sudo apt-get install -y nvhpc-24-7
sudo apt-get install -y nvhpc-24-11
NVARCH=`uname -s`_`uname -m`
export NVARCH
NVCOMPILERS=/opt/nvidia/hpc_sdk
export NVCOMPILERS
PATH=$NVCOMPILERS/$NVARCH/24.7/compilers/bin:$PATH; export PATH
export PATH=$NVCOMPILERS/$NVARCH/24.7/comm_libs/mpi/bin:$PATH
PATH=$NVCOMPILERS/$NVARCH/24.11/compilers/bin:$PATH; export PATH
export PATH=$NVCOMPILERS/$NVARCH/24.11/comm_libs/mpi/bin:$PATH
printenv >> $GITHUB_ENV
echo "os-version=$(lsb_release -ds | tr " " -)" >> $GITHUB_OUTPUT
Expand Down Expand Up @@ -98,7 +98,7 @@ jobs:
run: |
git apply patches/nvhpc_bge.patch
./regen.sh
./configure FC=${FC} FCFLAGS="-O3" --enable-real=${RP} --with-cuda=/opt/nvidia/hpc_sdk/Linux_x86_64/24.7/cuda/
./configure FC=${FC} FCFLAGS="-O3" --enable-real=${RP} --with-cuda=/opt/nvidia/hpc_sdk/Linux_x86_64/24.11/cuda/
make
- name: Dist (CPU backend)
Expand All @@ -122,5 +122,5 @@ jobs:
tar xf neko-*.tar.gz -C releng
cd releng/neko-*
patch -u src/common/signal.f90 -i patches/nvhpc_bge.patch
./configure FC=${FC} FCFLAGS="-O3" --enable-real=${RP} --with-cuda=/opt/nvidia/hpc_sdk/Linux_x86_64/24.7/cuda/
./configure FC=${FC} FCFLAGS="-O3" --enable-real=${RP} --with-cuda=/opt/nvidia/hpc_sdk/Linux_x86_64/24.11/cuda/
make -j $(nproc)
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AC_PREREQ([2.69])
AC_INIT([neko],[0.9.0])
AC_INIT([neko],[0.9.1])
AM_INIT_AUTOMAKE([foreign subdir-objects])
AM_MAINTAINER_MODE
AC_CONFIG_MACRO_DIR([m4])
Expand Down
Binary file modified examples/hemi/hemi.nmsh
Binary file not shown.
8 changes: 8 additions & 0 deletions src/gs/gather_scatter.f90
Original file line number Diff line number Diff line change
Expand Up @@ -450,6 +450,10 @@ subroutine gs_init_mapping(gs)
end if
end if
end do

! Clear local dofmap table
call dm%clear()

if (lz .gt. 1) then
!
! Setup mapping for dofs on edges
Expand Down Expand Up @@ -654,6 +658,10 @@ subroutine gs_init_mapping(gs)
end if
end do
end if

! Clear local dofmap table
call dm%clear()

!
! Setup mapping for dofs on facets
!
Expand Down
2 changes: 1 addition & 1 deletion src/krylov/krylov.f90
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ end subroutine ksp_t_free
!! @param monitor Enable/disable monitoring, optional.
module subroutine krylov_solver_factory(object, n, type_name, &
max_iter, abstol, M, monitor)
class(ksp_t), allocatable, target, intent(inout) :: object
class(ksp_t), allocatable, intent(inout) :: object
integer, intent(in), value :: n
character(len=*), intent(in) :: type_name
integer, intent(in) :: max_iter
Expand Down
2 changes: 1 addition & 1 deletion src/krylov/krylov_fctry.f90
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
!! @param monitor Enable/disable residual history, optional.
module subroutine krylov_solver_factory(object, n, type_name, &
max_iter, abstol, M, monitor)
class(ksp_t), allocatable, target, intent(inout) :: object
class(ksp_t), allocatable, intent(inout) :: object
integer, intent(in), value :: n
character(len=*), intent(in) :: type_name
integer, intent(in) :: max_iter
Expand Down
2 changes: 1 addition & 1 deletion src/krylov/precon.f90
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ end subroutine pc_update
interface
!> Create a preconditioner
module subroutine precon_factory(pc, type_name)
class(pc_t), target, allocatable, intent(inout) :: pc
class(pc_t), allocatable, intent(inout) :: pc
character(len=*), intent(in) :: type_name
end subroutine precon_factory

Expand Down
2 changes: 1 addition & 1 deletion src/krylov/precon_fctry.f90
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@

!> Create a preconditioner
module subroutine precon_factory(pc, type_name)
class(pc_t), target, allocatable, intent(inout) :: pc
class(pc_t), allocatable, intent(inout) :: pc
character(len=*), intent(in) :: type_name
character(len=:), allocatable :: type_string

Expand Down
2 changes: 1 addition & 1 deletion src/les/les_model.f90
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ end subroutine les_model_free
!! @param coef SEM coefficients.
!! @param json A dictionary with parameters.
module subroutine les_model_factory(object, type_name, dofmap, coef, json)
class(les_model_t), allocatable, target, intent(inout) :: object
class(les_model_t), allocatable, intent(inout) :: object
character(len=*), intent(in) :: type_name
type(dofmap_t), intent(in) :: dofmap
type(coef_t), intent(in) :: coef
Expand Down
2 changes: 1 addition & 1 deletion src/les/les_model_fctry.f90
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
!! @param coef SEM coefficients.
!! @param json A dictionary with parameters.
module subroutine les_model_factory(object, type_name, dofmap, coef, json)
class(les_model_t), allocatable, target, intent(inout) :: object
class(les_model_t), allocatable, intent(inout) :: object
character(len=*), intent(in) :: type_name
type(dofmap_t), intent(in) :: dofmap
type(coef_t), intent(in) :: coef
Expand Down
4 changes: 2 additions & 2 deletions src/sem/dofmap.f90
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ subroutine dofmap_number_edges(this)
num_dofs_edges(1) = int(Xh%lx - 2, i8)
num_dofs_edges(2) = int(Xh%ly - 2, i8)
num_dofs_edges(3) = int(Xh%lz - 2, i8)
edge_offset = int(msh%glb_mpts, i8) + int(1, 4)
edge_offset = int(msh%glb_mpts, i8) + int(1, i8)

do i = 1, msh%nelv

Expand Down Expand Up @@ -380,7 +380,7 @@ subroutine dofmap_number_edges(this)
end do
end if

call ep%edge_id(edge, i8)
call ep%edge_id(edge, 8)
shared_dof = msh%is_shared(edge)
global_id = msh%get_global(edge)
edge_id = edge_offset + int((global_id - 1), i8) * num_dofs_edges(2)
Expand Down
2 changes: 1 addition & 1 deletion src/simulation_components/derivative.f90
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ subroutine derivative_compute(this, t, tstep)
real(kind=rp), intent(in) :: t
integer, intent(in) :: tstep

call dudxyz(this%du%x, this%u%x, this%dr, this%dr, this%dr,&
call dudxyz(this%du%x, this%u%x, this%dr, this%ds, this%dt,&
this%case%fluid%c_Xh)
end subroutine derivative_compute

Expand Down
2 changes: 1 addition & 1 deletion src/wall_models/wall_model.f90
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ end subroutine wall_model_free
!! @param json A dictionary with parameters.
module subroutine wall_model_factory(object, coef, msk, facet, nu, &
json)
class(wall_model_t), allocatable, target, intent(inout) :: object
class(wall_model_t), allocatable, intent(inout) :: object
type(coef_t), intent(in) :: coef
integer, intent(in) :: msk(:)
integer, intent(in) :: facet(:)
Expand Down
2 changes: 1 addition & 1 deletion src/wall_models/wall_model_fctry.f90
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
!! @param json A dictionary with parameters.
module subroutine wall_model_factory(object, coef, msk, facet, nu, &
json)
class(wall_model_t), allocatable, target, intent(inout) :: object
class(wall_model_t), allocatable, intent(inout) :: object
type(coef_t), intent(in) :: coef
integer, intent(in) :: msk(:)
integer, intent(in) :: facet(:)
Expand Down

0 comments on commit d53a2ea

Please sign in to comment.