From ae63a4a0fb93a21c5989d27adfd2a6b326dedc1b Mon Sep 17 00:00:00 2001 From: Damian Rouson Date: Wed, 20 Sep 2023 16:21:50 -0400 Subject: [PATCH 1/3] chore: prefix sourcery_ to submodule names --- ...array_functions_s.f90 => sourcery_array_functions_s.f90} | 2 +- src/sourcery/{bin_s.f90 => sourcery_bin_s.f90} | 4 ++-- .../{object_s.f90 => sourcery_co_object_implementation.f90} | 2 +- .../{command_line_s.f90 => sourcery_command_line_s.f90} | 2 +- .../{data_partition_s.f90 => sourcery_data_partition_s.f90} | 4 ++-- src/sourcery/{file_s.f90 => sourcery_file_s.f90} | 4 ++-- src/sourcery/{formats_s.f90 => sourcery_formats_s.f90} | 4 ++-- .../{co_object_implementation.f90 => sourcery_object_s.f90} | 2 +- src/sourcery/{oracle_s.f90 => sourcery_oracle_s.f90} | 4 ++-- ...mand_line_m.f90 => sourcery_sourcery_command_line_m.f90} | 0 ...ring_functions_s.f90 => sourcery_string_functions_s.f90} | 2 +- src/sourcery/{string_s.f90 => sourcery_string_s.f90} | 6 +++++- .../{test_result_s.f90 => sourcery_test_result_s.f90} | 4 ++-- src/sourcery/{test_s.f90 => sourcery_test_s.f90} | 6 +++--- src/sourcery/{units_s.f90 => sourcery_units_s.f90} | 4 ++-- ...ctives_s.f90 => sourcery_user_defined_collectives_s.f90} | 4 ++-- 16 files changed, 29 insertions(+), 25 deletions(-) rename src/sourcery/{array_functions_s.f90 => sourcery_array_functions_s.f90} (97%) rename src/sourcery/{bin_s.f90 => sourcery_bin_s.f90} (92%) rename src/sourcery/{object_s.f90 => sourcery_co_object_implementation.f90} (90%) rename src/sourcery/{command_line_s.f90 => sourcery_command_line_s.f90} (96%) rename src/sourcery/{data_partition_s.f90 => sourcery_data_partition_s.f90} (98%) rename src/sourcery/{file_s.f90 => sourcery_file_s.f90} (97%) rename src/sourcery/{formats_s.f90 => sourcery_formats_s.f90} (92%) rename src/sourcery/{co_object_implementation.f90 => sourcery_object_s.f90} (91%) rename src/sourcery/{oracle_s.f90 => sourcery_oracle_s.f90} (77%) rename src/sourcery/{sourcery_command_line_m.f90 => sourcery_sourcery_command_line_m.f90} (100%) rename src/sourcery/{string_functions_s.f90 => sourcery_string_functions_s.f90} (94%) rename src/sourcery/{string_s.f90 => sourcery_string_s.f90} (81%) rename src/sourcery/{test_result_s.f90 => sourcery_test_result_s.f90} (81%) rename src/sourcery/{test_s.f90 => sourcery_test_s.f90} (88%) rename src/sourcery/{units_s.f90 => sourcery_units_s.f90} (98%) rename src/sourcery/{user_defined_collectives_s.f90 => sourcery_user_defined_collectives_s.f90} (81%) diff --git a/src/sourcery/array_functions_s.f90 b/src/sourcery/sourcery_array_functions_s.f90 similarity index 97% rename from src/sourcery/array_functions_s.f90 rename to src/sourcery/sourcery_array_functions_s.f90 index 324f7a49..6c005e0b 100644 --- a/src/sourcery/array_functions_s.f90 +++ b/src/sourcery/sourcery_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(sourcery_array_functions_m) array_functions_s +submodule(sourcery_array_functions_m) sourcery_array_functions_s use assert_m, only : assert implicit none contains diff --git a/src/sourcery/bin_s.f90 b/src/sourcery/sourcery_bin_s.f90 similarity index 92% rename from src/sourcery/bin_s.f90 rename to src/sourcery/sourcery_bin_s.f90 index 8f0d3de6..16efac80 100644 --- a/src/sourcery/bin_s.f90 +++ b/src/sourcery/sourcery_bin_s.f90 @@ -1,4 +1,4 @@ -submodule(sourcery_bin_m) bin_s +submodule(sourcery_bin_m) sourcery_bin_s use assert_m, only : assert, intrinsic_array_t implicit none @@ -30,4 +30,4 @@ last_item_number = self%last_ end procedure -end submodule bin_s +end submodule sourcery_bin_s diff --git a/src/sourcery/object_s.f90 b/src/sourcery/sourcery_co_object_implementation.f90 similarity index 90% rename from src/sourcery/object_s.f90 rename to src/sourcery/sourcery_co_object_implementation.f90 index 1266efc5..fedb177c 100644 --- a/src/sourcery/object_s.f90 +++ b/src/sourcery/sourcery_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(sourcery_object_m) object_s +submodule(sourcery_co_object_m) sourcery_co_object_s implicit none contains diff --git a/src/sourcery/command_line_s.f90 b/src/sourcery/sourcery_command_line_s.f90 similarity index 96% rename from src/sourcery/command_line_s.f90 rename to src/sourcery/sourcery_command_line_s.f90 index 30115237..0f0d0428 100644 --- a/src/sourcery/command_line_s.f90 +++ b/src/sourcery/sourcery_command_line_s.f90 @@ -1,4 +1,4 @@ -submodule(sourcery_command_line_m) command_line_s +submodule(sourcery_command_line_m) sourcery_command_line_s implicit none contains diff --git a/src/sourcery/data_partition_s.f90 b/src/sourcery/sourcery_data_partition_s.f90 similarity index 98% rename from src/sourcery/data_partition_s.f90 rename to src/sourcery/sourcery_data_partition_s.f90 index 2ea7bbe5..ed27ef85 100644 --- a/src/sourcery/data_partition_s.f90 +++ b/src/sourcery/sourcery_data_partition_s.f90 @@ -1,4 +1,4 @@ -submodule(sourcery_data_partition_m) data_partition_s +submodule(sourcery_data_partition_m) sourcery_data_partition_s use assert_m, only : assert use sourcery_bin_m, only : bin_t implicit none @@ -233,4 +233,4 @@ end associate end procedure -end submodule data_partition_s +end submodule sourcery_data_partition_s diff --git a/src/sourcery/file_s.f90 b/src/sourcery/sourcery_file_s.f90 similarity index 97% rename from src/sourcery/file_s.f90 rename to src/sourcery/sourcery_file_s.f90 index 5b9be1db..c89269c6 100644 --- a/src/sourcery/file_s.f90 +++ b/src/sourcery/sourcery_file_s.f90 @@ -1,4 +1,4 @@ -submodule(sourcery_file_m) file_s +submodule(sourcery_file_m) sourcery_file_s use iso_fortran_env, only : iostat_end, iostat_eor, output_unit use assert_m, only : assert implicit none @@ -104,4 +104,4 @@ function line_lengths(file_unit) result(lengths) my_lines = self%lines_ end procedure -end submodule file_s +end submodule sourcery_file_s diff --git a/src/sourcery/formats_s.f90 b/src/sourcery/sourcery_formats_s.f90 similarity index 92% rename from src/sourcery/formats_s.f90 rename to src/sourcery/sourcery_formats_s.f90 index deb4ff0e..246efcc9 100644 --- a/src/sourcery/formats_s.f90 +++ b/src/sourcery/sourcery_formats_s.f90 @@ -1,4 +1,4 @@ -submodule(sourcery_formats_m) formats_s +submodule(sourcery_formats_m) sourcery_formats_s !! Construct separated-value formats implicit none @@ -28,4 +28,4 @@ end select end procedure -end submodule formats_s +end submodule sourcery_formats_s diff --git a/src/sourcery/co_object_implementation.f90 b/src/sourcery/sourcery_object_s.f90 similarity index 91% rename from src/sourcery/co_object_implementation.f90 rename to src/sourcery/sourcery_object_s.f90 index 6dd113d6..76baf9e2 100644 --- a/src/sourcery/co_object_implementation.f90 +++ b/src/sourcery/sourcery_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(sourcery_co_object_m) co_object_s +submodule(sourcery_object_m) sourcery_object_s implicit none contains diff --git a/src/sourcery/oracle_s.f90 b/src/sourcery/sourcery_oracle_s.f90 similarity index 77% rename from src/sourcery/oracle_s.f90 rename to src/sourcery/sourcery_oracle_s.f90 index 0e3f04e2..201d7b9c 100755 --- a/src/sourcery/oracle_s.f90 +++ b/src/sourcery/sourcery_oracle_s.f90 @@ -1,4 +1,4 @@ -submodule(sourcery_oracle_m) oracle_s +submodule(sourcery_oracle_m) sourcery_oracle_s !! define procedures corresponding to the interface bodies in oracle_m implicit none @@ -12,4 +12,4 @@ end procedure -end submodule oracle_s +end submodule sourcery_oracle_s diff --git a/src/sourcery/sourcery_command_line_m.f90 b/src/sourcery/sourcery_sourcery_command_line_m.f90 similarity index 100% rename from src/sourcery/sourcery_command_line_m.f90 rename to src/sourcery/sourcery_sourcery_command_line_m.f90 diff --git a/src/sourcery/string_functions_s.f90 b/src/sourcery/sourcery_string_functions_s.f90 similarity index 94% rename from src/sourcery/string_functions_s.f90 rename to src/sourcery/sourcery_string_functions_s.f90 index e372e50c..1e85a9cb 100644 --- a/src/sourcery/string_functions_s.f90 +++ b/src/sourcery/sourcery_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(sourcery_string_functions_m) string_functions_s +submodule(sourcery_string_functions_m) sourcery_string_functions_s implicit none contains diff --git a/src/sourcery/string_s.f90 b/src/sourcery/sourcery_string_s.f90 similarity index 81% rename from src/sourcery/string_s.f90 rename to src/sourcery/sourcery_string_s.f90 index 49ee8cd0..25a22168 100644 --- a/src/sourcery/string_s.f90 +++ b/src/sourcery/sourcery_string_s.f90 @@ -1,4 +1,8 @@ +<<<<<<< HEAD:src/sourcery/string_s.f90 submodule(sourcery_string_m) string_s +======= +submodule(sourcery_string_m) sourcery_string_s +>>>>>>> 03abe88 (chore: prefix sourcery_ to submodule names):src/sourcery/sourcery_string_s.f90 implicit none contains @@ -37,4 +41,4 @@ end procedure -end submodule string_s +end submodule sourcery_string_s diff --git a/src/sourcery/test_result_s.f90 b/src/sourcery/sourcery_test_result_s.f90 similarity index 81% rename from src/sourcery/test_result_s.f90 rename to src/sourcery/sourcery_test_result_s.f90 index f19082ef..170fe23b 100644 --- a/src/sourcery/test_result_s.f90 +++ b/src/sourcery/sourcery_test_result_s.f90 @@ -1,4 +1,4 @@ -submodule(sourcery_test_result_m) test_result_s +submodule(sourcery_test_result_m) sourcery_test_result_s implicit none contains @@ -16,4 +16,4 @@ test_passed = self%passed_ end procedure -end submodule test_result_s +end submodule sourcery_test_result_s diff --git a/src/sourcery/test_s.f90 b/src/sourcery/sourcery_test_s.f90 similarity index 88% rename from src/sourcery/test_s.f90 rename to src/sourcery/sourcery_test_s.f90 index 3721ad68..270b9744 100644 --- a/src/sourcery/test_s.f90 +++ b/src/sourcery/sourcery_test_s.f90 @@ -1,5 +1,5 @@ -submodule(sourcery_test_m) test_s - use sourcery_m, only : co_all +submodule(sourcery_test_m) sourcery_test_s + use sourcery_user_defined_collectives_m, only : co_all implicit none contains @@ -34,4 +34,4 @@ end procedure -end submodule test_s +end submodule sourcery_test_s diff --git a/src/sourcery/units_s.f90 b/src/sourcery/sourcery_units_s.f90 similarity index 98% rename from src/sourcery/units_s.f90 rename to src/sourcery/sourcery_units_s.f90 index 9130bb5a..5cbfa64e 100644 --- a/src/sourcery/units_s.f90 +++ b/src/sourcery/sourcery_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(sourcery_units_m) units_s +submodule(sourcery_units_m) sourcery_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_s +end submodule sourcery_units_s diff --git a/src/sourcery/user_defined_collectives_s.f90 b/src/sourcery/sourcery_user_defined_collectives_s.f90 similarity index 81% rename from src/sourcery/user_defined_collectives_s.f90 rename to src/sourcery/sourcery_user_defined_collectives_s.f90 index 918cfd1a..c3baaf9e 100644 --- a/src/sourcery/user_defined_collectives_s.f90 +++ b/src/sourcery/sourcery_user_defined_collectives_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(sourcery_user_defined_collectives_m) user_defined_collectives_s +submodule(sourcery_user_defined_collectives_m) sourcery_user_defined_collectives_s implicit none contains @@ -19,4 +19,4 @@ pure function both(lhs,rhs) result(lhs_and_rhs) end function end procedure -end submodule user_defined_collectives_s +end submodule sourcery_user_defined_collectives_s From 7a5519dc850993edbe1724959fdff6b5cdc9d11d Mon Sep 17 00:00:00 2001 From: Damian Rouson Date: Wed, 20 Sep 2023 16:25:34 -0400 Subject: [PATCH 2/3] chore: rm temporary script --- src/sourcery/files | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100755 src/sourcery/files diff --git a/src/sourcery/files b/src/sourcery/files deleted file mode 100755 index ab34fcf0..00000000 --- a/src/sourcery/files +++ /dev/null @@ -1,14 +0,0 @@ -git mv {,sourcery_}array_functions_m.f90 -git mv {,sourcery_}bin_m.f90 -git mv {,sourcery_}data_partition_m.f90 -git mv {,sourcery_}file_m.f90 -git mv {,sourcery_}formats_m.f90 -git mv {,sourcery_}object_m.f90 -git mv {,sourcery_}oracle_m.f90 -git mv {,sourcery_}sourcery_command_line_m.f90 -git mv {,sourcery_}string_functions_m.f90 -git mv {,sourcery_}string_m.f90 -git mv {,sourcery_}test_m.f90 -git mv {,sourcery_}test_result_m.f90 -git mv {,sourcery_}units_m.f90 -git mv {,sourcery_}user_defined_collectives_m.f90 From cc17b12375742f9e8e1b92f73cc16df98126a88c Mon Sep 17 00:00:00 2001 From: Damian Rouson Date: Wed, 20 Sep 2023 16:12:01 -0400 Subject: [PATCH 3/3] chore: prefix sourcery_ to submodule names --- src/sourcery/sourcery_string_s.f90 | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/sourcery/sourcery_string_s.f90 b/src/sourcery/sourcery_string_s.f90 index 25a22168..dc7dcfc2 100644 --- a/src/sourcery/sourcery_string_s.f90 +++ b/src/sourcery/sourcery_string_s.f90 @@ -1,8 +1,4 @@ -<<<<<<< HEAD:src/sourcery/string_s.f90 -submodule(sourcery_string_m) string_s -======= submodule(sourcery_string_m) sourcery_string_s ->>>>>>> 03abe88 (chore: prefix sourcery_ to submodule names):src/sourcery/sourcery_string_s.f90 implicit none contains