move header/dtypes back

Author: wpbonelli

src/Solution/ParticleTracker/Particle/MemoryBuffer.f90

@@ -4,7 +4,7 @@ module MemoryBufferModule
 
   use KindModule, only: I4B
   use ParticleTrackEventBufferModule, only: ParticleTrackEventBufferType, &
-                                            TrackRecordType, &
+                                            ParticleTrackRecordType, &
                                             ParticleTrackFileType, &
                                             save_record
 
@@ -15,7 +15,7 @@ module MemoryBufferModule
   !> @brief In-memory particle event buffer. Records are held in a
   !! dynamically growing array that doubles in capacity as needed.
   type, extends(ParticleTrackEventBufferType) :: MemoryBufferType
-    type(TrackRecordType), allocatable :: records(:) !< buffer
+    type(ParticleTrackRecordType), allocatable :: records(:) !< buffer
   contains
     procedure :: append => memory_append
     procedure :: flush => memory_flush
@@ -27,8 +27,8 @@ module MemoryBufferModule
 
   subroutine memory_append(this, rec)
     class(MemoryBufferType) :: this
-    type(TrackRecordType), intent(in) :: rec
-    type(TrackRecordType), allocatable :: tmp(:)
+    type(ParticleTrackRecordType), intent(in) :: rec
+    type(ParticleTrackRecordType), allocatable :: tmp(:)
 
     if (.not. allocated(this%records)) then
       allocate (this%records(64))
@@ -45,7 +45,7 @@ subroutine memory_flush(this, files)
     class(MemoryBufferType) :: this
     type(ParticleTrackFileType), intent(in) :: files(:)
     integer(I4B) :: n, i
-    type(TrackRecordType) :: rec
+    type(ParticleTrackRecordType) :: rec
 
     do n = 1, this%nrecords
       rec = this%records(n)

src/Solution/ParticleTracker/Particle/ParticleTrackEventBuffer.f90

@@ -1,6 +1,6 @@
 !> @brief Particle track event buffer module.
 !!
-!! Defines the abstract ParticleTrackEventBufferType, the TrackRecordType
+!! Defines the abstract ParticleTrackEventBufferType, the ParticleTrackRecordType
 !! and ParticleTrackFileType data types, and the save_record helper used
 !! by concrete buffer implementations.
 !<
@@ -11,21 +11,13 @@ module ParticleTrackEventBufferModule
 
   implicit none
 
-  character(len=*), parameter, public :: TRACKHEADER = &
-    'kper,kstp,imdl,iprp,irpt,ilay,icell,izone,&
-    &istatus,ireason,trelease,t,x,y,z,name'
-
-  character(len=*), parameter, public :: TRACKDTYPES = &
-    '<i4,<i4,<i4,<i4,<i4,<i4,<i4,<i4,&
-    &<i4,<i4,<f8,<f8,<f8,<f8,<f8,|S40'
-
   !> @brief Flat record of a particle track event.
-  type :: TrackRecordType
+  type :: ParticleTrackRecordType
     integer(I4B) :: kper, kstp, imdl, iprp, irpt, ilay, icu, izone
     integer(I4B) :: istatus, ireason
     real(DP) :: trelease, ttrack, x, y, z
     character(len=40) :: name
-  end type TrackRecordType
+  end type ParticleTrackRecordType
 
   !> @brief Output file containing all or some particle pathlines.
   !!
@@ -52,9 +44,9 @@ module ParticleTrackEventBufferModule
 
   abstract interface
     subroutine buffer_append(this, rec)
-      import ParticleTrackEventBufferType, TrackRecordType
+      import ParticleTrackEventBufferType, ParticleTrackRecordType
       class(ParticleTrackEventBufferType) :: this
-      type(TrackRecordType), intent(in) :: rec
+      type(ParticleTrackRecordType), intent(in) :: rec
     end subroutine buffer_append
 
     subroutine buffer_flush(this, files)
@@ -79,7 +71,7 @@ end subroutine buffer_init
   !> @brief Save an event record to a binary or CSV file.
   subroutine save_record(iun, rec, csv)
     integer(I4B), intent(in) :: iun
-    type(TrackRecordType), intent(in) :: rec
+    type(ParticleTrackRecordType), intent(in) :: rec
     logical(LGP), intent(in) :: csv
 
     if (csv) then

src/Solution/ParticleTracker/Particle/ParticleTracks.f90

@@ -43,6 +43,14 @@ module ParticleTracksModule
             ParticleTrackEventSelectionType, &
             add_particle_event
 
+  character(len=*), parameter, public :: TRACKHEADER = &
+    'kper,kstp,imdl,iprp,irpt,ilay,icell,izone,&
+    &istatus,ireason,trelease,t,x,y,z,name'
+
+  character(len=*), parameter, public :: TRACKDTYPES = &
+    '<i4,<i4,<i4,<i4,<i4,<i4,<i4,<i4,&
+    &<i4,<i4,<f8,<f8,<f8,<f8,<f8,|S40'
+
   !> @brief Selection of particle events.
   type :: ParticleTrackEventSelectionType
     logical(LGP) :: release !< track release events
@@ -211,7 +219,7 @@ subroutine buffer_event(this, particle, event)
     class(ParticleTracksType) :: this
     type(ParticleType), pointer, intent(in) :: particle
     class(ParticleEventType), pointer, intent(in) :: event
-    type(TrackRecordType) :: rec
+    type(ParticleTrackRecordType) :: rec
 
     rec%kper = event%kper; rec%kstp = event%kstp
     rec%imdl = event%imdl; rec%iprp = event%iprp

src/Solution/ParticleTracker/Particle/ScratchFileBuffer.f90

@@ -5,7 +5,7 @@ module ScratchFileBufferModule
   use KindModule, only: I4B
   use ErrorUtilModule, only: pstop
   use ParticleTrackEventBufferModule, only: ParticleTrackEventBufferType, &
-                                            TrackRecordType, &
+                                            ParticleTrackRecordType, &
                                             ParticleTrackFileType, &
                                             save_record
 
@@ -39,7 +39,7 @@ end subroutine scratch_init
 
   subroutine scratch_append(this, rec)
     class(ScratchFileBufferType) :: this
-    type(TrackRecordType), intent(in) :: rec
+    type(ParticleTrackRecordType), intent(in) :: rec
     write (this%iun) rec
     this%nrecords = this%nrecords + 1
   end subroutine scratch_append
@@ -48,7 +48,7 @@ subroutine scratch_flush(this, files)
     class(ScratchFileBufferType) :: this
     type(ParticleTrackFileType), intent(in) :: files(:)
     integer(I4B) :: n, i
-    type(TrackRecordType) :: rec
+    type(ParticleTrackRecordType) :: rec
 
     rewind (this%iun)
     do n = 1, this%nrecords