Merge branch 'master' into 'main'

Master

See merge request !3

CMakeLists.txt

@@ -12,6 +12,8 @@ endif ()
 # if using kokkos as shared library, -fPIC is needed
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
 
+set(Kokkos_ENABLE_IMPL_MDSPAN OFF CACHE BOOL "Experimental mdspan support")
+
 # configure kokkos 4.2 repository link
 FetchContent_Declare(kokkos
         URL https://github.com/kokkos/kokkos/releases/download/4.4.01/kokkos-4.4.01.tar.gz)

script.sh

@@ -8,17 +8,21 @@ ulimit -s unlimited
 
 if [ "$1" == 'gpu' ]
 then
+    rm -rf build_gpu
     cmake -B build_gpu -S . -DMU_ARCH=a100 -DCMAKE_CXX_FLAGS="-O3"
     cmake --build build_gpu --parallel 
+
     ncells=(5000000)
     nlev=(90)
     nproma=(5000000)
 else 
+    rm -rf build
     cmake -B build -S . -DMU_ARCH=x86_64 -DCMAKE_CXX_FLAGS="-O3"
     cmake --build build --parallel
+
     ncells=(5000000)
     nlev=(90)   
-    nproma=(32) # 64 96 128)
+    nproma=(32 64 96 128)
 
     export OMP_PROC_BIND=close
     export OMP_PLACES=cores