Merge/netcdf restart

.gitignore

@@ -30,3 +30,5 @@ summa.exe.dSYM*
 # makefile
 make.out
 Makefile-*
+# backup files
+*.backup

build/source/dshare/ascii_util.f90

@@ -48,19 +48,19 @@ subroutine file_open(infile,unt,err,message)
  if(.not.xist)then
    message=trim(message)//"FileNotFound[file='"//trim(infile)//"']"
    err=10; return
- endif
+ end if
  ! check if the file is already open
  inquire(file=trim(infile),opened=xopn) ! Check if the file is open
  if(xopn)then
   message=trim(message)//"FileAlreadyOpen['"//trim(infile)//"']"
   err=20; return
- endif
+ end if
  ! open file
  open(newunit=unt,file=trim(infile),status="old",action="read",iostat=err)
  if(err/=0)then
    message=trim(message)//"OpenError['"//trim(infile)//"']"
    err=20; return
- endif
+ end if
  end subroutine file_open
 
 
@@ -109,14 +109,14 @@ subroutine split_line(inline,words,err,message)
   else
    allocate(current%next); current%next=node(cword,iword,null())
    current=>current%next
-  endif
+  end if
   ! check that the line has fewer words than maxWords
-  if (iword==maxWords)then; err=20; message=trim(message)//"exceedMaxWords [line = "//trim(inline)//"]"; return; endif
+  if (iword==maxWords)then; err=20; message=trim(message)//"exceedMaxWords [line = "//trim(inline)//"]"; return; end if
  end do
  ! ***** allocate space for the list of words
  nWords = current%ix
  allocate(words(nWords),stat=err)
- if(err/=0)then; err=30; message=trim(message)//"problemAllocateWords"; return; endif
+ if(err/=0)then; err=30; message=trim(message)//"problemAllocateWords"; return; end if
  ! ***** save the list in a vector, and deallocate space as we go...
  current=>list
  do while(associated(current))
@@ -169,12 +169,12 @@ subroutine get_vlines(unt,vlines,err,message)
    allocate(current%next)
    current%next=node(temp,icount,null())
    current=>current%next
-  endif
-  if (iline==maxLines)then; err=20; message=trim(message)//"exceedMaxLines"; return; endif
+  end if
+  if (iline==maxLines)then; err=20; message=trim(message)//"exceedMaxLines"; return; end if
  end do  ! looping through the lines in the file (exit clause above will kick in)
  ! ***** allocate space for the valid lines *****
  allocate(vlines(icount),stat=err)
- if(err/=0)then; err=30; message=trim(message)//"problemAllocateVlines"; return; endif
+ if(err/=0)then; err=30; message=trim(message)//"problemAllocateVlines"; return; end if
  ! ***** save the list in a vector, and deallocate space as we go... *****
  current=>list
  do while(associated(current))

build/source/dshare/data_types.f90

@@ -96,13 +96,13 @@ MODULE data_types
  ! hru info data structure
  type, public :: hru_info
   integer(i4b)                      :: hru_nc                   ! index of the hru in the netcdf file
-  integer(i4b)                      :: hru_ix                   ! index of the hru in the entire domain
+  integer(i4b)                      :: hru_ix                   ! index of the hru in the run domain
   integer(i4b)                      :: hru_id                   ! id (non-sequential number) of the hru
   integer(i4b)                      :: nSnow                    ! number of snow layers
   integer(i4b)                      :: nSoil                    ! number of soil layers
  endtype hru_info
 
- ! define mapping from HRUs to the HRUs
+ ! define mapping from GRUs to the HRUs
  type, public :: gru2hru_map
   integer(i4b)                      :: gruId                    ! id of the gru
   integer(i4b)                      :: hruCount                 ! total number of hrus in the gru

build/source/dshare/get_ixname.f90

@@ -96,7 +96,7 @@ function get_ixdecisions(varName)
   ! get to here if cannot find the variable
   case default
    get_ixdecisions = integerMissing
- endselect
+ end select
  end function get_ixdecisions
 
 
