fixing additional PSPLINE precompiler flags in korc_ppusher

ORNL-Fusion · Jan 30, 2024 · 813868e · 813868e
1 parent ccd9337
commit 813868e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/setup_cmake b/setup_cmake
@@ -43,7 +43,7 @@ then
     cmake -DCMAKE_BUILD_TYPE:String=$BUILD_TYPE \
       -DMPI_Fortran_LINK_FLAGS="-ld_classic -Wl,-flat_namespace -Wl,-commons,use_dylibs -L/usr/local/Cellar/hwloc/2.10.0/lib -L/usr/local/Cellar/libevent/2.1.12_1/lib" \
       -DUSE_OMP=ON \
-      -DUSE_PSPLINE=ON \
+      -DUSE_PSPLINE=OFF \
       -DUSE_FIO=OFF \
       -DCORI_DIR=OFF \
       -DKORC_TEST=OFF \

diff --git a/src/korc_ppusher.f90 b/src/korc_ppusher.f90
@@ -651,6 +651,7 @@ subroutine FO_init_eqn_ACC(params,F,spp,output,step)
 
 end subroutine FO_init_eqn_ACC
 
+#ifdef PSPLINE
 subroutine FO_init_mars_ACC(params,F,spp,output,step)
   TYPE(KORC_PARAMS), INTENT(IN)                              :: params
   !! Core KORC simulation parameters.
@@ -1096,6 +1097,7 @@ subroutine FO_init_aorsa_ACC(params,F,spp,output,step)
   enddo ! over species
 
 end subroutine FO_init_aorsa_ACC
+#endif
 
 subroutine adv_FOeqn_top(params,F,P,spp)
 
@@ -2508,6 +2510,7 @@ subroutine adv_FOinterp_mars_top(params,F,P,spp)
 
 end subroutine adv_FOinterp_mars_top
 
+#ifdef PSPLINE
 subroutine adv_FOinterp_mars_top_ACC(params,F,P,spp)
   TYPE(KORC_PARAMS), INTENT(INOUT)                           :: params
   !! Core KORC simulation parameters.
@@ -2712,6 +2715,7 @@ subroutine adv_FOinterp_mars_top_ACC(params,F,P,spp)
   end do !species iterator
 
 end subroutine adv_FOinterp_mars_top_ACC
+#endif
 
 subroutine adv_FOinterp_aorsa_top(params,F,P,spp)
     TYPE(KORC_PARAMS), INTENT(INOUT)                           :: params
@@ -2922,6 +2926,7 @@ subroutine adv_FOinterp_aorsa_top(params,F,P,spp)
 
 end subroutine adv_FOinterp_aorsa_top
 
+#ifdef PSPLINE
 subroutine adv_FOinterp_aorsa_top_ACC(params,F,P,spp)
   TYPE(KORC_PARAMS), INTENT(INOUT)                           :: params
   !! Core KORC simulation parameters.
@@ -3137,6 +3142,7 @@ subroutine adv_FOinterp_aorsa_top_ACC(params,F,P,spp)
   !$acc& fields_domain_local)
 
 end subroutine adv_FOinterp_aorsa_top_ACC
+#endif
 
 subroutine advance_FOinterp_vars(tt,a,q_cache,m_cache,params,X_X,X_Y,X_Z, &
        V_X,V_Y,V_Z,B_X,B_Y,B_Z,E_X,E_Y,E_Z,g,flagCon,flagCol,P,F,PSIp)
@@ -3353,6 +3359,8 @@ subroutine advance_FOinterp_vars(tt,a,q_cache,m_cache,params,X_X,X_Y,X_Z, &
 
 end subroutine advance_FOinterp_vars
 
+#endif PSPLINE
+
 subroutine advance_FO_vars_ACC(dt,tt,a,q_cache,m_cache,X_X,X_Y,X_Z, &
   V_X,V_Y,V_Z,B_X,B_Y,B_Z,E_X,E_Y,E_Z,g,flagCon,flagCol)
   !$acc routine seq
@@ -3524,8 +3532,6 @@ subroutine advance_FO_vars_ACC(dt,tt,a,q_cache,m_cache,X_X,X_Y,X_Z, &
 
 end subroutine advance_FO_vars_ACC
 
-#endif PSPLINE
-
 #ifdef FIO
 
 subroutine advance_FOfio_vars(tt,a,q_cache,m_cache,params,X_X,X_Y,X_Z, &