Skip to content

Commit d1b392d

Browse files
committed
Remove un-necessary white space
Removed all trailing whitespace from F90 files
1 parent fd5ae75 commit d1b392d

13 files changed

+141
-147
lines changed

src/cvmix_driver.F90

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Program cvmix_driver
2424
!EOP
2525
!BOC
2626
integer :: nlev, max_nlev
27-
real(kind=cvmix_r8) :: ocn_depth
27+
real(kind=cvmix_r8) :: ocn_depth
2828
character(len=cvmix_strlen) :: mix_type
2929

3030
namelist/cvmix_nml/mix_type, nlev, max_nlev, ocn_depth

src/cvmix_io.F90

Lines changed: 22 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ module cvmix_io
55
! !MODULE: cvmix_io
66
!
77
! !DESCRIPTION:
8-
! This module contains routines to read CVmix variables from data files or
8+
! This module contains routines to read CVmix variables from data files or
99
! output CVmix variables to data files. Currently only ascii and netCDF output
1010
! are supported, as well as netCDF input, but the plan is to also include plain
1111
! binary input / output as well.
@@ -102,7 +102,7 @@ subroutine cvmix_io_open(file_id, file_name, file_format, read_only)
102102
!\\
103103
104104
! !USES:
105-
! Only those used by entire module.
105+
! Only those used by entire module.
106106

107107
! !INPUT PARAMETERS:
108108
character(len=*), intent(in) :: file_name, file_format
@@ -139,8 +139,8 @@ subroutine cvmix_io_open(file_id, file_name, file_format, read_only)
139139
file_index => file_index%next
140140
end do
141141
allocate(file_index%next)
142-
file_index%next%file_id = file_id
143-
file_index%next%prev => file_index
142+
file_index%next%file_id = file_id
143+
file_index%next%prev => file_index
144144
nullify(file_index%next%next)
145145
file_index => file_index%next
146146
end if
@@ -200,7 +200,7 @@ subroutine cvmix_input_read_1d_double(file_id, var_name, local_copy)
200200
!\\
201201
202202
! !USES:
203-
! Only those used by entire module.
203+
! Only those used by entire module.
204204

205205
! !INPUT PARAMETERS:
206206
integer, intent(in) :: file_id
@@ -242,7 +242,6 @@ subroutine cvmix_input_read_1d_double(file_id, var_name, local_copy)
242242
end if
243243
end if
244244

245-
246245
if (.not.lerr_in_read) then
247246
call netcdf_check(nf90_inquire_variable(file_id, varid, dimids=dims))
248247
dims1 = dims(1)
@@ -290,7 +289,7 @@ subroutine cvmix_input_read_2d_integer(file_id, var_name, local_copy)
290289
!\\
291290
292291
! !USES:
293-
! Only those used by entire module.
292+
! Only those used by entire module.
294293

295294
! !INPUT PARAMETERS:
296295
integer, intent(in) :: file_id
@@ -331,7 +330,6 @@ subroutine cvmix_input_read_2d_integer(file_id, var_name, local_copy)
331330
end if
332331
end if
333332

334-
335333
if (.not.lerr_in_read) then
336334
call netcdf_check(nf90_inquire_variable(file_id, varid, dimids=dims1))
337335
do i=1,2
@@ -381,7 +379,7 @@ subroutine cvmix_input_read_2d_double(file_id, var_name, local_copy)
381379
!\\
382380
383381
! !USES:
384-
! Only those used by entire module.
382+
! Only those used by entire module.
385383

386384
! !INPUT PARAMETERS:
387385
integer, intent(in) :: file_id
@@ -422,7 +420,6 @@ subroutine cvmix_input_read_2d_double(file_id, var_name, local_copy)
422420
end if
423421
end if
424422

425-
426423
if (.not.lerr_in_read) then
427424
call netcdf_check(nf90_inquire_variable(file_id, varid, dimids=dims1))
428425
do i=1,2
@@ -472,7 +469,7 @@ subroutine cvmix_input_read_3d_double(file_id, var_name, local_copy)
472469
!\\
473470
474471
! !USES:
475-
! Only those used by entire module.
472+
! Only those used by entire module.
476473