@@ -119,7 +119,7 @@ function get_ixtime(varName)
   ! get to here if cannot find the variable
   case default
    get_ixtime = integerMissing
- endselect
+ end select
  end function get_ixtime
 
 
@@ -145,7 +145,7 @@ function get_ixforce(varName)
   ! get to here if cannot find the variable
   case default
    get_ixforce = integerMissing
- endselect
+ end select
  end function get_ixforce
 
 
@@ -170,7 +170,7 @@ function get_ixAttr(varName)
   ! get to here if cannot find the variable
   case default
    get_ixAttr = integerMissing
- endselect
+ end select
  end function get_ixAttr
 
 
@@ -193,7 +193,7 @@ function get_ixType(varName)
   ! get to here if cannot find the variable
   case default
    get_ixType = integerMissing
- endselect
+ end select
  end function get_ixType
 
 
@@ -377,7 +377,7 @@ function get_ixparam(varName)
   ! get to here if cannot find the variable
   case default
    get_ixparam = integerMissing
- endselect
+ end select
  end function get_ixparam
 
 
@@ -422,7 +422,7 @@ function get_ixprog(varName)
   ! get to here if cannot find the variable
   case default
    get_ixprog = integerMissing
- endselect
+ end select
  end function get_ixprog
 
 
@@ -528,7 +528,7 @@ function get_ixdiag(varName)
   ! get to here if cannot find the variable
   case default
    get_ixdiag = integerMissing
- endselect
+ end select
  end function get_ixdiag
 
 
@@ -640,7 +640,7 @@ function get_ixflux(varName)
   case('scalarAquiferBaseflow'          ); get_ixflux = iLookFLUX%scalarAquiferBaseflow            ! baseflow from the aquifer (m s-1)
   case default
    get_ixflux = integerMissing
- endselect
+ end select
  end function get_ixflux
 
 
@@ -702,7 +702,7 @@ function get_ixderiv(varName)
   case('dPsiLiq_dTemp'                  ); get_ixderiv = iLookDERIV%dPsiLiq_dTemp                  ! derivative in the liquid water matric potential w.r.t. temperature (m K-1)
   case default
    get_ixderiv = integerMissing
- endselect
+ end select
  end function get_ixderiv
 
 
@@ -762,7 +762,7 @@ function get_ixindex(varName)
   case('ifcTotoStartIndex'); get_ixindex = iLookINDEX%ifcTotoStartIndex ! start index of the ifcToto vector for a given timestep
   case default
    get_ixindex = integerMissing
- endselect
+ end select
  end function get_ixindex
 
 
@@ -787,7 +787,7 @@ function get_ixbpar(varName)
   ! get to here if cannot find the variable
   case default
    get_ixbpar = integerMissing
- endselect
+ end select
  end function get_ixbpar
 
 
@@ -819,7 +819,7 @@ function get_ixbvar(varName)
   ! get to here if cannot find the variable
   case default
    get_ixbvar = integerMissing
- endselect
+ end select
  end function get_ixbvar
 
  ! *********************************************************************************************************
@@ -846,7 +846,7 @@ function get_ixVarType(varType)
   ! get to here if cannot find the variable
   case default
    get_ixVarType = integerMissing
- endselect
+ end select
  end function get_ixVarType
 
  ! ****************************************************************************************************************
@@ -873,7 +873,7 @@ function get_varTypeName(varType)
   ! get to here if cannot find the variable
   case default
    get_VarTypeName = 'missing'
- endselect
+ end select
  end function get_VarTypeName
 
  ! *******************************************************************************************************************
@@ -916,9 +916,9 @@ subroutine get_ixUnknown(varName,typeName,vDex,err,message)
    case ('bpar' ); vDex = get_ixBpar(trim(varName))
    case ('bvar' ); vDex = get_ixBvar(trim(varName))
    case ('deriv'); vDex = get_ixDeriv(trim(varName))
