From 6d042f2cecc5c0973fe52fcea0a7ae66678bc8f5 Mon Sep 17 00:00:00 2001 From: Andrew Bennett Date: Tue, 8 Sep 2020 19:00:32 -0700 Subject: [PATCH] Revert "fix hru2gru mapping" --- build/source/engine/read_attrb.f90 | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/build/source/engine/read_attrb.f90 b/build/source/engine/read_attrb.f90 index 760621d7..10124a41 100755 --- a/build/source/engine/read_attrb.f90 +++ b/build/source/engine/read_attrb.f90 @@ -51,8 +51,7 @@ subroutine read_dimension(attrFile,fileGRU,fileHRU,nGRU,nHRU,err,message,startGR ! locals integer(i4b) :: sGRU ! starting GRU - integer(i4b) :: iHRU ! HRU counting index - integer(i4b) :: jHRU ! HRU index within GRU + integer(i4b) :: iHRU ! HRU couinting index integer(i4b) :: iGRU ! GRU loop index integer(8),allocatable :: gru_id(:),hru_id(:)! read gru/hru IDs in from attributes file integer(8),allocatable :: hru2gru_id(:) ! read hru->gru mapping in from attributes file @@ -181,12 +180,9 @@ subroutine read_dimension(attrFile,fileGRU,fileHRU,nGRU,nHRU,err,message,startGR index_map(1)%localHRU_ix = hru_ix(1) ! index of hru within the gru else ! anything other than a single HRU run - do iGRU = 1,nGRU - do jHRU = 1,gru_struc(iGRU)%hruCount - index_map(gru_struc(iGRU)%hruInfo(jHRU)%hru_nc)%gru_ix = iGRU ! index of gru in run domain to which the hru belongs - index_map(gru_struc(iGRU)%hruInfo(jHRU)%hru_nc)%localHRU_ix = jHRU ! index of hru within the gru - end do ! jHRU = 1,gru_struc(iGRU)%hruCount + index_map(gru_struc(iGRU)%hruInfo(:)%hru_ix)%gru_ix = iGRU ! index of gru in run domain to which the hru belongs + index_map(gru_struc(iGRU)%hruInfo(:)%hru_ix)%localHRU_ix = hru_ix(1:gru_struc(iGRU)%hruCount)! index of hru within the gru enddo ! iGRU = 1,nGRU end if ! not checkHRU