477474
! !INPUT PARAMETERS:
478475
integer, intent(in) :: file_id
@@ -513,7 +510,6 @@ subroutine cvmix_input_read_3d_double(file_id, var_name, local_copy)
513510
end if
514511
end if
515512

516-
517513
if (.not.lerr_in_read) then
518514
call netcdf_check(nf90_inquire_variable(file_id, varid, dimids=dims1))
519515
do i=1,3
@@ -564,7 +560,7 @@ subroutine cvmix_output_write_single_col(file_id, CVmix_vars, var_names, &
564560
!\\
565561
566562
! !USES:
567-
! Only those used by entire module.
563+
! Only those used by entire module.
568564

569565
! !INPUT PARAMETERS:
570566
integer, intent(in) :: file_id
@@ -795,7 +791,7 @@ subroutine cvmix_output_write_multi_col(file_id, CVmix_vars, var_names)
795791
!\\
796792
797793
! !USES:
798-
! Only those used by entire module.
794+
! Only those used by entire module.
799795

800796
! !INPUT PARAMETERS:
801797
integer, intent(in) :: file_id
@@ -990,7 +986,7 @@ subroutine cvmix_output_write_2d_double(file_id, var_name, dim_names, &
990986
!\\
991987
992988
! !USES:
993-
! Only those used by entire module.
989+
! Only those used by entire module.
994990

995991
! !INPUT PARAMETERS:
996992
integer, intent(in) :: file_id
@@ -1034,7 +1030,7 @@ subroutine cvmix_output_write_2d_double(file_id, var_name, dim_names, &
10341030
write(file_id, "(E24.17E2)",advance='no') field(i,j)
10351031
if (j.ne.dims(2)) write(file_id, "(1X)", advance='no')
10361032
end do
1037-
write(file_id, *)
1033+
write(file_id, *)
10381034
end do
10391035
case DEFAULT
10401036
print*, "ERROR: cvmix_output_write_2d_double only writes to netcdf"
@@ -1065,7 +1061,7 @@ subroutine cvmix_output_write_3d_double(file_id, var_name, dim_names, &
10651061
!\\
10661062
10671063
! !USES:
1068-
! Only those used by entire module.
1064+
! Only those used by entire module.
10691065

10701066
! !INPUT PARAMETERS:
10711067
integer, intent(in) :: file_id
@@ -1133,7 +1129,7 @@ subroutine cvmix_output_write_att_integer(file_id, att_name, att_val, &
11331129
!\\
11341130
11351131
! !USES:
1136-
! Only those used by entire module.
1132+
! Only those used by entire module.
11371133

11381134
! !INPUT PARAMETERS:
11391135
integer, intent(in) :: file_id
@@ -1198,7 +1194,7 @@ subroutine cvmix_output_write_att_real(file_id, att_name, att_val, var_name)
11981194
!\\
11991195
12001196
! !USES:
1201-
! Only those used by entire module.
1197+
! Only those used by entire module.
12021198

12031199
! !INPUT PARAMETERS:
12041200
integer, intent(in) :: file_id
@@ -1263,7 +1259,7 @@ subroutine cvmix_output_write_att_string(file_id, att_name, att_val, var_name)
12631259
!\\
12641260
12651261
! !USES:
1266-
! Only those used by entire module.
1262+
! Only those used by entire module.
12671263

12681264
! !INPUT PARAMETERS:
12691265
integer, intent(in) :: file_id
@@ -1327,7 +1323,7 @@ subroutine cvmix_io_close(file_id)
13271323
!\\
13281324
13291325
! !USES:
1330-
! Only those used by entire module.
1326+
! Only those used by entire module.
13311327

13321328
! !INPUT PARAMETERS:
13331329
integer, intent(in) :: file_id
@@ -1417,7 +1413,7 @@ subroutine cvmix_io_close_all
14171413
!\\
14181414
14191415
! !USES:
1420-
! Only those used by entire module.
1416+
! Only those used by entire module.
14211417

14221418
! !LOCAL VARIABLES:
14231419
integer :: fid
@@ -1449,7 +1445,7 @@ function get_file_name(file_id)
14491445
!\\
14501446
14511447
! !USES:
1452-
! Only those used by entire module.
1448+
! Only those used by entire module.
14531449

14541450
! !INPUT PARAMETERS:
14551451
integer, intent(in) :: file_id
@@ -1493,7 +1489,7 @@ function get_file_type(file_id)
14931489
!\\
14941490
14951491
! !USES:
1496-
! Only those used by entire module.
1492+
! Only those used by entire module.
14971493

14981494
! !INPUT PARAMETERS:
14991495
integer, intent(in) :: file_id
@@ -1538,7 +1534,7 @@ function cvmix_input_get_netcdf_dim(file_id, dim_name)
15381534
!\\
15391535
15401536
! !USES:
1541-
! Only those used by entire module.
1537+
! Only those used by entire module.
15421538

15431539
! !INPUT PARAMETERS:
15441540
integer, intent(in) :: file_id
@@ -1595,7 +1591,7 @@ function get_netcdf_varid(file_id, var_name, xtype, ndims)
15951591
!\\
15961592
15971593
! !USES:
1598-
! Only those used by entire module.
1594+
! Only those used by entire module.
15991595

16001596
! !INPUT PARAMETERS:
16011597
integer, intent(in) :: file_id

src/drivers/cvmix_bgrnd_BL.F90

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,14 +83,14 @@ Subroutine cvmix_BL_driver(nlev, max_nlev, ocn_depth)
8383
! depth (also allocate memory for diffusivity and viscosity)
8484
allocate(iface_depth(max_nlev+1))
8585
iface_depth(1) = cvmix_zero
86-
86+
8787
! Depth is 0 at sea level and negative at ocean bottom in CVMix
8888
do kw = 2,max_nlev+1
8989
iface_depth(kw) = iface_depth(kw-1) - ocn_depth/real(nlev,cvmix_r8)
9090
end do
9191

9292
! Allocate memory to store viscosity and diffusivity values (for pointer)
93-
allocate(Mdiff(ncol,max_nlev+1), Tdiff(ncol,max_nlev+1))
93+
allocate(Mdiff(ncol,max_nlev+1), Tdiff(ncol,max_nlev+1))
9494

9595
! Initialization for CVMix data types
9696
call cvmix_put(CVmix_params, 'max_nlev', max_nlev)
@@ -142,7 +142,7 @@ Subroutine cvmix_BL_driver(nlev, max_nlev, ocn_depth)
142142
cvmix_get_bkgnd_real_2D('static_Tdiff'),(/nlev+1/))
143143
call cvmix_coeffs_bkgnd(CVmix_vars_memcopy(2), &
144144
CVmix_bkgnd_params_user=CVmix_BL_params)
145-
145+
146146
! Output
147147
#ifdef _NETCDF
148148
! data will have diffusivity from both columns (needed for NCL script)

src/drivers/cvmix_kpp_drv.F90

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -78,22 +78,22 @@ Subroutine cvmix_kpp_driver()
7878

7979
! Read namelists
8080

81-
! Defaults for test 1
81+
! Defaults for test 1
8282
ltest1 = .false.
8383
nlev1 = 4
8484
layer_thick1 = real(10, cvmix_r8)
8585
hmix1 = -real(15, cvmix_r8)
8686
ri_crit = 0.3_cvmix_r8
8787
interp_type_t1 = 'quadratic'
8888

89-
! Defaults for test 2
89+
! Defaults for test 2
9090
ltest2 = .false.
9191

92-
! Defaults for test 3
92+
! Defaults for test 3
9393
ltest3 = .false.
9494
nlev3 = 220
9595

96-
! Defaults for test 4
96+
! Defaults for test 4
9797
ltest4 = .false.
9898
OBL_levid4 = 3
9999
interp_type_t4 = 'quadratic'
@@ -133,7 +133,7 @@ Subroutine cvmix_kpp_driver()
133133
! layer thickness) is stored at cell centers and then interpolated
134134
! (user can specify linear, quadratic or cubic interpolant) between
135135
! cell centers. OBL_depth is set to depth where interpolated bulk
136-
! Richardson number = Ri_crit; level-center depth (zt) and bulk
136+
! Richardson number = Ri_crit; level-center depth (zt) and bulk
137137
! Richardson numbers are written out to test1.nc or test1.out
138138
if (ltest1) then
139139
print*, "Test 1: determining OBL depth"
@@ -338,7 +338,7 @@ Subroutine cvmix_kpp_driver()
338338
#endif
339339

340340
call cvmix_output_write(fid, CVmix_vars4, (/"zt ", "zw ", "Mdiff", &
341-
"Tdiff", "Sdiff"/))
341+
"Tdiff", "Sdiff"/))
342342
#ifdef _NETCDF
343343
call cvmix_output_write_att(fid, "interp_type2", interp_type_t4)
344344
call cvmix_output_write_att(fid, "OBL_depth", &
@@ -379,7 +379,7 @@ Subroutine cvmix_kpp_driver()
379379
#endif
380380

381381
call cvmix_output_write(fid, CVmix_vars4, (/"zt ", "zw ", "Mdiff", &
382-
"Tdiff", "Sdiff"/))
382+
"Tdiff", "Sdiff"/))
383383
#ifdef _NETCDF
384384
call cvmix_output_write_att(fid, "interp_type2", interp_type_t4)
385385
call cvmix_output_write_att(fid, "OBL_depth", &
@@ -462,7 +462,7 @@ Subroutine cvmix_kpp_driver()
462462
ws_cntr = w_s)
463463