-  endselect
-  if (vDex>0) then; typeName=trim(structInfo(iStruc)%structName); return; endif;
- enddo
+  end select
+  if (vDex>0) then; typeName=trim(structInfo(iStruc)%structName); return; end if;
+ end do
 
  ! 404
  err=20;message=trim(message)//'variable not found in any structure:'//trim(varName); return;
@@ -946,7 +946,7 @@ function get_statName(istat)
   ! get to here if cannot find the variable
   case default
    get_statName = 'unknown'
- endselect
+ end select
  end function get_statName
 
 end module get_ixname_module

build/source/dshare/outpt_stat.f90

@@ -83,11 +83,11 @@ subroutine calcStats(stat,dat,meta,iStep,err,message)
     stat(iVar)%dat(iLookStat%inst) = tdata
    else
     call calc_stats(meta(iVar),stat(iVar),tdata,iStep,err,cmessage)  
-   endif
+   end if
 
-   if(err/=0)then; message=trim(message)//trim(cmessage);return; endif  
-  endif
- enddo                                             ! model variables
+   if(err/=0)then; message=trim(message)//trim(cmessage);return; end if  
+  end if
+ end do                                             ! model variables
 
  return
  end subroutine calcStats
@@ -103,6 +103,8 @@ subroutine calc_stats(meta,stat,tdata,iStep,err,message)
  USE data_types,only:var_info,ilength,dlength ! type dec for meta data structures 
  USE var_lookup,only:maxVarStat       ! # of output statistics 
  USE globalData,only:outFreq          ! output frequencies 
+ ! global variables 
+ USE globalData,only:data_step        ! forcing timestep
  ! structures of named variables
  USE var_lookup,only:iLookVarType     ! named variables for variable types 
  USE var_lookup,only:iLookStat        ! named variables for output statistics types 
@@ -124,7 +126,7 @@ subroutine calc_stats(meta,stat,tdata,iStep,err,message)
 
  ! pull current frequency for normalization
  iFreq = meta%outFreq
- if (iFreq<0) then; err=-20; message=trim(message)//'bad output file id# (outfreq)'; return; endif
+ if (iFreq<0) then; err=-20; message=trim(message)//'bad output file id# (outfreq)'; return; end if
 
  ! pack back into struc
  select type (stat)
@@ -155,8 +157,8 @@ subroutine calc_stats(meta,stat,tdata,iStep,err,message)
     case (iLookStat%mode)                          ! mode over period (does not work)
      tstat(iStat) = -9999.
    end select
-  enddo ! iStat 
- endif
+  end do ! iStat 
+ end if
 
  ! ---------------------------------------------
  ! Calculate each statistic that is requested by user
@@ -181,7 +183,7 @@ subroutine calc_stats(meta,stat,tdata,iStep,err,message)
    case (iLookStat%mode)                           ! (does not work)
     tstat(iStat) = -9999. 
   end select
- enddo ! iStat 
+ end do ! iStat 
 
  ! ---------------------------------------------
  ! finalize statistics at end of frequenncy period 
@@ -191,14 +193,16 @@ subroutine calc_stats(meta,stat,tdata,iStep,err,message)
    if (.not.meta%statFlag(iStat)) cycle            ! do not bother if output flag is off
    if (meta%vartype.ne.iLookVarType%outstat) cycle ! only calculate stats for scalars 
    select case(iStat)                              ! act depending on the statistic 
+    case (iLookStat%totl)                          ! summation over period
+     tstat(iStat) = tstat(iStat)*data_step         ! scale by seconds per timestep
     case (iLookStat%mean)                          ! mean over period
      tstat(iStat) = tstat(iStat)/outFreq(iFreq)    ! normalize sum into mean
     case (iLookStat%vari)                          ! variance over period
      tstat(maxVarStat+1) = tstat(maxVarStat+1)/outFreq(iFreq) ! E[X] term
      tstat(iStat) = tstat(iStat)/outFreq(iFreq) - tstat(maxVarStat+1)**2 ! full variance
    end select
-  enddo ! iStat 
- endif
+  end do ! iStat 
+ end if
 
  ! pack back into struc
  select type (stat)