Merge pull request #372 from sfiligoi/p202405_restart

New, more flexible restart format
gafusion · May 17, 2024 · 7fd9454 · 7fd9454
2 parents 4d93e7f + 8f08a83
commit 7fd9454
Show file tree

Hide file tree

Showing 8 changed files with 767 additions and 528 deletions.
diff --git a/cgyro/src/Makefile b/cgyro/src/Makefile
@@ -21,6 +21,7 @@ OBJECTS = cgyro_globals.o \
           cgyro_parallel_lib.o \
           cgyro_step.o \
           cgyro_io.o \
+          cgyro_restart.o \
           cgyro_advect_wavenumber.o \
 	  cgyro_init_rotation.o \
           cgyro_equilibrium.o \
@@ -58,8 +59,6 @@ OBJECTS = cgyro_globals.o \
 	  cgyro_step_gk_bs5.o \
 	  cgyro_step_gk_v76.o \
           cgyro_write_initdata.o \
-          cgyro_read_restart.o \
-          cgyro_write_restart.o \
           cgyro_write_timedata.o \
           cgyro_write_hosts.o
 

diff --git a/cgyro/src/cgyro_globals.F90 b/cgyro/src/cgyro_globals.F90
@@ -251,8 +251,6 @@ module cgyro_globals
   ! Restart tags
   character(len=8) :: fmt='(I2.2)'
   character(len=6), dimension(100) :: rtag
-  integer, parameter :: restart_header_size = 1024
-  integer  :: restart_magic
   !
   ! error checking
   integer :: error_status = 0

diff --git a/cgyro/src/cgyro_init_h.f90 b/cgyro/src/cgyro_init_h.f90
@@ -3,6 +3,7 @@ subroutine cgyro_init_h
   use mpi
   use cgyro_globals
   use cgyro_io
+  use cgyro_restart
 
   implicit none
 

diff --git a/cgyro/src/cgyro_init_manager.F90 b/cgyro/src/cgyro_init_manager.F90
@@ -381,14 +381,6 @@ subroutine cgyro_init_manager
 
   call cgyro_check_memory(trim(path)//runfile_memory)
 
-  if (velocity_order == 1) then
-    ! traditional ordering
-    restart_magic = 140906808
-  else
-    ! alternative ordering, need different magic
-    restart_magic = 140916753
-  endif
-
   call timer_lib_out('str_init')
 
   ! Write initial data

diff --git a/cgyro/src/cgyro_kernel.F90 b/cgyro/src/cgyro_kernel.F90
@@ -17,6 +17,7 @@ subroutine cgyro_kernel
   use cgyro_globals
   use cgyro_step
   use cgyro_io
+  use cgyro_restart
 
   implicit none
 

diff --git a/cgyro/src/cgyro_read_restart.F90 b/cgyro/src/cgyro_read_restart.F90