Skip to content

Commit

Permalink
Split lines longer than 132 characters
Browse files Browse the repository at this point in the history
Checked with code-format-checker/CodeFormatChecker.py -t rc -l 133

(Note the off-by-one error in that script, hence the need for 133 rather
than 132.)

Fixes ESCOMP#464
  • Loading branch information
billsacks committed Aug 3, 2018
1 parent 9fecae7 commit fcf1e5c
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 8 deletions.
5 changes: 3 additions & 2 deletions src/biogeophys/CanopyFluxesMod.F90
Original file line number Diff line number Diff line change
Expand Up @@ -855,8 +855,9 @@ subroutine CanopyFluxes(bounds, num_exposedvegp, filter_exposedvegp,
svpts(begp:endp), eah(begp:endp), o2(begp:endp), co2(begp:endp), rb(begp:endp), bsun(begp:endp), &
bsha(begp:endp), btran(begp:endp), dayl_factor(begp:endp), leafn_patch(begp:endp), &
qsatl(begp:endp), qaf(begp:endp), &
atm2lnd_inst, temperature_inst, soilstate_inst, waterdiagnosticbulk_inst, surfalb_inst, solarabs_inst, &
canopystate_inst, ozone_inst, photosyns_inst, waterfluxbulk_inst, froot_carbon(begp:endp), croot_carbon(begp:endp))
atm2lnd_inst, temperature_inst, soilstate_inst, waterdiagnosticbulk_inst, surfalb_inst, solarabs_inst, &
canopystate_inst, ozone_inst, photosyns_inst, waterfluxbulk_inst, &
froot_carbon(begp:endp), croot_carbon(begp:endp))
else
call Photosynthesis (bounds, fn, filterp, &
svpts(begp:endp), eah(begp:endp), o2(begp:endp), co2(begp:endp), rb(begp:endp), btran(begp:endp), &
Expand Down
3 changes: 2 additions & 1 deletion src/biogeophys/CanopyTemperatureMod.F90
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,8 @@ subroutine CanopyTemperature(bounds, &
end do

! calculate moisture stress/resistance for soil evaporation
call calc_soilevap_resis(bounds, num_nolakec, filter_nolakec, soilstate_inst, waterstatebulk_inst, waterdiagnosticbulk_inst, temperature_inst)
call calc_soilevap_resis(bounds, num_nolakec, filter_nolakec, &
soilstate_inst, waterstatebulk_inst, waterdiagnosticbulk_inst, temperature_inst)

do fc = 1,num_nolakec
c = filter_nolakec(fc)
Expand Down
9 changes: 6 additions & 3 deletions src/biogeophys/HydrologyNoDrainageMod.F90
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,9 @@ subroutine HydrologyNoDrainage(bounds, &
call Compute_EffecRootFrac_And_VertTranSink(bounds, num_hydrologyc, &
filter_hydrologyc, soilstate_inst, canopystate_inst, waterfluxbulk_inst, energyflux_inst)

if ( use_fates ) call clm_fates%ComputeRootSoilFlux(bounds, num_hydrologyc, filter_hydrologyc, soilstate_inst, waterfluxbulk_inst)
if ( use_fates ) then
call clm_fates%ComputeRootSoilFlux(bounds, num_hydrologyc, filter_hydrologyc, soilstate_inst, waterfluxbulk_inst)
end if

call SoilWater(bounds, num_hydrologyc, filter_hydrologyc, num_urbanc, filter_urbanc, &
soilhydrology_inst, soilstate_inst, waterfluxbulk_inst, waterstatebulk_inst, temperature_inst, &
Expand All @@ -235,9 +237,10 @@ subroutine HydrologyNoDrainage(bounds, &
soilhydrology_inst, waterstatebulk_inst)
end if

if (use_aquifer_layer()) then
if (use_aquifer_layer()) then
call WaterTable(bounds, num_hydrologyc, filter_hydrologyc, num_urbanc, filter_urbanc, &
soilhydrology_inst, soilstate_inst, temperature_inst, waterstatebulk_inst, waterdiagnosticbulk_inst, waterfluxbulk_inst)
soilhydrology_inst, soilstate_inst, temperature_inst, waterstatebulk_inst, &
waterdiagnosticbulk_inst, waterfluxbulk_inst)
else

call PerchedWaterTable(bounds, num_hydrologyc, filter_hydrologyc, &
Expand Down
3 changes: 2 additions & 1 deletion src/biogeophys/WaterFluxType.F90
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,8 @@ subroutine InitHistory(this, bounds)
fname=this%info%fname('QRGWL'), &
units='mm/s', &
avgflag='A', &
long_name=this%info%lname('surface runoff at glaciers (liquid only), wetlands, lakes; also includes melted ice runoff from QSNWCPICE'), &
long_name=this%info%lname( &
'surface runoff at glaciers (liquid only), wetlands, lakes; also includes melted ice runoff from QSNWCPICE'), &
ptr_col=this%qflx_qrgwl_col, c2l_scale_type='urbanf')

this%qflx_drain_col(begc:endc) = spval
Expand Down
3 changes: 2 additions & 1 deletion src/utils/clmfates_interfaceMod.F90
Original file line number Diff line number Diff line change
Expand Up @@ -1124,7 +1124,8 @@ end subroutine restart

!=====================================================================================

subroutine init_coldstart(this, waterstatebulk_inst, waterdiagnosticbulk_inst, canopystate_inst, soilstate_inst, frictionvel_inst)
subroutine init_coldstart(this, waterstatebulk_inst, waterdiagnosticbulk_inst, &
canopystate_inst, soilstate_inst, frictionvel_inst)


! Arguments
Expand Down

0 comments on commit fcf1e5c

Please sign in to comment.