Merge branch 'debug'

MintonGroup · Mar 4, 2022 · 554acc6 · 554acc6
2 parents 2cce143 + 757118c
commit 554acc6
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 13 deletions.
diff --git a/src/io/io.f90 b/src/io/io.f90
@@ -1364,7 +1364,7 @@ subroutine io_read_in_cb(self, param)
 
       if (ierr == 0) then
 
-         if (self%j2rp2 /= 0.0_DP) param%loblatecb = .true.
+         param%loblatecb = ((self%j2rp2 /= 0.0_DP) .or. (self%j4rp4 /= 0.0_DP))
          if (param%rmin < 0.0) param%rmin = self%radius
 
          select type(cb => self)

diff --git a/src/netcdf/netcdf.f90 b/src/netcdf/netcdf.f90
@@ -341,10 +341,8 @@ module subroutine netcdf_initialize_output(self, param)
             !call check( nf90_def_var_chunking(self%ncid, self%GMescape_varid, NF90_CHUNKED, [self%time_chunk]) )
       end if
 
-      if (param%loblatecb) then
-         call check( nf90_def_var(self%ncid, J2RP2_VARNAME, self%out_type, self%time_dimid, self%j2rp2_varid) )
-         call check( nf90_def_var(self%ncid, J4RP4_VARNAME, self%out_type, self%time_dimid, self%j4rp4_varid) )
-      end if
+      call check( nf90_def_var(self%ncid, J2RP2_VARNAME, self%out_type, self%time_dimid, self%j2rp2_varid) )
+      call check( nf90_def_var(self%ncid, J4RP4_VARNAME, self%out_type, self%time_dimid, self%j4rp4_varid) )
 
       ! Set fill mode to NaN for all variables
       call check( nf90_inquire(self%ncid, nVariables=nvar) )
@@ -479,10 +477,8 @@ module subroutine netcdf_open(self, param, readonly)
          call check( nf90_inq_varid(self%ncid, GMESCAPE_VARNAME, self%GMescape_varid) )
       end if
 
-      if (param%loblatecb) then
-         call check( nf90_inq_varid(self%ncid, J2RP2_VARNAME, self%j2rp2_varid) )
-         call check( nf90_inq_varid(self%ncid, J4RP4_VARNAME, self%j4rp4_varid) )
-      end if
+      call check( nf90_inq_varid(self%ncid, J2RP2_VARNAME, self%j2rp2_varid) )
+      call check( nf90_inq_varid(self%ncid, J4RP4_VARNAME, self%j4rp4_varid) )
 
       return
    end subroutine netcdf_open
@@ -665,6 +661,10 @@ module function netcdf_read_frame_system(self, iu, param) result(ierr)
             if (npl > 0) pl%Q(:) = pack(rtemp, plmask)
          end if
 
+         call check( nf90_get_var(iu%ncid, iu%j2rp2_varid, cb%j2rp2, start=[tslot]) )
+         call check( nf90_get_var(iu%ncid, iu%j4rp4_varid, cb%j4rp4, start=[tslot]) )
+         param%loblatecb = ((cb%j2rp2 /= 0.0_DP) .or. (cb%j4rp4 /= 0.0_DP))
+
          call self%read_particle_info(iu, param, plmask, tpmask) 
       end associate
 
@@ -975,10 +975,8 @@ module subroutine netcdf_write_frame_base(self, iu, param)
 
          call check( nf90_put_var(iu%ncid, iu%Gmass_varid, self%Gmass, start=[idslot, tslot]) )
          if (param%lclose) call check( nf90_put_var(iu%ncid, iu%radius_varid, self%radius, start=[idslot, tslot]) )
-         if (param%loblatecb) then
-            call check( nf90_put_var(iu%ncid, iu%j2rp2_varid, self%j2rp2, start=[idslot, tslot]))
-            call check( nf90_put_var(iu%ncid, iu%j4rp4_varid, self%j4rp4, start=[idslot, tslot]))
-         end if
+         call check( nf90_put_var(iu%ncid, iu%j2rp2_varid, self%j2rp2, start=[tslot]))
+         call check( nf90_put_var(iu%ncid, iu%j4rp4_varid, self%j4rp4, start=[tslot]))
          if (param%lrotation) then
             call check( nf90_put_var(iu%ncid, iu%Ip1_varid, self%Ip(1), start=[idslot, tslot]) )
             call check( nf90_put_var(iu%ncid, iu%Ip2_varid, self%Ip(2), start=[idslot, tslot]) )