Merge pull request #452 from NCAR/develop

Bugfixes and minor improvements

Author: arbennett

.github.com/CONTRIBUTING.md .github/CONTRIBUTING.md.github.com/CONTRIBUTING.md renamed to .github/CONTRIBUTING.md

@@ -91,12 +91,12 @@ ifeq "$(FC)" "gfortran"
 	endif
 
 # Production runs
-FLAGS_NOAH = -O3 -ffree-form -fdefault-real-8 -ffree-line-length-none -fmax-errors=0 $(FLAGS_OMP)
+FLAGS_NOAH = -O3 -ffree-form -ffree-line-length-none -fmax-errors=0 $(FLAGS_OMP)
 FLAGS_COMM = -O3 -ffree-line-length-none -fmax-errors=0 $(FLAGS_OMP)
 FLAGS_SUMMA = -O3 -ffree-line-length-none -fmax-errors=0 $(FLAGS_OMP)
 
 # Debug runs
-#FLAGS_NOAH = -p -g -ffree-form -fdefault-real-8 -ffree-line-length-none -fmax-errors=0 -fbacktrace -Wno-unused -Wno-unused-dummy-argument
+#FLAGS_NOAH = -p -g -ffree-form -ffree-line-length-none -fmax-errors=0 -fbacktrace -Wno-unused -Wno-unused-dummy-argument
 #FLAGS_COMM = -p -g -Wall -ffree-line-length-none -fmax-errors=0 -fbacktrace -fcheck=bounds
 #FLAGS_SUMMA = -p -g -Wall -ffree-line-length-none -fmax-errors=0 -fbacktrace -fcheck=bounds
 
@@ -110,12 +110,12 @@ ifeq "$(FC)" "ifort"
 	endif
 
 # Production runs
-FLAGS_NOAH = -O3 -autodouble -noerror_limit -FR -auto -fltconsistency $(FLAGS_OMP)
+FLAGS_NOAH = -O3 -noerror_limit -FR -auto -fltconsistency $(FLAGS_OMP)
 FLAGS_COMM = -O3 -FR -auto -fltconsistency -fpe0 $(FLAGS_OMP)
 FLAGS_SUMMA = -O3 -FR -auto -fltconsistency -fpe0 $(FLAGS_OMP)
 
 # Debug runs
-#FLAGS_NOAH = -O0 -p -g -warn nounused -autodouble -noerror_limit -FR -auto -WB -traceback -fltconsistency
+#FLAGS_NOAH = -O0 -p -g -warn nounused -noerror_limit -FR -auto -WB -traceback -fltconsistency
 #FLAGS_COMM = -O0 -p -g -debug -warn all -check all -FR -auto -WB -traceback -fltconsistency -fpe0
 #FLAGS_SUMMA = -O0 -p -g -debug -warn all -check all -FR -auto -WB -traceback -fltconsistency -fpe0
 endif
@@ -357,7 +357,7 @@ update_version:
 
 # compile Noah-MP routines
 compile_noah:
-	$(FC_EXE) $(FLAGS_NOAH) -c $(NOAHMP)
+	$(FC_EXE) $(FLAGS_NOAH) -c $(NRUTIL) $(NOAHMP)
 
 # compile common routines
 compile_comm:

.github.com/ISSUE_TEMPLATE.md .github/ISSUE_TEMPLATE.md.github.com/ISSUE_TEMPLATE.md renamed to .github/ISSUE_TEMPLATE.md

@@ -100,11 +100,11 @@ subroutine summa_defineOutputFiles(modelTimeStep, summa1_struc, err, message)
  ! *** define the name of the model output file
  ! *****************************************************************************
 
- ! define full name of output file 
+ ! define full name of output file
  if(modelTimeStep==1)then
   select case(newOutputFile)
    case(noNewFiles);          ! do nothing, just ensure validity of outputfile option
-   case(newFileEveryOct1);    
+   case(newFileEveryOct1);
    case default; err=20; message=trim(message)//'unable to identify the option to define new output files'; return
   end select
 
@@ -141,7 +141,7 @@ subroutine summa_defineOutputFiles(modelTimeStep, summa1_struc, err, message)
   end do  ! (looping through HRUs)
 
   ! write GRU parameters
-  call writeParm(integerMissing,bparStruct%gru(iGRU),bpar_meta,err,cmessage)
+  call writeParm(iGRU,bparStruct%gru(iGRU),bpar_meta,err,cmessage)
   if(err/=0)then; message=trim(message)//trim(cmessage); return; endif
 
  end do  ! (looping through GRUs)

