multi-interval regotracking works!!!!

MintonGroup · May 30, 2023 · 7c350de · 7c350de
1 parent 5e1d1b5
commit 7c350de
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 15 deletions.
diff --git a/src/io/io_read_regotrack.f90 b/src/io/io_read_regotrack.f90
@@ -48,7 +48,7 @@ subroutine io_read_regotrack(user,surf,domain)
    type(regodatatype) :: newsurfi
    integer(I4B) :: ioerr,i,j,k,q,itmp,N
    integer(kind=8) :: recsize
-   logical :: initstat 
+   logical :: initstat
 
    ! Executable code
 
@@ -118,16 +118,15 @@ subroutine io_read_regotrack(user,surf,domain)
        stop
    end if
 
-   ! Start pushing regolith thickness and melt fraction of each layer in FILO manner
-
+   ! Start pushing regolith thickness and melt fraction of each layer
    allocate(newsurfi%meltdist(1+domain%rcnum))
    allocate(newsurfi%distvol(1+domain%rcnum))
 
    do j=1,user%gridsize
       do i=1,user%gridsize
 
          !call util_init_list(surf(i,j)%regolayer,initstat)
-         call util_init_array(user,surf(i,j)%regolayer,domain,initstat)
+         !call util_init_array(user,surf(i,j)%regolayer,domain,initstat)
          N = stacks_num(i,j)
          allocate(meltvolume(N),thickness(N),comp(N),age(MAXAGEBINS,N),distvol(1+domain%rcnum,N),ejm(N),ejmf(N),&
             meltfrac(N),meltdist(1+domain%rcnum,N))
@@ -152,11 +151,9 @@ subroutine io_read_regotrack(user,surf,domain)
             end do
 
          end do
-
-
-
 
-         do k=max(stacks_num(i,j),1),1,-1
+         !do k=max(stacks_num(i,j),1),1,-1
+         do k=1,max(stacks_num(i,j),1),1
             newsurfi%thickness = thickness(k)
             newsurfi%comp = comp(k)
             newsurfi%meltfrac  = meltfrac(k)
@@ -171,12 +168,6 @@ subroutine io_read_regotrack(user,surf,domain)
                newsurfi%meltdist(q) = meltdist(q,k)
                newsurfi%distvol(q) = distvol(q,k)
             end do
-            ! if (j .eq. 1) then
-            !     if (i .eq. 1) then
-            !        !write(*,*) meltdist(:,k)
-            !         write(*,*) newsurfi%meltdist
-            !     end if
-            ! end if
             call util_push_array(surf(i,j)%regolayer,newsurfi)
          end do
 

diff --git a/src/io/io_write_regotrack.f90 b/src/io/io_write_regotrack.f90
@@ -100,7 +100,6 @@ subroutine io_write_regotrack(user,surf,domain)
             meltdist(:,k) = current(k)%meltdist(:)
             ejm(k) = current(k)%ejm
             ejmf(k) = current(k)%ejmf
-
          end do
          deallocate(current)
          write(FMELT) meltvolume(:)