fixed link flags after OS update, changed DiMES head to be slice of s…

…phere rather than semi-ellipsoid
ORNL-Fusion · Dec 1, 2023 · 0e2b3ea · 0e2b3ea
1 parent b444937
commit 0e2b3ea
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 11 deletions.
diff --git a/setup_cmake b/setup_cmake
@@ -41,7 +41,7 @@ then
     export FC=/usr/local/bin/gfortran-13
 
     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.9.2/lib -L/usr/local/Cellar/libevent/2.1.12_1/lib" \
+      -DMPI_Fortran_LINK_FLAGS="-ld_classic -Wl,-flat_namespace -Wl,-commons,use_dylibs -L/usr/local/Cellar/hwloc/2.9.3/lib -L/usr/local/Cellar/libevent/2.1.12_1/lib" \
       -DUSE_OMP=OFF \
       -DUSE_PSPLINE=ON \
       -DUSE_FIO=OFF \

diff --git a/src/korc_interp.f90 b/src/korc_interp.f90
@@ -1351,7 +1351,8 @@ subroutine check_if_in_fields_domain(F,Y,flag)
             cycle
           end if
 
-          DiMESsurf=DiMESloc_cart(3)+(DiMESdims(2)/DiMESdims(1))*sqrt(DiMESrad)
+          !DiMESsurf=DiMESloc_cart(3)+(DiMESdims(2)/DiMESdims(1))*sqrt(DiMESrad)
+          DiMESsurf=(DiMESloc_cart(3)-(DiMESdims(1)-DiMESdims(2)))+sqrt(DiMESrad)
 
           if (ztmp.le.DiMESsurf) flag(pp)=0_is
 
@@ -1569,7 +1570,8 @@ subroutine check_if_in_fields_domain_p(pchunk,F,Y_R,Y_PHI,Y_Z,flag)
                   cycle
                end if
 
-               DiMESsurf=DiMESloc_cart(3)+(DiMESdims(2)/DiMESdims(1))*sqrt(DiMESrad)
+               !DiMESsurf=DiMESloc_cart(3)+(DiMESdims(2)/DiMESdims(1))*sqrt(DiMESrad)
+               DiMESsurf=(DiMESloc_cart(3)-(DiMESdims(1)-DiMESdims(2)))+sqrt(DiMESrad)
 
                if (ztmp.le.DiMESsurf) flag(pp)=0_is
 
@@ -1674,7 +1676,8 @@ subroutine check_if_in_fields_domain_2D_p_ACC(fields_domain_local,bfield_2d_loca
           return
         end if
 
-        DiMESsurf=DiMESloc_cart(3)+(DiMESdims(2)/DiMESdims(1))*sqrt(DiMESrad)
+        !DiMESsurf=DiMESloc_cart(3)+(DiMESdims(2)/DiMESdims(1))*sqrt(DiMESrad)
+        DiMESsurf=(DiMESloc_cart(3)-(DiMESdims(1)-DiMESdims(2)))+sqrt(DiMESrad)
 
         if (ztmp.le.DiMESsurf) flag=0_is
 

diff --git a/src/main.f90 b/src/main.f90
@@ -312,15 +312,15 @@ program main
   call FO_init(params,F,spp,.true.,.false.)
 #endif ACC
 
-  else if (params%orbit_model(1:2).eq.'GC') then
+else if (params%orbit_model(1:2).eq.'GC') then
 
-    if (.NOT.(params%restart.OR.params%proceed.or.params%reinit)) then
-      call GC_init(params,F,spp)
-    else
+  if (.NOT.(params%restart.OR.params%proceed.or.params%reinit)) then
+    call GC_init(params,F,spp)
+  else
 
-      call get_fields(params,spp(1)%vars,F)
-  
-    end if
+    call get_fields(params,spp(1)%vars,F)
+
+  end if
 
 end if