.github.com/PULL_REQUEST_TEMPLATE.md .github/PULL_REQUEST_TEMPLATE.md.github.com/PULL_REQUEST_TEMPLATE.md renamed to .github/PULL_REQUEST_TEMPLATE.md

@@ -107,7 +107,7 @@ subroutine summa_defineGlobalData(err, message)
  doJacobian=.false.        ! initialize the Jacobian flag
 
  ! define double precision NaNs (shared in globalData)
- dNaN = ieee_value(1._dp, ieee_quiet_nan)
+ dNaN = ieee_value(1._rkind, ieee_quiet_nan)
 
  ! populate metadata for all model variables
  call popMetadat(err,cmessage)

build/Makefile

@@ -175,9 +175,9 @@ subroutine summa_initialize(summa1_struc, err, message)
  ncid(:) = integerMissing
 
  ! initialize the elapsed time for cumulative quantities
- elapsedRead=0._dp
- elapsedWrite=0._dp
- elapsedPhysics=0._dp
+ elapsedRead=0._rkind
+ elapsedWrite=0._rkind
+ elapsedPhysics=0._rkind
 
  ! get the command line arguments
  call getCommandArguments(summa1_struc,err,cmessage)

build/source/driver/summa_defineOutput.f90

@@ -72,16 +72,16 @@ subroutine summa_runPhysics(modelTimeStep, summa1_struc, err, message)
  integer(i4b)                          :: iGRU,jGRU,kGRU        ! GRU indices
  ! local variables: veg phenology
  logical(lgt)                          :: computeVegFluxFlag    ! flag to indicate if we are computing fluxes over vegetation (.false. means veg is buried with snow)
- real(dp)                              :: notUsed_canopyDepth   ! NOT USED: canopy depth (m)
- real(dp)                              :: notUsed_exposedVAI    ! NOT USED: exposed vegetation area index (m2 m-2)
+ real(rkind)                              :: notUsed_canopyDepth   ! NOT USED: canopy depth (m)
+ real(rkind)                              :: notUsed_exposedVAI    ! NOT USED: exposed vegetation area index (m2 m-2)
  ! local variables: parallelize the model run
  integer(i4b), allocatable             :: ixExpense(:)          ! ranked index GRU w.r.t. computational expense
  integer(i4b), allocatable             :: totalFluxCalls(:)     ! total number of flux calls for each GRU
  ! local variables: timing information
  integer*8                             :: openMPstart,openMPend ! time for the start of the parallelization section
  integer*8, allocatable                :: timeGRUstart(:)       ! time GRUs start
