Minor changes to compile code with gcc-5

Author: Gautam Bisht

src/betr/betr_main/BetrBGCMod.F90

@@ -1247,8 +1247,9 @@ subroutine do_tracer_gw_diffusion(bounds, lbj, ubj, jtops, num_soilc, filter_soi
                                 diff_surf(c,k) * dtime_loc(c)
                         endif
                      else
-                        write(msg,*) 'mass bal error dif '//trim(tracernames(trcid))//new_line('A'), 'mass 0/1',mass0, mass1,'col=',c, &
-                               new_line('A')//'err=', err_tracer(c,k), 'dmass=',dmass(c,k), ' dif=', diff_surf(c,k)*dtime_loc(c), &
+                        write(msg,*) 'mass bal error dif '//trim(tracernames(trcid))//new_line('A'), 'mass 0/1',mass0, &
+                             mass1,'col=',c, &
+                             new_line('A')//'err=', err_tracer(c,k), 'dmass=',dmass(c,k), ' dif=', diff_surf(c,k)*dtime_loc(c), &
                              ' prod=',dot_sum(x=local_source(c,jtops(c):ubj,k),y=dz(c,jtops(c):ubj),bstatus=bstatus)*dtime_loc(c)
 
                         if(bstatus%check_status())return

src/driver/shared/BeTRSimulation.F90

@@ -275,15 +275,16 @@ subroutine BeTRInit(this, bounds, lun, col, pft, waterstate, namelist_buffer, ba
     endif
     call this%betr_time%Init(namelist_buffer)
     !allocate memory
-    allocate(this%betr(bounds%begc:bounds%endc), source=create_betr_type())
-    allocate(this%biophys_forc(bounds%begc:bounds%endc), source=create_betr_biogeophys_input())
-    allocate(this%biogeo_flux(bounds%begc:bounds%endc), source=create_betr_biogeoFlux())
-    allocate(this%biogeo_state(bounds%begc:bounds%endc), source=create_betr_biogeo_state())
-    allocate(this%bstatus(bounds%begc:bounds%endc), source=create_betr_status_type())
-    allocate(this%betr_col(bounds%begc:bounds%endc), source=create_betr_column_type())
-    allocate(this%betr_pft(bounds%begc:bounds%endc), source=create_betr_patch_type())
+    allocate(this%betr(bounds%begc:bounds%endc))
+    allocate(this%biophys_forc(bounds%begc:bounds%endc))
+    allocate(this%biogeo_flux(bounds%begc:bounds%endc))
+    allocate(this%biogeo_state(bounds%begc:bounds%endc))
+    allocate(this%bstatus(bounds%begc:bounds%endc))
+    allocate(this%betr_col(bounds%begc:bounds%endc))
+    allocate(this%betr_pft(bounds%begc:bounds%endc))
     allocate(this%active_col(bounds%begc:bounds%endc))
-    allocate(this%bsimstatus, source = create_betr_status_sim_type())
+    allocate(this%bsimstatus)
+
     call this%bsimstatus%reset()
 
     !grid horizontal bounds
@@ -1055,14 +1056,15 @@ subroutine BeTRSimulationPreDiagSoilColWaterFlux(this, num_nolakec, filter_nolak
   end subroutine BeTRSimulationPreDiagSoilColWaterFlux
 
   !------------------------------------------------------------------------
-  subroutine BeTRSimulationDiagnoseDtracerFreezeThaw(this, bounds, num_nolakec, filter_nolakec, col)
+  subroutine BeTRSimulationDiagnoseDtracerFreezeThaw(this, bounds, num_nolakec, filter_nolakec, col, lun)
   !
   ! DESCRIPTION
   ! aqueous tracer partition based on freeze-thaw
   !
   ! USES
   use ColumnType            , only : column_type
   use WaterStateType        , only : waterstate_type
+  use LandunitType          , only : landunit_type
   implicit none
   !
   ! Arguments
@@ -1072,6 +1074,7 @@ subroutine BeTRSimulationDiagnoseDtracerFreezeThaw(this, bounds, num_nolakec, fi
   integer               , intent(in) :: filter_nolakec(:)                  ! column filter for non-lake points
 !  type(waterstate_type), intent(in) :: waterstate_vars
   type(column_type)     , intent(in) :: col                                ! column type
+  type(landunit_type)   , intent(in)  :: lun
 
   !temporary variables
   type(betr_bounds_type)     :: betr_bounds