464464
shear_sqr = cvmix_kpp_compute_unresolved_shear(zt, w_s, &
465-
Nsqr_iface = buoy_freq_iface**2)
465+
Nsqr_iface = buoy_freq_iface**2)
466466
! Note that Vt_shear_sqr is the fourth argument in compute_bulk_Richardson
467467
! so it does not need to declared explicitly (even though it is optional)
468468
Ri_bulk2 = cvmix_kpp_compute_bulk_Richardson(zt, (buoyancy(1)-buoyancy), &
@@ -525,7 +525,7 @@ Subroutine cvmix_kpp_driver()
525525
print*, ""
526526
print*, "Test 6: 2 simple tests for velocity scale"
527527
print*, "----------"
528-
528+
529529
call cvmix_init_kpp(vonkarman=vonkarman6)
530530
sigma6 = 0.1_cvmix_r8
531531

@@ -567,7 +567,6 @@ Subroutine cvmix_kpp_driver()
567567
print*, "w_m = ", w_m6
568568
print*, "w_s = ", w_s6
569569
print*, ""
570-
571570

572571
end if ! ltest6
573572

src/drivers/cvmix_tidal_Simmons.F90

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ Subroutine cvmix_tidal_driver()
6767
namelist/Simmons_nml/grid_file, physics_file, energy_flux_file, &
6868
energy_flux_var, lon_out, lat_out
6969

70-
! Read namelist variables
70+
! Read namelist variables
7171
grid_file = "none"
7272
physics_file = "none"
7373
energy_flux_file = "none"
@@ -83,7 +83,7 @@ Subroutine cvmix_tidal_driver()
8383
nlat = -1
8484
max_nlev = -1
8585
call cvmix_io_open(fid, trim(grid_file), 'nc', read_only=.true.)
86-
#ifdef _NETCDF
86+
#ifdef _NETCDF
8787
nlon = cvmix_input_get_netcdf_dim(fid, 'lon')
8888
nlat = cvmix_input_get_netcdf_dim(fid, 'lat')
8989
max_nlev = cvmix_input_get_netcdf_dim(fid, 'nlev')

0 commit comments

Comments
 (0)