Skip to content

Commit 0f12998

Browse files
authored
Merge pull request #17 from praynaud/fix_initialization_warnings
fix(allocation warnings): intrinsic_array_s
2 parents af467b1 + 7d06e54 commit 0f12998

File tree

3 files changed

+29
-22
lines changed

3 files changed

+29
-22
lines changed

.github/workflows/CI.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- name: Checkout code
1616
uses: actions/checkout@v2
1717

18-
- uses: fortran-lang/setup-fpm@v3
18+
- uses: fortran-lang/setup-fpm@v4
1919
with:
2020
github-token: ${{ secrets.GITHUB_TOKEN }}
2121

.github/workflows/deploy-docs.yml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,26 @@ jobs:
77
Build:
88
runs-on: ubuntu-22.04
99

10+
env:
11+
FC: gfortran
12+
GCC_V: 12
13+
1014
steps:
1115
- name: Checkout code
1216
uses: actions/checkout@v2
1317

1418
- name: Install Dependencies Ubuntu
1519
run: |
1620
sudo apt-get update
17-
sudo apt install -y python3-dev python3 build-essential graphviz gfortran-12
18-
sudo pip install ford
21+
sudo apt install -y gfortran-${GCC_V} python3-dev python3 build-essential numdiff graphviz
22+
sudo pip install ford markdown==3.3.4
1923
2024
- name: Build Developer Documenation
2125
run: |
22-
ford doc-generator.md
26+
# Turn warnings into errors
27+
ford doc-generator.md > ford_output.txt
28+
cat ford_output.txt; if grep -q -i Warning ford_output.txt; then exit 1; fi
29+
cp ./README.md ./doc/html
2330
2431
- name: Upload Documentation
2532
uses: actions/upload-artifact@v2

src/intrinsic_array_s.F90

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -11,47 +11,47 @@
1111
#endif
1212
select type(array)
1313
type is(complex)
14-
intrinsic_array%complex_1D = array
14+
allocate(intrinsic_array%complex_1D, source = array)
1515
type is(integer)
16-
intrinsic_array%integer_1D = array
16+
allocate(intrinsic_array%integer_1D, source = array)
1717
type is(logical)
18-
intrinsic_array%logical_1D = array
18+
allocate(intrinsic_array%logical_1D, source = array)
1919
type is(real)
20-
intrinsic_array%real_1D = array
20+
allocate(intrinsic_array%real_1D, source = array)
2121
type is(double precision)
22-
intrinsic_array%double_precision_1D = array
22+
allocate(intrinsic_array%double_precision_1D, source = array)
2323
class default
2424
error stop "intrinsic_array_t construct: unsupported rank-2 type"
2525
end select
2626
#ifndef NAGFOR
2727
rank(2)
2828
select type(array)
2929
type is(complex)
30-
intrinsic_array%complex_2D = array
30+
allocate(intrinsic_array%complex_2D, source = array)
3131
type is(integer)
32-
intrinsic_array%integer_2D = array
32+
allocate(intrinsic_array%integer_2D, source = array)
3333
type is(logical)
34-
intrinsic_array%logical_2D = array
34+
allocate(intrinsic_array%logical_2D, source = array)
3535
type is(real)
36-
intrinsic_array%real_2D = array
36+
allocate(intrinsic_array%real_2D, source = array)
3737
type is(double precision)
38-
intrinsic_array%double_precision_2D = array
38+
allocate(intrinsic_array%double_precision_2D, source = array)
3939
class default
4040
error stop "intrinsic_array_t construct: unsupported rank-2 type"
4141
end select
4242

4343
rank(3)
4444
select type(array)
4545
type is(complex)
46-
intrinsic_array%complex_3D = array
46+
allocate(intrinsic_array%complex_3D, source = array)
4747
type is(integer)
48-
intrinsic_array%integer_3D = array
48+
allocate(intrinsic_array%integer_3D, source = array)
4949
type is(logical)
50-
intrinsic_array%logical_3D = array
50+
allocate(intrinsic_array%logical_3D, source = array)
5151
type is(real)
52-
intrinsic_array%real_3D = array
52+
allocate(intrinsic_array%real_3D, source = array)
5353
type is(double precision)
54-
intrinsic_array%double_precision_3D = array
54+
allocate(intrinsic_array%double_precision_3D, source = array)
5555
class default
5656
error stop "intrinsic_array_t construct: unsupported rank-3 type"
5757
end select
@@ -62,11 +62,11 @@
6262
#endif
6363

6464
end procedure
65-
65+
6666
module procedure as_character
6767
integer, parameter :: single_number_width=32
6868

69-
if (1 /= count( &
69+
if (1 /= count( &
7070
[ allocated(self%complex_1D), allocated(self%complex_double_1D), allocated(self%integer_1D), &
7171
allocated(self%logical_1D), allocated(self%real_1D), &
7272
allocated(self%complex_2D), allocated(self%complex_double_2D), allocated(self%integer_2D), &
@@ -132,6 +132,6 @@
132132
end if
133133

134134
character_self = trim(adjustl(character_self))
135-
end procedure
135+
end procedure
136136

137137
end submodule intrinsic_array_s

0 commit comments

Comments
 (0)