Skip to content

Commit 6deed0a

Browse files
authored
fix: Fixes for linter action and code style (#869)
1 parent f19c926 commit 6deed0a

File tree

145 files changed

+3511
-2033
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

145 files changed

+3511
-2033
lines changed

.github/workflows/am4_regression_parallelWorks_intel_tag.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: Tag CI libFMS with AM4 regression
2-
2+
33
on:
44
push:
55
tags:
@@ -14,7 +14,7 @@ jobs:
1414
max-parallel: 3
1515
matrix:
1616
include:
17-
# Runs AM4 with intel18 on AM4_intel18
17+
# Runs AM4 with intel18 on AM4_intel18
1818
# - runname: AM4 build and run with intel 18
1919
# runscript: python3 /home/Thomas.Robinson/pw/storage/pw_api_python/AM4_intel18StartClusters.py am4_intel18
2020
# Runs AM4 using a container to build and run the model with intel 21

.github/workflows/build_cmake_gnu.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on: [push, pull_request]
44

55
jobs:
66
build:
7-
runs-on: ubuntu-latest
7+
runs-on: ubuntu-latest
88
strategy:
99
matrix:
1010
omp-flags: [ -DOPENMP=on, -DOPENMP=off ]
@@ -16,7 +16,7 @@ jobs:
1616
steps:
1717
- name: Checkout code
1818
uses: actions/checkout@v2
19-
- name: Generate makefiles with CMake
19+
- name: Generate makefiles with CMake
2020
run: cmake $CMAKE_FLAGS .
2121
- name: Build the library
2222
run: make

.github/workflows/lint_fms.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ jobs:
99
- name: Checkout code
1010
uses: actions/checkout@v2
1111
- name: Run Lint
12-
uses: NOAA-GFDL/simple_lint@v2
12+
uses: NOAA-GFDL/simple_lint@v3

.github/workflows/parallelWorks_intel_pr.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: Pull Request CI libFMS with intel18 and intel21
2-
2+
33
on: [pull_request,workflow_dispatch]
44
jobs:
55
parallelWorks:
@@ -9,7 +9,7 @@ jobs:
99
max-parallel: 2
1010
matrix:
1111
include:
12-
# Turn this back on when fixed
12+
# Turn this back on when fixed
1313
- runname: FMS with intel 18
1414
runscript: python3 /home/Thomas.Robinson/pw/storage/pw_api_python/PRFMSintel18StartClusters.py $GITHUB_REF
1515
# Runs on FMS_CONTAINER_CI cluster

.github/workflows/update_docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
steps:
1010
- name: Checkout code
1111
uses: actions/checkout@v2
12-
- name: Setup repo
12+
- name: Setup repo
1313
run: | # do autotool's job for substitutes since we don't need a full build environement
1414
mkdir gen_docs
1515
sed 's/@abs_top_builddir@\/docs/gen_docs/' docs/Doxyfile.in > gen_docs/Doxyfile

Makefile.am

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,9 @@ AM_FCFLAGS = $(FC_MODINC). $(FC_MODOUT)$(MODDIR)
8383
noinst_LTLIBRARIES = libFMS_mod.la
8484
libFMS_mod_la_SOURCES = libFMS.F90
8585

86-
fms.$(FC_MODEXT): .mods/*_mod.$(FC_MODEXT)
86+
fms.$(FC_MODEXT): .mods/*_mod.$(FC_MODEXT)
8787

88-
nodist_include_HEADERS = libFMS_mod.la
88+
nodist_include_HEADERS = libFMS_mod.la
8989

9090
include $(top_srcdir)/mkmods.mk
9191

amip_interp/amip_interp.F90

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@
2828
!!
2929
!! 1. AMIP @link http://www-pcmdi.llnl.gov/amip @endlink from Jan 1979 to Jan 1989 (2 deg x 2 deg)
3030
!! 2. Reynolds OI @link amip_interp.rey_oi.txt @endlink from Nov 1981 to Jan 1999 (1 deg x 1 deg)
31-
!! 3. Reynolds EOF @link ftp://podaac.jpl.nasa.gov/pub/sea_surface_temperature/reynolds/rsst/doc/rsst.html @endlink from Jan 1950 to Dec 1998 (2 deg x 2 deg)
31+
!! 3. Reynolds EOF @link ftp://podaac.jpl.nasa.gov/pub/sea_surface_temperature/reynolds/rsst/doc/rsst.html
32+
!! @endlink from Jan 1950 to Dec 1998 (2 deg x 2 deg)
3233
!!
3334
!! All original data are observed monthly means. This module
3435
!! interpolates linearly in time between pairs of monthly means.
@@ -500,7 +501,8 @@ subroutine get_amip_sst (Time, Interp, sst, err_msg, lon_model, lat_model)
500501
if (DEBUG) then
501502
call get_date(Amip_Time,jhctod(1),jhctod(2),jhctod(3),jhctod(4),jhctod(5),jhctod(6))
502503
if (mpp_pe() == 0) then
503-
write (*,200) 'JHC: use_daily = F, AMIP_Time: ',jhctod(1),jhctod(2),jhctod(3),jhctod(4),jhctod(5),jhctod(6)
504+
write (*,200) 'JHC: use_daily = F, AMIP_Time: ',jhctod(1),jhctod(2),jhctod(3),jhctod(4),jhctod(5), &
505+
& jhctod(6)
504506
write (*,300) 'JHC: use_daily = F, interped SST: ', sst(1,1),sst(5,5),sst(10,10)
505507
endif
506508
endif
@@ -511,7 +513,8 @@ subroutine get_amip_sst (Time, Interp, sst, err_msg, lon_model, lat_model)
511513
! add by JHC
512514
else
513515
call get_date(Amip_Time,jhctod(1),jhctod(2),jhctod(3),jhctod(4),jhctod(5),jhctod(6))
514-
if (mpp_pe() == mpp_root_pe()) write(*,200) 'amip_interp_mod: use_daily = T, Amip_Time = ',jhctod(1),jhctod(2),jhctod(3),jhctod(4),jhctod(5),jhctod(6)
516+
if (mpp_pe() == mpp_root_pe()) write(*,200) 'amip_interp_mod: use_daily = T, Amip_Time = ',jhctod(1), &
517+
& jhctod(2),jhctod(3),jhctod(4),jhctod(5),jhctod(6)
515518

516519
yr = jhctod(1); mo = jhctod(2); dy = jhctod(3)
517520

astronomy/astronomy.F90

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,8 @@ module astronomy_mod
129129
!! @param [in] <time> Time at which astronomical values are desired (time_type variable) [seconds, days]
130130
!! @param [out] <cosz> Cosine of solar zenith angle, set to zero when entire period is in darkness [dimensionless]
131131
!! @param [out] <fracday> Daylight fraction of time interval [dimensionless]
132-
!! @param [out] <rrsun> Earth-Sun distance (r) relative to semi-major axis of orbital ellipse (a):(a/r)**2 [dimensionless]
132+
!! @param [out] <rrsun> Earth-Sun distance (r) relative to semi-major axis of orbital ellipse
133+
!! (a):(a/r)**2 [dimensionless]
133134
!! @param [in] <dt> OPTIONAL: Time interval after gmt over which the astronomical variables are to be
134135
!! averaged. this produces averaged output rather than instantaneous. [radians], (1 day = 2 * pi)
135136
!! @param [in] <dt_time> OPTIONAL: Time interval after gmt over which the astronomical variables are to be
@@ -190,8 +191,10 @@ module astronomy_mod
190191
!! @param [in] <time> Time at which astronomical values are desired (time_type variable) [seconds, days]
191192
!! @param [out] <cosz> Cosine of solar zenith angle, set to zero when entire period is in darkness [dimensionless]
192193
!! @param [out] <fracday> Daylight fraction of time interval [dimensionless]
193-
!! @param [out] <rrsun> Earth-Sun distance (r) relative to semi-major axis of orbital ellipse (a):(a/r)**2 [dimensionless]
194-
!! @param [out] <solar> shortwave flux factor: cosine of zenith angle * daylight fraction / (earth-sun distance squared) [dimensionless]
194+
!! @param [out] <rrsun> Earth-Sun distance (r) relative to semi-major axis of orbital ellipse
195+
!! (a):(a/r)**2 [dimensionless]
196+
!! @param [out] <solar> shortwave flux factor: cosine of zenith angle * daylight fraction /
197+
!! (earth-sun distance squared) [dimensionless]
195198
!> @ingroup astronomy_mod
196199
interface daily_mean_solar
197200
module procedure daily_mean_solar_2d
@@ -1480,7 +1483,8 @@ end subroutine daily_mean_solar_1d
14801483
!! @param [in] <lat> Latitudes of model grid points
14811484
!! @param [in] <time_since_ae> Time of year; autumnal equinox = 0.0, one year = 2 * pi
14821485
!! @param [out] <cosz> Cosine of solar zenith angle
1483-
!! @param [out] <solar> Shortwave flux factor: cosine of zenith angle * daylight fraction / (earth-sun distance squared)
1486+
!! @param [out] <solar> Shortwave flux factor: cosine of zenith angle * daylight fraction /
1487+
!! (earth-sun distance squared)
14841488
subroutine daily_mean_solar_2level (lat, time_since_ae, cosz, solar)
14851489

14861490
!----------------------------------------------------------------------
@@ -1649,7 +1653,8 @@ end subroutine daily_mean_solar_cal_1d
16491653
!! @param [in] <lat> Latitudes of model grid points
16501654
!! @param [in] <time> Time of year (time_type)
16511655
!! @param [out] <cosz> Cosine of solar zenith angle
1652-
!! @param [out] <solar> Shortwave flux factor: cosine of zenith angle * daylight fraction / (earth-sun distance squared)
1656+
!! @param [out] <solar> Shortwave flux factor: cosine of zenith angle * daylight fraction /
1657+
!! (earth-sun distance squared)
16531658
subroutine daily_mean_solar_cal_2level (lat, time, cosz, solar)
16541659

16551660
real, dimension(:), intent(in) :: lat
@@ -1735,7 +1740,8 @@ end subroutine daily_mean_solar_cal_0d
17351740
!! @param [in] <jnd> Ending index of latitude window
17361741
!! @param [in] <lat> Latitudes of model grid points
17371742
!! @param [out] <cosz> Cosine of solar zenith angle
1738-
!! @param [out] <solar> Shortwave flux factor: cosine of zenith angle * daylight fraction / (earth-sun distance squared)
1743+
!! @param [out] <solar> Shortwave flux factor: cosine of zenith angle * daylight fraction /
1744+
!! (earth-sun distance squared)
17391745
!! @param [out] <fracday> Daylight fraction of time interval
17401746
!! @param [out] <rrsun> Earth-Sun distance (r) relative to semi-major axis of orbital ellipse (a):(a/r)**2
17411747
subroutine annual_mean_solar_2d (js, je, lat, cosz, solar, fracday, &
@@ -1842,7 +1848,8 @@ end subroutine annual_mean_solar_2d
18421848
!! @param [in] <jnd> Ending index of latitude window
18431849
!! @param [in] <lat> Latitudes of model grid points
18441850
!! @param [out] <cosz> Cosine of solar zenith angle
1845-
!! @param [out] <solar> Shortwave flux factor: cosine of zenith angle * daylight fraction / (earth-sun distance squared)
1851+
!! @param [out] <solar> Shortwave flux factor: cosine of zenith angle * daylight fraction /
1852+
!! (earth-sun distance squared)
18461853
!! @param [out] <fracday> Daylight fraction of time interval
18471854
!! @param [out] <rrsun_out> Earth-Sun distance (r) relative to semi-major axis of orbital ellipse (a):(a/r)**2
18481855
subroutine annual_mean_solar_1d (jst, jnd, lat, cosz, solar, &
@@ -2141,7 +2148,7 @@ function half_day_2d (latitude, dec) result(h)
21412148
!---------------------------------------------------------------------
21422149
real, dimension (size(latitude,1),size(latitude,2)):: &
21432150
cos_half_day, & !< Cosine of half-day length [dimensionless]
2144-
lat !< Model latitude, adjusted so that it is never 0.5*pi or -0.5*pi
2151+
lat !< Model latitude, adjusted so that it is never 0.5*pi or -0.5*pi
21452152
real :: tan_dec !< tangent of solar declination [dimensionless]
21462153
real :: eps = 1.0E-05 !< small increment
21472154

axis_utils/axis_utils.F90

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -415,8 +415,8 @@ function frac_index (value, array)
415415
do i=2,ia
416416
if (array(i) < array(i-1)) then
417417
unit = stdout()
418-
write (unit,*) '=> Error: "frac_index" array must be monotonically increasing when searching for nearest value to ',&
419-
value
418+
write (unit,*) &
419+
'=> Error: "frac_index" array must be monotonically increasing when searching for nearest value to ', value
420420
write (unit,*) ' array(i) < array(i-1) for i=',i
421421
write (unit,*) ' array(i) for i=1..ia follows:'
422422
do ii=1,ia

axis_utils/axis_utils2.F90

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -442,8 +442,8 @@ function frac_index (value, array)
442442
do i=2,ia
443443
if (array(i) < array(i-1)) then
444444
unit = stdout()
445-
write (unit,*) '=> Error: "frac_index" array must be monotonically increasing when searching for nearest value to ',&
446-
value
445+
write (unit,*) &
446+
'=> Error: "frac_index" array must be monotonically increasing when searching for nearest value to ', value
447447
write (unit,*) ' array(i) < array(i-1) for i=',i
448448
write (unit,*) ' array(i) for i=1..ia follows:'
449449
do ii=1,ia

0 commit comments

Comments
 (0)