Skip to content

Remove unnecessary macros & refactor directory structure #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rouson merged 2 commits into from
May 14, 2023
Merged

Remove unnecessary macros & refactor directory structure #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
62b5746
feat(intrinsic_array_m): support assumed-rank
rouson May 14, 2023
6e2a648
refac(src): export everything via one module
rouson May 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/assert_m.F90 → src/assert/assert_subroutine_m.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
! "Multi-Dimensional Physics Implementation into Fuel Analysis under Steady-state and Transients (FAST)",
! contract # NRC-HQ-60-17-C-0007
!
module assert_m
module assert_subroutine_m
!! summary: Utility for runtime checking of logical assertions.
!! usage: error-terminate if the assertion fails:
!!
Expand Down Expand Up @@ -44,4 +44,4 @@ pure module subroutine assert(assertion, description, diagnostic_data)

end interface

end module
end module assert_subroutine_m
4 changes: 2 additions & 2 deletions src/assert_s.f90 → src/assert/assert_subroutine_s.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
! "Multi-Dimensional Physics Implementation into Fuel Analysis under Steady-state and Transients (FAST)",
! contract # NRC-HQ-60-17-C-0007
!
submodule(assert_m) assert_s
submodule(assert_subroutine_m) assert_subroutine_s
implicit none

contains
Expand Down Expand Up @@ -84,4 +84,4 @@ end function string

end procedure

end submodule
end submodule assert_subroutine_s
0 src/characterizable_m.f90 → src/assert/characterizable_m.f90
View file
Open in desktop
File renamed without changes.
4 changes: 0 additions & 4 deletions src/intrinsic_array_m.F90 → src/assert/intrinsic_array_m.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,7 @@ module intrinsic_array_m

pure module function construct(array) result(intrinsic_array)
implicit none
#ifndef NAGFOR
class(*), intent(in) :: array(..)
#else
class(*), intent(in) :: array(:)
#endif
type(intrinsic_array_t) intrinsic_array
end function

Expand Down
4 changes: 0 additions & 4 deletions src/intrinsic_array_s.F90 → src/assert/intrinsic_array_s.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,8 @@

module procedure construct

#ifndef NAGFOR
select rank(array)
rank(1)
#endif
select type(array)
type is(complex)
allocate(intrinsic_array%complex_1D, source = array)
Expand All @@ -23,7 +21,6 @@
class default
error stop "intrinsic_array_t construct: unsupported rank-2 type"
end select
#ifndef NAGFOR
rank(2)
select type(array)
type is(complex)
Expand Down Expand Up @@ -59,7 +56,6 @@
rank default
error stop "intrinsic_array_t construct: unsupported rank"
end select
#endif

end procedure

Expand Down
6 changes: 6 additions & 0 deletions src/assert_m.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
module assert_m
use intrinsic_array_m
use assert_subroutine_m
use characterizable_m
implicit none
end module assert_m