- real(dp),  allocatable                :: timeGRUcompleted(:)   ! time required to complete each GRU
- real(dp),  allocatable                :: timeGRU(:)            ! time spent on each GRU
+ real(rkind),  allocatable                :: timeGRUcompleted(:)   ! time required to complete each GRU
+ real(rkind),  allocatable                :: timeGRU(:)            ! time spent on each GRU
  ! ---------------------------------------------------------------------------------------
  ! associate to elements in the data structure
  summaVars: associate(&
@@ -171,7 +171,7 @@ subroutine summa_runPhysics(modelTimeStep, summa1_struc, err, message)
 
  ! compute the total number of flux calls from the previous time step
  do jGRU=1,nGRU
-  totalFluxCalls(jGRU) = 0._dp
+  totalFluxCalls(jGRU) = 0._rkind
   do iHRU=1,gru_struc(jGRU)%hruCount
    totalFluxCalls(jGRU) = totalFluxCalls(jGRU) + indxStruct%gru(jGRU)%hru(iHRU)%var(iLookINDEX%numberFluxCalc)%dat(1)
   end do
@@ -268,8 +268,8 @@ subroutine summa_runPhysics(modelTimeStep, summa1_struc, err, message)
   !$omp critical(saveTiming)
   ! save timing information
   call system_clock(openMPend)
-  timeGRU(iGRU)          = real(openMPend - timeGRUstart(iGRU), kind(dp))
-  timeGRUcompleted(iGRU) = real(openMPend - openMPstart       , kind(dp))
+  timeGRU(iGRU)          = real(openMPend - timeGRUstart(iGRU), kind(rkind))
+  timeGRUcompleted(iGRU) = real(openMPend - openMPstart       , kind(rkind))
   !$omp end critical(saveTiming)
 
  end do  ! (looping through GRUs)

build/source/driver/summa_globalData.f90

@@ -178,7 +178,7 @@ subroutine summa_readRestart(summa1_struc, err, message)
 
    ! initialize canopy drip
    ! NOTE: canopy drip from the previous time step is used to compute throughfall for the current time step
-   fluxStruct%gru(iGRU)%hru(iHRU)%var(iLookFLUX%scalarCanopyLiqDrainage)%dat(1) = 0._dp  ! not used
+   fluxStruct%gru(iGRU)%hru(iHRU)%var(iLookFLUX%scalarCanopyLiqDrainage)%dat(1) = 0._rkind  ! not used
 
   end do  ! end looping through HRUs
 
@@ -201,14 +201,14 @@ subroutine summa_readRestart(summa1_struc, err, message)
 
    ! the basin-average aquifer storage is not used if the groundwater is included in the local column
    case(localColumn)
-    bvarStruct%gru(iGRU)%var(iLookBVAR%basin__AquiferStorage)%dat(1) = 0._dp ! set to zero to be clear that there is no basin-average aquifer storage in this configuration
+    bvarStruct%gru(iGRU)%var(iLookBVAR%basin__AquiferStorage)%dat(1) = 0._rkind ! set to zero to be clear that there is no basin-average aquifer storage in this configuration
 
    ! the local column aquifer storage is not used if the groundwater is basin-average
    ! (i.e., where multiple HRUs drain to a basin-average aquifer)
    case(singleBasin)
-    bvarStruct%gru(iGRU)%var(iLookBVAR%basin__AquiferStorage)%dat(1) = 1._dp
+    bvarStruct%gru(iGRU)%var(iLookBVAR%basin__AquiferStorage)%dat(1) = 1._rkind
     do iHRU=1,gru_struc(iGRU)%hruCount
-     progStruct%gru(iGRU)%hru(iHRU)%var(iLookPROG%scalarAquiferStorage)%dat(1) = 0._dp  ! set to zero to be clear that there is no local aquifer storage in this configuration
+     progStruct%gru(iGRU)%hru(iHRU)%var(iLookPROG%scalarAquiferStorage)%dat(1) = 0._rkind  ! set to zero to be clear that there is no local aquifer storage in this configuration
     end do
 
    ! error check

build/source/driver/summa_init.f90

@@ -191,7 +191,7 @@ subroutine summa_paramSetup(summa1_struc, err, message)
  ! *****************************************************************************
 
  ! define monthly fraction of green vegetation
- greenVegFrac_monthly = (/0.01_dp, 0.02_dp, 0.03_dp, 0.07_dp, 0.50_dp, 0.90_dp, 0.95_dp, 0.96_dp, 0.65_dp, 0.24_dp, 0.11_dp, 0.02_dp/)
+ greenVegFrac_monthly = (/0.01_rkind, 0.02_rkind, 0.03_rkind, 0.07_rkind, 0.50_rkind, 0.90_rkind, 0.95_rkind, 0.96_rkind, 0.65_rkind, 0.24_rkind, 0.11_rkind, 0.02_rkind/)
 
  ! read Noah soil and vegetation tables
  call soil_veg_gen_parm(trim(SETTINGS_PATH)//trim(VEGPARM),                            & ! filename for vegetation table
@@ -298,7 +298,7 @@ subroutine summa_paramSetup(summa1_struc, err, message)
 
   ! compute total area of the upstream HRUS that flow into each HRU
   do iHRU=1,gru_struc(iGRU)%hruCount
-   upArea%gru(iGRU)%hru(iHRU) = 0._dp
+   upArea%gru(iGRU)%hru(iHRU) = 0._rkind
    do jHRU=1,gru_struc(iGRU)%hruCount
     ! check if jHRU flows into iHRU; assume no exchange between GRUs
     if(typeStruct%gru(iGRU)%hru(jHRU)%var(iLookTYPE%downHRUindex)==typeStruct%gru(iGRU)%hru(iHRU)%var(iLookID%hruId))then
@@ -309,7 +309,7 @@ subroutine summa_paramSetup(summa1_struc, err, message)
 
   ! identify the total basin area for a GRU (m2)
   associate(totalArea => bvarStruct%gru(iGRU)%var(iLookBVAR%basin__totalArea)%dat(1) )
-  totalArea = 0._dp
+  totalArea = 0._rkind
   do iHRU=1,gru_struc(iGRU)%hruCount
    totalArea = totalArea + attrStruct%gru(iGRU)%hru(iHRU)%var(iLookATTR%HRUarea)
   end do