Merge branch 'main' into sandlot

build.sh

@@ -15,7 +15,7 @@ cmake -DCMAKE_BUILD_TYPE:String=$BUILD_TYPE \
       -DCMAKE_Fortran_FLAGS="-DHDF5_DOUBLE_PRESICION -malign-double -fconvert='big-endian'" \
       -DCMAKE_C_FLAGS="-malign-double"  \
       -DCMAKE_CXX_FLAGS="-malign-double" \
-      -DCMAKE_Fortran_FLAGS_DEBUG="-ffpe-trap=zero,overflow -fbacktrace" \
+      -DCMAKE_Fortran_FLAGS_DEBUG="-g3 -ffpe-trap=zero,overflow -fbacktrace" \
       -DCMAKE_C_FLAGS_DEBUG="-g3" \
       -DCMAKE_CXX_FLAGS_DEBUG="-g3" ../
 

src/korc_hpc.f90

@@ -366,7 +366,7 @@ function get_max_threads()
 
       integer :: get_max_threads
 #if defined(_OPENMP)
-      get_max_threads = OMP_GET_NUM_THREADS()
+      get_max_threads = OMP_GET_MAX_THREADS()
 #else
       get_max_threads = 1
 #endif
@@ -382,7 +382,7 @@ function get_thread_number()
      integer :: get_thread_number
 
 #if defined(_OPENMP)
-     get_thread_number = OMP_GET_NUM_PROCS()
+     get_thread_number = OMP_GET_THREAD_NUM()
 #else
      get_thread_number = 0
 #endif

src/korc_input.f90

@@ -718,14 +718,15 @@ subroutine read_namelist(params,infile,echo_in,outdir)
     !write(6,*) TRIM(magnetic_field_filename),len(TRIM(magnetic_field_filename))
 
     tmp=len(TRIM(magnetic_field_filename))
-    if (magnetic_field_filename(tmp-2:tmp).ne.'.h5'.and. &
-         magnetic_field_filename(tmp-5:tmp-5).ne.'.') then
-       if(params%mpi_params%rank.eq.0) then
-          write(6,*) &
-               'Check that enough characters are allocated for&
-               & magnetic field filename!'
+    if (tmp.lt.3 .or. magnetic_field_filename(tmp-2:tmp).ne.'.h5') then
+       if(tmp.lt.6 .or. magnetic_field_filename(tmp-5:tmp-5).ne.'.') then
+          if(params%mpi_params%rank.eq.0) then
+             write(6,*) &
+                  'Check that enough characters are allocated for&
+                  & magnetic field filename!'
+          end if
+          call korc_abort(13)
        end if
-       call korc_abort(13)
     end if
 
     end subroutine read_namelist