diff --git a/src/globals/module_globals.f90 b/src/globals/module_globals.f90 index a0393321..b62c345e 100644 --- a/src/globals/module_globals.f90 +++ b/src/globals/module_globals.f90 @@ -314,6 +314,8 @@ module module_globals character(*),parameter :: MDFILE = 'surface_meltdist.dat' character(*),parameter :: EJMFILE = 'surface_ejm.dat' character(*),parameter :: EJMFFILE = 'surface_ejmf.dat' +character(*),parameter :: MELTFRACFILE = 'surface_meltfrac.dat' +character(*),parameter :: DISTFRACFILE = 'surface_distfrac.dat' ! Global variables integer(I4B),parameter :: PBCLIM = 1 ! periodic boundary condition limit diff --git a/src/io/io_write_regotrack.f90 b/src/io/io_write_regotrack.f90 index bb4f59b3..eedfdc0b 100644 --- a/src/io/io_write_regotrack.f90 +++ b/src/io/io_write_regotrack.f90 @@ -36,6 +36,8 @@ subroutine io_write_regotrack(user,surf,domain) integer(I4B), parameter :: FMD = 14 integer(I4B), parameter :: FEJM = 15 integer(I4B), parameter :: FEJMF = 16 + integer(I4B), parameter :: FMF = 17 + integer(I4B), parameter :: FDF = 18 !type(regolisttype),pointer :: current => null() type(regodatatype),dimension(:),allocatable :: current integer(I4B),dimension(user%gridsize,user%gridsize) :: stacks_num @@ -55,7 +57,9 @@ subroutine io_write_regotrack(user,surf,domain) open(FAGE,file=AGEFILE,status='replace',form='unformatted') open(FMD,file=MDFILE,status='replace',form='unformatted') open(FEJM,file=EJMFILE,status='replace',form='unformatted') - !open(FEJMF,file=EJMFFILE,status='replace',form='unformatted') + open(FMF,file=MELTFRACFILE,status='replace',form='unformatted') + open(FDF,file=DISTFRACFILE,status='replace',form='unformatted') + open(FEJMF,file=EJMFFILE,status='replace',form='unformatted') ! First pass to get stack numbers stacks_num(:,:) = 0 @@ -78,10 +82,11 @@ subroutine io_write_regotrack(user,surf,domain) do i=1,user%gridsize !current => surf(i,j)%regolayer N = stacks_num(i,j) - allocate(meltvolume(N),thickness(N),comp(N),age(MAXAGEBINS,N),distvol(domain%rcnum,N),ejm(N),ejmf(N)) + allocate(meltvolume(N),thickness(N),comp(N),age(MAXAGEBINS,N),distvol(domain%rcnum,N),ejm(N),ejmf(N),& + meltfrac(N),meltdist(domain%rcnum,N)) allocate(current,source=surf(i,j)%regolayer) do k=1,N - ! meltfrac(k) = current%regodata%meltfrac + meltfrac(k) = current(k)%meltfrac ! thickness(k) = current%regodata%thickness ! comp(k) = current%regodata%comp ! age(:,k) = current%regodata%age(:) @@ -92,8 +97,9 @@ subroutine io_write_regotrack(user,surf,domain) age(:,k) = current(k)%age(:) !write(*,*) i, j distvol(:,k) = current(k)%distvol(:) + meltdist(:,k) = current(k)%meltdist(:) ejm(k) = current(k)%ejm - !ejmf(k) = current(k)%ejmf + ejmf(k) = current(k)%ejmf end do deallocate(current) @@ -104,7 +110,9 @@ subroutine io_write_regotrack(user,surf,domain) write(FMD) distvol(:,:) write(FEJM) ejm(:) !write(FEJMF) ejmf(:) - deallocate(meltvolume,thickness,comp,age,distvol,ejm,ejmf) + write(FMF) meltfrac(:) + write(FDF) meltdist(:,:) + deallocate(meltvolume,thickness,comp,age,distvol,ejm,ejmf,meltfrac,meltdist) end do end do close(FMELT) @@ -113,7 +121,9 @@ subroutine io_write_regotrack(user,surf,domain) close(FAGE) close(FMD) close(FEJM) - !close(FEJMF) + close(FEJMF) + close(FMF) + close(FDF) recsize = sizeof(itmp) * user%gridsize * user%gridsize open(LUN,file=STACKNUMFILE,status='replace',form='unformatted',recl=recsize,access='direct') @@ -121,4 +131,4 @@ subroutine io_write_regotrack(user,surf,domain) close(LUN) return -end subroutine io_write_regotrack +end subroutine io_write_regotrack \ No newline at end of file