fixing mpi runs for agate workflow

ORNL-Fusion · Oct 31, 2024 · d18b588 · d18b588
1 parent 793a483
commit d18b588
Show file tree

Hide file tree

Showing 11 changed files with 27 additions and 27 deletions.
diff --git a/src/korc_ppusher.f90 b/src/korc_ppusher.f90
@@ -375,13 +375,13 @@ subroutine FO_init(params,F,spp,output,step)
             eta_tmp=180.0_rp/C_PI* &
               ACOS((B_X(cc)*V_X(cc)+B_Y(cc)*V_Y(cc)+B_Z(cc)*V_Z(cc))/(Bmag(cc)*v(cc)))
 
-            if ((eta_tmp.gt.20._rp).or. &
-              ((spp(ii)%vars%eta(pp-1+cc)-eta_tmp)/spp(ii)%vars%eta(pp-1+cc).gt.0.01)) then 
-                write(6,*) 'abberation',pp
-                write(6,*) pp,spp(ii)%vars%eta(pp-1+cc),eta_tmp,'B', &
-                  spp(ii)%vars%B(pp-1+cc,:),'PSI_P',spp(ii)%vars%PSI_P(pp-1+cc)
+            !if ((eta_tmp.gt.20._rp).or. &
+            !  ((spp(ii)%vars%eta(pp-1+cc)-eta_tmp)/spp(ii)%vars%eta(pp-1+cc).gt.0.01)) then 
+            !    write(6,*) 'abberation',pp
+            !    write(6,*) pp,spp(ii)%vars%eta(pp-1+cc),eta_tmp,'B', &
+            !      spp(ii)%vars%B(pp-1+cc,:),'PSI_P',spp(ii)%vars%PSI_P(pp-1+cc)
 
-            endif  
+            !endif  
 
             spp(ii)%vars%eta(pp-1+cc) = eta_tmp 
 

diff --git a/src/korc_velocity_distribution.f90 b/src/korc_velocity_distribution.f90
@@ -384,12 +384,12 @@ subroutine gyro_distribution(params,random,F,spp)
     ALLOCATE( theta(spp%ppp) )
 
     ! * * * * INITIALIZE VELOCITY * * * *
-    if (.not.params%SameRandSeed) then
-      CALL random%uniform%set(0.0_rp,1.0_rp)
-      do pp=1_idef,spp%ppp
-         theta(pp)=random%uniform%get()
-      enddo
-    endif
+    !if (.not.params%SameRandSeed) then
+    CALL random%uniform%set(0.0_rp,1.0_rp)
+    do pp=1_idef,spp%ppp
+      theta(pp)=random%uniform%get()
+    enddo
+    !endif
     theta = 2.0_rp*C_PI*theta
 
     if (spp%spatial_distribution.eq.'TRACER') theta=2.0*C_PI

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -23,12 +23,12 @@ set_property(TARGET xtest PROPERTY LINKER_LANGUAGE Fortran)
 configure_file(${CMAKE_SOURCE_DIR}/test/egyro/korc_egyro.sh.in ${CMAKE_BINARY_DIR}/egyro_test/korc_egyro.sh)
 configure_file(${CMAKE_SOURCE_DIR}/test/mars/korc_mars.sh.in ${CMAKE_BINARY_DIR}/mars_test/korc_mars.sh)
 
-if(USE_PSPLINE)
-  add_test (NAME mars_test_1
-            COMMAND ${CMAKE_BINARY_DIR}/mars_test/korc_mars.sh 1
-            WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
-  set_tests_properties (mars_test_1 PROPERTIES PROCESSORS 1 ENVIRONMENT OMP_NUM_THREADS=1)
-endif()
+#if(USE_PSPLINE)
+#  add_test (NAME mars_test_1
+#            COMMAND ${CMAKE_BINARY_DIR}/mars_test/korc_mars.sh 1
+#            WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
+#  set_tests_properties (mars_test_1 PROPERTIES PROCESSORS 1 ENVIRONMENT OMP_NUM_THREADS=1)
+#endif()
 
 file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/bin/egyro_test)
 file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/bin/mars_test)
@@ -40,12 +40,12 @@ foreach(RANK IN ITEMS 1 2 4 8 16)
               WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
     set_tests_properties (egyro_test_${RANK} PROPERTIES PROCESSORS ${RANK} ENVIRONMENT OMP_NUM_THREADS=1)
 
-    # if(USE_PSPLINE)
-    #   add_test (NAME mars_test_${RANK}
-    #             COMMAND ${CMAKE_BINARY_DIR}/mars_test/korc_mars.sh ${RANK}
-    #             WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
-    #   set_tests_properties (mars_test_${RANK} PROPERTIES PROCESSORS ${RANK} ENVIRONMENT OMP_NUM_THREADS=1)
-    # endif()
+    if(USE_PSPLINE)
+      add_test (NAME mars_test_${RANK}
+          COMMAND ${CMAKE_BINARY_DIR}/mars_test/korc_mars.sh ${RANK}
+                WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
+      set_tests_properties (mars_test_${RANK} PROPERTIES PROCESSORS ${RANK} ENVIRONMENT OMP_NUM_THREADS=1)
+    endif()
 
     add_test (NAME unit_testing_${RANK}
               COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${RANK} ./xtest TEST_OUT

diff --git a/test/mars/file_0.h5 b/test/mars/file_0.h5
diff --git a/test/mars/file_0_1.h5 b/test/mars/file_0_1.h5
diff --git a/test/mars/file_0_2.h5 b/test/mars/file_0_2.h5
diff --git a/test/mars/file_0_4.h5 b/test/mars/file_0_4.h5
diff --git a/test/mars/file_0_8.h5 b/test/mars/file_0_8.h5
diff --git a/test/mars/file_0_new_random.h5 b/test/mars/file_0_new_random.h5
diff --git a/test/mars/input_file_D3D_191366_1762ms_MARS.korc b/test/mars/input_file_D3D_191366_1762ms_MARS.korc
@@ -5,10 +5,10 @@
     ! Append simulation results after previous simulation_time reached
   reinit = F
     ! Begin a new simulation, reinitializing from restart file state
-  simulation_time = 1.E-7
+  simulation_time = 1.E-8
     ! Total aimed simulation time in seconds   
     ! Run 10 mu s If transients exist put 5 extra mu s.
-  snapshot_frequency = 1.E-8
+  snapshot_frequency = 1.E-9
     ! Time between snapshots in seconds
   restart_overwrite_frequency = 1.E-1	
     ! Time between overwritting of restart file in seconds

diff --git a/test/mars/korc_mars.sh.in b/test/mars/korc_mars.sh.in
@@ -17,4 +17,4 @@ fi
 
 ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} $1 ./xkorc $INPUT_FILE $OUT_DIR/
 
-h5diff -r -p 0.000008 $OUT_DIR/file_0.h5 ${CMAKE_SOURCE_DIR}/test/mars/file_0_new_random.h5
+h5diff -r -p 0.000008 $OUT_DIR/file_0.h5 ${CMAKE_SOURCE_DIR}/test/mars/file_0_$1.h5
Original file line number	Diff line number	Diff line change
Expand Up		@@ -17,4 +17,4 @@ fi

		${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} $1 ./xkorc $INPUT_FILE $OUT_DIR/

		h5diff -r -p 0.000008 $OUT_DIR/file_0.h5 ${CMAKE_SOURCE_DIR}/test/mars/file_0_new_random.h5
		h5diff -r -p 0.000008 $OUT_DIR/file_0.h5 ${CMAKE_SOURCE_DIR}/test/mars/file_0_$1.h5