diff --git a/src/array_functions_interface.f90 b/src/array_functions_m.f90 similarity index 98% rename from src/array_functions_interface.f90 rename to src/array_functions_m.f90 index cc985942..9e92b4e9 100644 --- a/src/array_functions_interface.f90 +++ b/src/array_functions_m.f90 @@ -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 array_functions_interface +module array_functions_m !! author: Damian Rouson !! date: 04/25/2019 !! diff --git a/src/array_functions_implementation.f90 b/src/array_functions_s.f90 similarity index 97% rename from src/array_functions_implementation.f90 rename to src/array_functions_s.f90 index 13ce100e..911a6bcd 100644 --- a/src/array_functions_implementation.f90 +++ b/src/array_functions_s.f90 @@ -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(array_functions_interface) array_functions_implementation +submodule(array_functions_m) array_functions_s use assert_m, only : assert implicit none contains diff --git a/src/co_object_implementation.f90 b/src/co_object_implementation.f90 index dcd31143..cbaa4785 100644 --- a/src/co_object_implementation.f90 +++ b/src/co_object_implementation.f90 @@ -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(co_object_interface) co_object_implementation +submodule(co_object_m) co_object_s implicit none contains diff --git a/src/co_object_interface.f90 b/src/co_object_m.f90 similarity index 96% rename from src/co_object_interface.f90 rename to src/co_object_m.f90 index e7109924..e5c036b5 100644 --- a/src/co_object_interface.f90 +++ b/src/co_object_m.f90 @@ -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 co_object_interface +module co_object_m implicit none private @@ -40,4 +40,4 @@ pure module function user_defined(self) result(is_defined) end interface -end module co_object_interface +end module co_object_m diff --git a/src/command_line_interface.f90 b/src/command_line_m.f90 similarity index 96% rename from src/command_line_interface.f90 rename to src/command_line_m.f90 index 9c5e3b18..f89a2c3b 100644 --- a/src/command_line_interface.f90 +++ b/src/command_line_m.f90 @@ -1,4 +1,4 @@ -module command_line_interface +module command_line_m !! return command line argument information implicit none diff --git a/src/command_line_implementation.f90 b/src/command_line_s.f90 similarity index 94% rename from src/command_line_implementation.f90 rename to src/command_line_s.f90 index ae592b10..3a98725e 100644 --- a/src/command_line_implementation.f90 +++ b/src/command_line_s.f90 @@ -1,4 +1,4 @@ -submodule(command_line_interface) command_line_implementation +submodule(command_line_m) command_line_s implicit none contains diff --git a/src/data-partition-interface.f90 b/src/data_partition_m.f90 similarity index 97% rename from src/data-partition-interface.f90 rename to src/data_partition_m.f90 index 28cc6015..a310506e 100644 --- a/src/data-partition-interface.f90 +++ b/src/data_partition_m.f90 @@ -1,4 +1,4 @@ -module data_partition_interface +module data_partition_m !! distribute data identification numbers across images such that the number of !! items differs by at most 1 between any two images. use iso_fortran_env, only : real32, real64 @@ -75,4 +75,4 @@ module subroutine gather_real64_2D_array( a, result_image, dim ) end interface -end module data_partition_interface +end module data_partition_m diff --git a/src/data-partition-implementation.f90 b/src/data_partition_s.f90 similarity index 98% rename from src/data-partition-implementation.f90 rename to src/data_partition_s.f90 index 8c13a87b..65078141 100644 --- a/src/data-partition-implementation.f90 +++ b/src/data_partition_s.f90 @@ -1,4 +1,4 @@ -submodule(data_partition_interface) data_partition_implementation +submodule(data_partition_m) data_partition_s use assert_m, only : assert implicit none @@ -242,4 +242,4 @@ pure function overflow(im, excess) result(extra_datum) end associate end procedure -end submodule data_partition_implementation +end submodule data_partition_s diff --git a/src/object_interface.f90 b/src/object_m.f90 similarity index 97% rename from src/object_interface.f90 rename to src/object_m.f90 index 0d3e8ed3..c941450d 100644 --- a/src/object_interface.f90 +++ b/src/object_m.f90 @@ -6,7 +6,7 @@ ! "Multi-Dimensional Physics Implementation into Fuel Analysis under Steady-state and Transients (FAST)", ! contract # NRC-HQ-60-17-C-0007 ! ``` -module object_interface +module object_m implicit none private @@ -60,4 +60,4 @@ subroutine write_interface(self, unit, iotype, v_list, iostat, iomsg) end subroutine end interface -end module object_interface +end module object_m diff --git a/src/object_implementation.f90 b/src/object_s.f90 similarity index 91% rename from src/object_implementation.f90 rename to src/object_s.f90 index 7d82481d..e280341e 100644 --- a/src/object_implementation.f90 +++ b/src/object_s.f90 @@ -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(object_interface) object_implementation +submodule(object_m) object_s implicit none contains diff --git a/src/oracle_interface.f90 b/src/oracle_m.f90 similarity index 96% rename from src/oracle_interface.f90 rename to src/oracle_m.f90 index 32d8a326..08feaa4e 100755 --- a/src/oracle_interface.f90 +++ b/src/oracle_m.f90 @@ -1,6 +1,6 @@ -module oracle_interface +module oracle_m !! verify actual output against expected - use object_interface, only : object_t + use object_m, only : object_t implicit none private diff --git a/src/oracle_implementation.f90 b/src/oracle_s.f90 similarity index 71% rename from src/oracle_implementation.f90 rename to src/oracle_s.f90 index 757f4128..5d5d5c4a 100755 --- a/src/oracle_implementation.f90 +++ b/src/oracle_s.f90 @@ -1,5 +1,5 @@ -submodule(oracle_interface) oracle_implementation - !! define procedures corresponding to the interface bodies in oracle_interface +submodule(oracle_m) oracle_s + !! define procedures corresponding to the interface bodies in oracle_m implicit none contains @@ -12,4 +12,4 @@ end procedure -end submodule oracle_implementation +end submodule oracle_s diff --git a/src/string_functions_interface.f90 b/src/string_functions_m.f90 similarity index 89% rename from src/string_functions_interface.f90 rename to src/string_functions_m.f90 index 7a1bb0c2..626e6f6b 100644 --- a/src/string_functions_interface.f90 +++ b/src/string_functions_m.f90 @@ -4,16 +4,14 @@ ! "Multi-Dimensional Physics Implementation into Fuel Analysis under Steady-state and Transients (FAST)", ! contract # NRC-HQ-60-17-C-0007 ! -module string_functions_interface +module string_functions_m !! author: Damian Rouson !! date: August 23, 2019 !! summary: utilities for manipulating or producing character variables implicit none private - public :: file_extension, csv_format, base_name, string - - character(len=*), parameter :: csv_format = '(*(G0,:,","))' + public :: file_extension, base_name, string interface string module procedure integer_to_string diff --git a/src/string_functions_implementation.f90 b/src/string_functions_s.f90 similarity index 94% rename from src/string_functions_implementation.f90 rename to src/string_functions_s.f90 index 3e91342c..1db52aee 100644 --- a/src/string_functions_implementation.f90 +++ b/src/string_functions_s.f90 @@ -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(string_functions_interface) string_functions_implementation +submodule(string_functions_m) string_functions_s implicit none contains diff --git a/src/units_interface.f90 b/src/units_m.f90 similarity index 99% rename from src/units_interface.f90 rename to src/units_m.f90 index 1b62a967..94645415 100644 --- a/src/units_interface.f90 +++ b/src/units_m.f90 @@ -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 units_interface +module units_m !! author: Damian Rouson !! date: 9/9/2019 !! diff --git a/src/units_implementation.f90 b/src/units_s.f90 similarity index 98% rename from src/units_implementation.f90 rename to src/units_s.f90 index 381f4779..10db0909 100644 --- a/src/units_implementation.f90 +++ b/src/units_s.f90 @@ -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(units_interface) units_implementation +submodule(units_m) units_s use assert_m, only : assert implicit none @@ -123,4 +123,4 @@ ratio%system = merge(numerator%system,dimensionless,any(ratio%exponents_/=0)) end procedure -end submodule units_implementation +end submodule units_s diff --git a/tests/data_partition_test.f90 b/tests/data_partition_test.f90 index a4b51be7..34f5b2f2 100644 --- a/tests/data_partition_test.f90 +++ b/tests/data_partition_test.f90 @@ -5,7 +5,7 @@ module data_partition_test use vegetables, only: & result_t, example_t, input_t, integer_input_t, test_item_t, & ! types describe, it, assert_equals, assert_that ! functions - use data_partition_interface, only : data_partition_t + use data_partition_m, only : data_partition_t use iso_fortran_env, only : real64 implicit none diff --git a/tests/main.f90 b/tests/main.f90 index de4cb817..3262ac5a 100644 --- a/tests/main.f90 +++ b/tests/main.f90 @@ -9,8 +9,8 @@ subroutine run() data_partition_data_partition => test_data_partition use formats_test, only: & formats_object => test_object - use object_interface_test, only: & - object_interface_object => test_object + use object_m_test, only: & + object_m_object => test_object use user_defined_collectives_test, only: & user_defined_collectives_co_all => test_co_all use vegetables, only: test_item_t, test_that, run_tests @@ -20,7 +20,7 @@ subroutine run() individual_tests(1) = data_partition_data_partition() individual_tests(2) = formats_object() - individual_tests(3) = object_interface_object() + individual_tests(3) = object_m_object() individual_tests(4) = user_defined_collectives_co_all() tests = test_that(individual_tests) diff --git a/tests/object_interface_test.f90 b/tests/object_interface_test.f90 index 97f1e5ec..653b2e69 100644 --- a/tests/object_interface_test.f90 +++ b/tests/object_interface_test.f90 @@ -1,11 +1,11 @@ -module object_interface_test +module object_m_test !! author: Damian Rouson !! !! summary: verify object pattern asbtract parent use vegetables, only: & result_t, input_t, integer_input_t, test_item_t, & ! types describe, it, assert_equals, assert_that, assert_not ! functions - use object_interface, only : object_t + use object_m, only : object_t implicit none private @@ -67,11 +67,11 @@ subroutine write_formatted(self, unit, iotype, v_list, iostat, iomsg) iomsg = "" case default iostat = -1 - iomsg = "object_interface_test: subject%write_formatted iotype received unsupported iotype " // iotype + iomsg = "object_m_test: subject%write_formatted iotype received unsupported iotype " // iotype end select associate( unused => v_list) end associate end subroutine -end module object_interface_test +end module object_m_test