Skip to content

Commit c06ebdd

Browse files
Apply auto-formatting to all files using 2-space indenting. Remove trailing whitespace. (#808)
co-author @mvertens
1 parent 9ddee9c commit c06ebdd

File tree

204 files changed

+222906
-223182
lines changed

Some content is hidden

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

204 files changed

+222906
-223182
lines changed

.github/workflows/gnu.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ env:
1414

1515

1616
# Split into a steup step, and a WW3 build step which
17-
# builds multiple switches in a matrix. The setup is run once and
17+
# builds multiple switches in a matrix. The setup is run once and
1818
# the environment is cached so each build of WW3 can share the dependencies.
1919

2020
jobs:
@@ -25,7 +25,7 @@ jobs:
2525
- name: checkout-ww3
2626
if: steps.cache-env.outputs.cache-hit != 'true'
2727
uses: actions/checkout@v2
28-
with:
28+
with:
2929
path: ww3
3030
# Cache spack, OASIS, and compiler
3131
# No way to flush Action cache, so key may have # appended
@@ -77,7 +77,7 @@ jobs:
7777
steps:
7878
- name: checkout-ww3
7979
uses: actions/checkout@v2
80-
with:
80+
with:
8181
path: ww3
8282

8383
- name: cache-env
@@ -105,5 +105,3 @@ jobs:
105105
cmake .. -DSWITCH=${{ matrix.switch }}
106106
fi
107107
make -j2 VERBOSE=1
108-
109-

.github/workflows/intel.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ env:
2222
I_MPI_F90: ifort
2323

2424
# Split into a dependency build step, and a WW3 build step which
25-
# builds multiple switches in a matrix. The setup is run once and
25+
# builds multiple switches in a matrix. The setup is run once and
2626
# the environment is cached so each build of WW3 can share the dependencies.
2727

2828
jobs:
@@ -34,7 +34,7 @@ jobs:
3434
- name: checkout-ww3
3535
if: steps.cache-env.outputs.cache-hit != 'true'
3636
uses: actions/checkout@v2
37-
with:
37+
with:
3838
path: ww3
3939

4040
# Cache spack, OASIS, and compiler
@@ -98,7 +98,7 @@ jobs:
9898
steps:
9999
- name: checkout-ww3
100100
uses: actions/checkout@v2
101-
with:
101+
with:
102102
path: ww3
103103

104104
- name: install-intel
@@ -131,5 +131,3 @@ jobs:
131131
cmake .. -DSWITCH=${{ matrix.switch }}
132132
fi
133133
make -j2 VERBOSE=1
134-
135-

cmake/FindMETIS.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ find_package_handle_standard_args(
1414
${CMAKE_FIND_PACKAGE_NAME}
1515
REQUIRED_VARS metis_lib
1616
metis_inc)
17-
17+
1818
message(STATUS "Found METIS: ${metis_lib}")

model/bin/ad3.tmpl

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
compress=0 # source code compression par in w3adc
9090
# if not 0, documentaion removed from .f90 file
9191

92-
# 1.d Get data from setup file - - - - - - - - - - - - - - - - - - - - - - - -
92+
# 1.d Get data from setup file - - - - - - - - - - - - - - - - - - - - - - - -
9393

9494
source $(dirname $0)/w3_setenv
9595
main_dir=$WWATCH3_DIR
@@ -201,14 +201,14 @@
201201
if [ "$w3adc" = 'yes' ]
202202
then
203203

204-
# 2.b Run CPP preprocessor - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
204+
# 2.b Run CPP preprocessor - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
205205

206206
#Generate list of CPP Flags based on switches:
207207
CPPFLAGS=()
208-
for sw in $sw_str
209-
do
208+
for sw in $sw_str
209+
do
210210
CPPFLAGS+=("-DW3_$sw")
211-
done
211+
done
212212

213213
CPPFLAGS+=("-D__WW3_SWITCHES__='$sw_str'")
214214

@@ -259,14 +259,14 @@
259259
# rm -f *.mod ## too indiscriminate
260260

261261
## Using find -iname most succinct, but maybe not all version of find have
262-
## the -iname option?
262+
## the -iname option?
263263
# find . -iname "${name}.mod" -delete # not all versions of find have -iname?
264264

265-
# Fall back on grep -i
265+
# Fall back on grep -i
266266
mods=`ls *.mod 2> /dev/null | grep -i "${name}.mod"`
267267
if [ -n ${mods} ]; then
268268
rm -f ${mods}
269-
fi
269+
fi
270270

271271
# --------------------------------------------------------------------------- #
272272
# 3. Compile source code f / f90 #
@@ -346,13 +346,13 @@ then
346346
## ChrisB: Don't move all module files...could break parallel make.
347347
## Just target specific module file (could be mixed case filename
348348
## depending on compiler - use case insensitive find):
349-
# mods=`ls *.mod 2> /dev/null`
349+
# mods=`ls *.mod 2> /dev/null`
350350

351351
## Using find -iname most succinct, but maybe not all version of find have
352-
## the -iname option?
352+
## the -iname option?
353353
# mods=`find . -iname "${name}.mod"` # not all versions of find have -iname?
354354

355-
# Fall back on grep -i
355+
# Fall back on grep -i
356356
mods=`ls *.mod 2> /dev/null | grep -i "${name}.mod"`
357357
if [ -n "$mods" ]
358358
then

model/bin/all_switches

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
echo 'Find all switches in WAVEWATCH III'
2727
echo '----------------------------------'
2828

29-
# 1.b Get data from setup file - - - - - - - - - - - - - - - - - - - - - - - -
29+
# 1.b Get data from setup file - - - - - - - - - - - - - - - - - - - - - - - -
3030

3131
source $(dirname $0)/w3_setenv
3232
main_dir=$WWATCH3_DIR

0 commit comments

Comments
 (0)