Merge pull request #437 from Fitz-Hu/master

danieljprice · Jun 19, 2023 · 7e18a84 · 7e18a84
2 parents ae95940 + e0a8f1d
commit 7e18a84
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 1 deletion.
diff --git a/build/Makefile b/build/Makefile
@@ -299,6 +299,9 @@ else
 endif
 endif
 
+ifeq ($(AOCC), yes)
+    FPPFLAGS += -DAOCC
+endif
 #
 # kernel choice
 #

diff --git a/build/Makefile_defaults_aocc b/build/Makefile_defaults_aocc
@@ -12,3 +12,4 @@ KNOWN_SYSTEM=yes
 
 OMPFLAGS= -fopenmp
 
+AOCC = yes
diff --git a/build/Makefile_systems b/build/Makefile_systems
@@ -101,7 +101,7 @@ ifeq ($(SYSTEM), ozstar)
     WALLTIME='168:00:00'
 endif
 
-ifeq ($(SYSTEM), ozstar2)
+ifeq ($(SYSTEM), nt)
 #   ozstar milan cluster
     include Makefile_defaults_aocc
     OMPFLAGS=-fopenmp

diff --git a/src/main/readwrite_dumps.F90 b/src/main/readwrite_dumps.F90
@@ -27,8 +27,13 @@ module readwrite_dumps
 
  public :: write_smalldump,write_fulldump,read_smalldump,read_dump,write_gadgetdump
 
+#ifdef AOCC
+ logical, pointer, public    :: opened_full_dump
+ logical, pointer, public    :: dt_read_in         
+#else
  logical, pointer, public    :: opened_full_dump => opened_full_dump_fortran      ! for use in analysis files if user wishes to skip small dumps
  logical, pointer, public    :: dt_read_in => dt_read_in_fortran           ! to determine if dt has been read in so that ibin & ibinold can be set on restarts
+#endif
 
  integer, parameter, public :: is_small_dump = 1978
  integer, parameter, public :: is_not_mhd = 1979