diff --git a/.github/file-filter.yml b/.github/file-filter.yml index 6c8fb7216b..b3a55f78b0 100644 --- a/.github/file-filter.yml +++ b/.github/file-filter.yml @@ -3,7 +3,7 @@ fortran_src: &fortran_src - '**/*.f90' - - '**/*.fpp' + - '**/*.fypp' python_src: &python_src - '**/*.py' diff --git a/.gitignore b/.gitignore index 30393c710b..40236bf013 100644 --- a/.gitignore +++ b/.gitignore @@ -5,7 +5,7 @@ yarn.lock .venv/ /build/ .vscode/ -src/*/include/case.fpp +src/*/include/case.fypp src/*/autogen/ *.swo diff --git a/CMakeLists.txt b/CMakeLists.txt index a5835bd24e..e95add30e2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -253,48 +253,48 @@ endif() # # * Locate all source files for of the type # -# src/[,common]/[.,include]/*.[f90,fpp]. +# src/[,common]/[.,include]/*.[f90,fypp]. # -# * For each .fpp file found with filepath /.fpp, using a +# * For each .fypp file found with filepath /.fypp, using a # custom command, instruct CMake how to generate a file with path # # src//fypp/.f90 # -# by running Fypp on /.fpp. It is important to understand +# by running Fypp on /.fypp. It is important to understand # that this does not actually run the pre-processor. Rather, it instructs # CMake what to do when it finds a src//fypp/.f90 path # in the source list for a target. Thus, an association is made from an .f90 -# file to its corresponding .fpp file (if applicable) even though the -# generation is of the form .fpp -> .f90. +# file to its corresponding .fypp file (if applicable) even though the +# generation is of the form .fypp -> .f90. # -# This design has one limitation: If an .fpp file depends on another, for +# This design has one limitation: If an .fypp file depends on another, for # example if it '#:include's it and uses a macro defined in it, then the -# dependency will not be tracked. A modification to the .fpp file it depends -# on will not trigger a re-run of Fypp on the .fpp file that depends on it. +# dependency will not be tracked. A modification to the .fypp file it depends +# on will not trigger a re-run of Fypp on the .fypp file that depends on it. # As a compromise, both in speed and complexity, all .f90 files generated -# from .fpp files are re-generated not only when their corresponding .fpp +# from .fypp files are re-generated not only when their corresponding .fypp # file is modified, but also when any file with filepath of the form # -# src/[,common]/include/*.fpp +# src/[,common]/include/*.fypp # -# is modified. This is a reasonable compromise as modifications to .fpp files +# is modified. This is a reasonable compromise as modifications to .fypp files # in the include directories will be rare - by design. Other approaches would -# have required a more complex CMakeLists.txt file (perhaps parsing the .fpp +# have required a more complex CMakeLists.txt file (perhaps parsing the .fypp # files to determine their dependencies) or the endurment of longer -# compilation times (by way of re-running Fypp on all .fpp files every time +# compilation times (by way of re-running Fypp on all .fypp files every time # one of them is modified). # -# .fpp files in src/common are treated as if they were in src/ (not +# .fypp files in src/common are treated as if they were in src/ (not # pre-processed to src/common/fypp/) so as not to clash with other targets' -# .fpp files (this has caused problems in the past). +# .fypp files (this has caused problems in the past). # # * Export, in the variable _SRCs, a list of all source files (.f90) -# that would compile to produce . If includes .fpp files, +# that would compile to produce . If includes .fypp files, # then the list will include the paths to the corresponding .f90 files that -# Fypp would generate from the .fpp files. +# Fypp would generate from the .fypp files. # # This design allows us to be flexible in our use of Fypp as we don't have to -# worry about running the pre-processor on .fpp files when we create executables +# worry about running the pre-processor on .fypp files when we create executables # and generate documentation. Instead, we can simply include the list of .f90 # files that will eventually be used to compile . @@ -316,31 +316,31 @@ macro(HANDLE_SOURCES target useCommon) endif() # Gather: - # * src/[,(common)]/*.fpp] - # * (if any) /modules//*.fpp - file(GLOB ${target}_FPPs CONFIGURE_DEPENDS "${${target}_DIR}/*.fpp" - "${CMAKE_BINARY_DIR}/modules/${target}/*.fpp") + # * src/[,(common)]/*.fypp] + # * (if any) /modules//*.fypp + file(GLOB ${target}_FYPPs CONFIGURE_DEPENDS "${${target}_DIR}/*.fypp" + "${CMAKE_BINARY_DIR}/modules/${target}/*.fypp") if (${useCommon}) - file(GLOB common_FPPs CONFIGURE_DEPENDS "${common_DIR}/*.fpp") - list(APPEND ${target}_FPPs ${common_FPPs}) + file(GLOB common_FYPPs CONFIGURE_DEPENDS "${common_DIR}/*.fypp") + list(APPEND ${target}_FYPPs ${common_FYPPs}) endif() # Gather: - # * src/[,common]/include/*.fpp - # * (if any) /include//*.fpp - file(GLOB ${target}_incs CONFIGURE_DEPENDS "${${target}_DIR}/include/*.fpp" - "${CMAKE_BINARY_DIR}/include/${target}/*.fpp") + # * src/[,common]/include/*.fypp + # * (if any) /include//*.fypp + file(GLOB ${target}_incs CONFIGURE_DEPENDS "${${target}_DIR}/include/*.fypp" + "${CMAKE_BINARY_DIR}/include/${target}/*.fypp") if (${useCommon}) - file(GLOB common_incs CONFIGURE_DEPENDS "${common_DIR}/include/*.fpp") + file(GLOB common_incs CONFIGURE_DEPENDS "${common_DIR}/include/*.fypp") list(APPEND ${target}_incs ${common_incs}) endif() - # /path/to/*.fpp (used by ) -> /fypp//*.f90 + # /path/to/*.fypp (used by ) -> /fypp//*.f90 file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/fypp/${target}") - foreach(fpp ${${target}_FPPs}) - cmake_path(GET fpp FILENAME fpp_filename) - set(f90 "${CMAKE_BINARY_DIR}/fypp/${target}/${fpp_filename}.f90") + foreach(fypp ${${target}_FYPPs}) + cmake_path(GET fypp FILENAME fypp_filename) + set(f90 "${CMAKE_BINARY_DIR}/fypp/${target}/${fypp_filename}.f90") add_custom_command( OUTPUT ${f90} @@ -356,9 +356,9 @@ macro(HANDLE_SOURCES target useCommon) -D chemistry=False --line-numbering --no-folding - "${fpp}" "${f90}" - DEPENDS "${fpp};${${target}_incs}" - COMMENT "Preprocessing (Fypp) ${fpp_filename}" + "${fypp}" "${f90}" + DEPENDS "${fypp};${${target}_incs}" + COMMENT "Preprocessing (Fypp) ${fypp_filename}" VERBATIM ) diff --git a/docs/documentation/case.md b/docs/documentation/case.md index 5b3f54b202..85e93a4821 100644 --- a/docs/documentation/case.md +++ b/docs/documentation/case.md @@ -221,8 +221,8 @@ end if Some patch configurations are not adequately handled with the above analytic variable definitions. In this case, a hard coded patch can be used. -Hard coded patches can be added by adding additional hard coded patch identifiers to `src/pre_process/include/1[2,3]dHardcodedIC.fpp`. -For example, to add a 2D Hardcoded patch with an id of 200, one would add the following to `src/pre_process/include/2dHardcodedIC.fpp` +Hard coded patches can be added by adding additional hard coded patch identifiers to `src/pre_process/include/1[2,3]dHardcodedIC.fypp`. +For example, to add a 2D Hardcoded patch with an id of 200, one would add the following to `src/pre_process/include/2dHardcodedIC.fypp` ```f90 case(200) diff --git a/src/common/include/case.fpp b/src/common/include/case.fypp similarity index 93% rename from src/common/include/case.fpp rename to src/common/include/case.fypp index ad2e0b1a94..4216c0a7d2 100644 --- a/src/common/include/case.fpp +++ b/src/common/include/case.fypp @@ -1,4 +1,4 @@ -! This file exists so that Fypp can be run without generating case.fpp files for +! This file exists so that Fypp can be run without generating case.fypp files for ! each target. This is useful when generating documentation, for example. This ! should also let MFC be built with CMake directly, without invoking mfc.sh. diff --git a/src/common/include/macros.fpp b/src/common/include/macros.fypp similarity index 100% rename from src/common/include/macros.fpp rename to src/common/include/macros.fypp diff --git a/src/common/m_checker_common.fpp b/src/common/m_checker_common.fypp similarity index 99% rename from src/common/m_checker_common.fpp rename to src/common/m_checker_common.fypp index 2a1210ab66..8f830bf28b 100644 --- a/src/common/m_checker_common.fpp +++ b/src/common/m_checker_common.fypp @@ -2,7 +2,7 @@ !!@file m_checker_common.f90 !!@brief Contains module m_checker_common -#:include 'macros.fpp' +#:include 'macros.fypp' !> @brief The purpose of the module is to check for compatible input files for. !! inputs common to pre-processing, post-processing and simulation diff --git a/src/common/m_chemistry.fpp b/src/common/m_chemistry.fypp similarity index 98% rename from src/common/m_chemistry.fpp rename to src/common/m_chemistry.fypp index a9beef0b55..46a88aff0d 100644 --- a/src/common/m_chemistry.fpp +++ b/src/common/m_chemistry.fypp @@ -3,8 +3,8 @@ !! @brief Contains module m_chemistry !! @author Henry Le Berre -#:include 'macros.fpp' -#:include 'case.fpp' +#:include 'macros.fypp' +#:include 'case.fypp' module m_chemistry diff --git a/src/common/m_constants.fpp b/src/common/m_constants.fypp similarity index 100% rename from src/common/m_constants.fpp rename to src/common/m_constants.fypp diff --git a/src/common/m_derived_types.fpp b/src/common/m_derived_types.fypp similarity index 99% rename from src/common/m_derived_types.fpp rename to src/common/m_derived_types.fypp index 64c64ac897..15cfb69e2f 100644 --- a/src/common/m_derived_types.fpp +++ b/src/common/m_derived_types.fypp @@ -2,7 +2,7 @@ !! @file m_derived_types.f90 !! @brief Contains module m_derived_types -#:include "macros.fpp" +#:include "macros.fypp" !> @brief This file contains the definitions of all of the custom-defined !! types used in the pre-process code. diff --git a/src/common/m_finite_differences.fpp b/src/common/m_finite_differences.fypp similarity index 100% rename from src/common/m_finite_differences.fpp rename to src/common/m_finite_differences.fypp diff --git a/src/common/m_helper.fpp b/src/common/m_helper.fypp similarity index 99% rename from src/common/m_helper.fpp rename to src/common/m_helper.fypp index 0d849dbf68..811dfa77c0 100644 --- a/src/common/m_helper.fpp +++ b/src/common/m_helper.fypp @@ -1,4 +1,4 @@ -#:include 'macros.fpp' +#:include 'macros.fypp' !> !! @file m_helper.f90 !! @brief Contains module m_helper diff --git a/src/common/m_mpi_common.fpp b/src/common/m_mpi_common.fypp similarity index 99% rename from src/common/m_mpi_common.fpp rename to src/common/m_mpi_common.fypp index 405da58774..24739ec705 100644 --- a/src/common/m_mpi_common.fpp +++ b/src/common/m_mpi_common.fypp @@ -1,5 +1,5 @@ -#:include 'macros.fpp' +#:include 'macros.fypp' !> @brief The module serves as a proxy to the parameters and subroutines !! available in the MPI implementation's MPI module. Specifically, diff --git a/src/common/m_phase_change.fpp b/src/common/m_phase_change.fypp similarity index 99% rename from src/common/m_phase_change.fpp rename to src/common/m_phase_change.fypp index f6a0e16665..707da19002 100644 --- a/src/common/m_phase_change.fpp +++ b/src/common/m_phase_change.fypp @@ -1,7 +1,7 @@ !> energies (6-eqn to 4-eqn) equilibrium through an infinitely fast (algebraic) !> procedure. -#:include 'macros.fpp' +#:include 'macros.fypp' module m_phase_change diff --git a/src/common/m_variables_conversion.fpp b/src/common/m_variables_conversion.fypp similarity index 99% rename from src/common/m_variables_conversion.fpp rename to src/common/m_variables_conversion.fypp index 17d644259b..fadbd2d0cd 100644 --- a/src/common/m_variables_conversion.fpp +++ b/src/common/m_variables_conversion.fypp @@ -2,8 +2,8 @@ !! @file m_variables_conversion.f90 !! @brief Contains module m_variables_conversion -#:include 'macros.fpp' -#:include 'case.fpp' +#:include 'macros.fypp' +#:include 'case.fypp' !> @brief This module consists of subroutines used in the conversion of the !! conservative variables into the primitive ones and vice versa. In diff --git a/src/post_process/m_checker.fpp b/src/post_process/m_checker.fypp similarity index 99% rename from src/post_process/m_checker.fpp rename to src/post_process/m_checker.fypp index cfe8d8ad27..088fab3731 100644 --- a/src/post_process/m_checker.fpp +++ b/src/post_process/m_checker.fypp @@ -2,7 +2,7 @@ !!@file m_checker.f90 !!@brief Contains module m_checker -#:include 'macros.fpp' +#:include 'macros.fypp' !> @brief The purpose of the module is to check for compatible input files module m_checker diff --git a/src/post_process/m_data_output.fpp b/src/post_process/m_data_output.fypp similarity index 100% rename from src/post_process/m_data_output.fpp rename to src/post_process/m_data_output.fypp diff --git a/src/post_process/m_derived_variables.fpp b/src/post_process/m_derived_variables.fypp similarity index 100% rename from src/post_process/m_derived_variables.fpp rename to src/post_process/m_derived_variables.fypp diff --git a/src/post_process/m_global_parameters.fpp b/src/post_process/m_global_parameters.fypp similarity index 99% rename from src/post_process/m_global_parameters.fpp rename to src/post_process/m_global_parameters.fypp index 974c6e3620..ebc1b1c925 100644 --- a/src/post_process/m_global_parameters.fpp +++ b/src/post_process/m_global_parameters.fypp @@ -2,7 +2,7 @@ !! @file m_global_parameters.f90 !! @brief Contains module m_global_parameters -#:include 'case.fpp' +#:include 'case.fypp' !> @brief This module contains all of the parameters characterizing the !! computational domain, simulation algorithm, stiffened equation of diff --git a/src/post_process/m_mpi_proxy.fpp b/src/post_process/m_mpi_proxy.fypp similarity index 100% rename from src/post_process/m_mpi_proxy.fpp rename to src/post_process/m_mpi_proxy.fypp diff --git a/src/post_process/p_main.fpp b/src/post_process/p_main.fypp similarity index 100% rename from src/post_process/p_main.fpp rename to src/post_process/p_main.fypp diff --git a/src/pre_process/include/1dHardcodedIC.fpp b/src/pre_process/include/1dHardcodedIC.fypp similarity index 100% rename from src/pre_process/include/1dHardcodedIC.fpp rename to src/pre_process/include/1dHardcodedIC.fypp diff --git a/src/pre_process/include/2dHardcodedIC.fpp b/src/pre_process/include/2dHardcodedIC.fypp similarity index 100% rename from src/pre_process/include/2dHardcodedIC.fpp rename to src/pre_process/include/2dHardcodedIC.fypp diff --git a/src/pre_process/include/3dHardcodedIC.fpp b/src/pre_process/include/3dHardcodedIC.fypp similarity index 100% rename from src/pre_process/include/3dHardcodedIC.fpp rename to src/pre_process/include/3dHardcodedIC.fypp diff --git a/src/pre_process/m_assign_variables.fpp b/src/pre_process/m_assign_variables.fypp similarity index 99% rename from src/pre_process/m_assign_variables.fpp rename to src/pre_process/m_assign_variables.fypp index edb636ad2b..f434ce7ccf 100644 --- a/src/pre_process/m_assign_variables.fpp +++ b/src/pre_process/m_assign_variables.fypp @@ -2,7 +2,7 @@ !! @file m_assign_variables.f90 !! @brief Contains module m_assign_variables -#:include 'case.fpp' +#:include 'case.fypp' module m_assign_variables diff --git a/src/pre_process/m_check_ib_patches.fpp b/src/pre_process/m_check_ib_patches.fypp similarity index 99% rename from src/pre_process/m_check_ib_patches.fpp rename to src/pre_process/m_check_ib_patches.fypp index 40debc4d62..f5a07806f0 100644 --- a/src/pre_process/m_check_ib_patches.fpp +++ b/src/pre_process/m_check_ib_patches.fypp @@ -1,7 +1,7 @@ !> @brief This module contains subroutines that read, and check consistency !! of, the user provided inputs and data. -#:include 'macros.fpp' +#:include 'macros.fypp' module m_check_ib_patches diff --git a/src/pre_process/m_check_patches.fpp b/src/pre_process/m_check_patches.fypp similarity index 99% rename from src/pre_process/m_check_patches.fpp rename to src/pre_process/m_check_patches.fypp index 8ff89f2254..681b12a5b8 100644 --- a/src/pre_process/m_check_patches.fpp +++ b/src/pre_process/m_check_patches.fypp @@ -1,9 +1,9 @@ -#:include 'macros.fpp' +#:include 'macros.fypp' !> @brief This module contains subroutines that read, and check consistency !! of, the user provided inputs and data. -#:include 'macros.fpp' +#:include 'macros.fypp' module m_check_patches diff --git a/src/pre_process/m_checker.fpp b/src/pre_process/m_checker.fypp similarity index 99% rename from src/pre_process/m_checker.fpp rename to src/pre_process/m_checker.fypp index ec5600c76c..19e4ee4647 100644 --- a/src/pre_process/m_checker.fpp +++ b/src/pre_process/m_checker.fypp @@ -2,7 +2,7 @@ !!@file m_checker.f90 !!@brief Contains module m_checker -#:include 'macros.fpp' +#:include 'macros.fypp' !> @brief The purpose of the module is to check for compatible input files module m_checker diff --git a/src/pre_process/m_compute_levelset.fpp b/src/pre_process/m_compute_levelset.fypp similarity index 99% rename from src/pre_process/m_compute_levelset.fpp rename to src/pre_process/m_compute_levelset.fypp index d339157be6..4ae2f4a106 100644 --- a/src/pre_process/m_compute_levelset.fpp +++ b/src/pre_process/m_compute_levelset.fypp @@ -1,8 +1,8 @@ !> -!! @file m_compute_levelset.fpp +!! @file m_compute_levelset.fypp !! @brief Contains module m_compute_levelset -#:include 'macros.fpp' +#:include 'macros.fypp' !> @brief This module is used to handle all operations related to immersed !! boundary methods (IBMs) diff --git a/src/pre_process/m_data_output.fpp b/src/pre_process/m_data_output.fypp similarity index 100% rename from src/pre_process/m_data_output.fpp rename to src/pre_process/m_data_output.fypp diff --git a/src/pre_process/m_global_parameters.fpp b/src/pre_process/m_global_parameters.fypp similarity index 99% rename from src/pre_process/m_global_parameters.fpp rename to src/pre_process/m_global_parameters.fypp index 17e1d450ea..c808fbfd5f 100644 --- a/src/pre_process/m_global_parameters.fpp +++ b/src/pre_process/m_global_parameters.fypp @@ -2,7 +2,7 @@ !! @file m_global_parameters.f90 !! @brief Contains module m_global_parameters -#:include 'case.fpp' +#:include 'case.fypp' !> @brief This module contains all of the parameters characterizing the !! computational domain, simulation algorithm, initial condition diff --git a/src/pre_process/m_initial_condition.fpp b/src/pre_process/m_initial_condition.fypp similarity index 100% rename from src/pre_process/m_initial_condition.fpp rename to src/pre_process/m_initial_condition.fypp diff --git a/src/pre_process/m_model.fpp b/src/pre_process/m_model.fypp similarity index 99% rename from src/pre_process/m_model.fpp rename to src/pre_process/m_model.fypp index bbd50e52bd..7d0e1f6d5c 100644 --- a/src/pre_process/m_model.fpp +++ b/src/pre_process/m_model.fypp @@ -1,9 +1,9 @@ !> -!! @file m_model.fpp +!! @file m_model.fypp !! @author Henry Le Berre !! @brief Contains module m_model -#:include 'macros.fpp' +#:include 'macros.fypp' module m_model diff --git a/src/pre_process/m_mpi_proxy.fpp b/src/pre_process/m_mpi_proxy.fypp similarity index 100% rename from src/pre_process/m_mpi_proxy.fpp rename to src/pre_process/m_mpi_proxy.fypp diff --git a/src/pre_process/m_patches.fpp b/src/pre_process/m_patches.fypp similarity index 99% rename from src/pre_process/m_patches.fpp rename to src/pre_process/m_patches.fypp index 2a2ef17974..c62c80534b 100644 --- a/src/pre_process/m_patches.fpp +++ b/src/pre_process/m_patches.fypp @@ -1,12 +1,12 @@ !> -!! @file m_patches.fpp +!! @file m_patches.fypp !! @brief Contains module m_patches -#:include 'case.fpp' -#:include '1dHardcodedIC.fpp' -#:include '2dHardcodedIC.fpp' -#:include '3dHardcodedIC.fpp' -#:include 'macros.fpp' +#:include 'case.fypp' +#:include '1dHardcodedIC.fypp' +#:include '2dHardcodedIC.fypp' +#:include '3dHardcodedIC.fypp' +#:include 'macros.fypp' module m_patches diff --git a/src/pre_process/m_perturbation.fpp b/src/pre_process/m_perturbation.fypp similarity index 99% rename from src/pre_process/m_perturbation.fpp rename to src/pre_process/m_perturbation.fypp index 10c5b0f149..bfa9fffe82 100644 --- a/src/pre_process/m_perturbation.fpp +++ b/src/pre_process/m_perturbation.fypp @@ -1,5 +1,5 @@ !> -!! @file m_perturbation.fpp +!! @file m_perturbation.fypp !! @brief Contains module m_perturbation !> @brief This module contains subroutines that compute perturbations to the diff --git a/src/pre_process/m_start_up.fpp b/src/pre_process/m_start_up.fypp similarity index 100% rename from src/pre_process/m_start_up.fpp rename to src/pre_process/m_start_up.fypp diff --git a/src/simulation/include/inline_capillary.fpp b/src/simulation/include/inline_capillary.fypp similarity index 100% rename from src/simulation/include/inline_capillary.fpp rename to src/simulation/include/inline_capillary.fypp diff --git a/src/simulation/include/inline_riemann.fpp b/src/simulation/include/inline_riemann.fypp similarity index 100% rename from src/simulation/include/inline_riemann.fpp rename to src/simulation/include/inline_riemann.fypp diff --git a/src/simulation/m_acoustic_src.fpp b/src/simulation/m_acoustic_src.fypp similarity index 99% rename from src/simulation/m_acoustic_src.fpp rename to src/simulation/m_acoustic_src.fypp index eea8368457..de53ef481d 100644 --- a/src/simulation/m_acoustic_src.fpp +++ b/src/simulation/m_acoustic_src.fypp @@ -1,8 +1,8 @@ !> -!! @file m_acoustic_src.fpp +!! @file m_acoustic_src.fypp !! @brief Contains module m_acoustic_src -#:include 'macros.fpp' +#:include 'macros.fypp' !> @brief The module contains the subroutines used to create a acoustic source pressure source term module m_acoustic_src diff --git a/src/simulation/m_body_forces.fpp b/src/simulation/m_body_forces.fypp similarity index 99% rename from src/simulation/m_body_forces.fpp rename to src/simulation/m_body_forces.fypp index c27ca8e017..2536f977b6 100644 --- a/src/simulation/m_body_forces.fpp +++ b/src/simulation/m_body_forces.fypp @@ -1,4 +1,4 @@ -#:include 'macros.fpp' +#:include 'macros.fypp' module m_body_forces diff --git a/src/simulation/m_boundary_conditions.fpp b/src/simulation/m_boundary_conditions.fypp similarity index 99% rename from src/simulation/m_boundary_conditions.fpp rename to src/simulation/m_boundary_conditions.fypp index 073c62d072..2928b20048 100644 --- a/src/simulation/m_boundary_conditions.fpp +++ b/src/simulation/m_boundary_conditions.fypp @@ -1,5 +1,5 @@ !> -!! @file m_boundary_conditions.fpp +!! @file m_boundary_conditions.fypp !! @brief Contains module m_boundary_conditions !> @brief The purpose of the module is to apply noncharacteristic and processor diff --git a/src/simulation/m_bubbles.fpp b/src/simulation/m_bubbles.fypp similarity index 99% rename from src/simulation/m_bubbles.fpp rename to src/simulation/m_bubbles.fypp index b7b249139d..ee03cbbbdb 100644 --- a/src/simulation/m_bubbles.fpp +++ b/src/simulation/m_bubbles.fypp @@ -2,7 +2,7 @@ !! @file m_bubbles.f90 !! @brief Contains module m_bubbles -#:include 'macros.fpp' +#:include 'macros.fypp' !> @brief This module contains the procedures shared by the ensemble-averaged and volume-averaged bubble models. module m_bubbles diff --git a/src/simulation/m_bubbles_EE.fpp b/src/simulation/m_bubbles_EE.fypp similarity index 99% rename from src/simulation/m_bubbles_EE.fpp rename to src/simulation/m_bubbles_EE.fypp index 91e8c5f30e..7db72d1ece 100644 --- a/src/simulation/m_bubbles_EE.fpp +++ b/src/simulation/m_bubbles_EE.fypp @@ -2,7 +2,7 @@ !! @file m_bubbles_EE.f90 !! @brief Contains module m_bubbles_EE -#:include 'macros.fpp' +#:include 'macros.fypp' !> @brief This module is used to compute the ensemble-averaged bubble dynamic variables module m_bubbles_EE diff --git a/src/simulation/m_bubbles_EL.fpp b/src/simulation/m_bubbles_EL.fypp similarity index 99% rename from src/simulation/m_bubbles_EL.fpp rename to src/simulation/m_bubbles_EL.fypp index b48f941a39..a0f9e3c626 100644 --- a/src/simulation/m_bubbles_EL.fpp +++ b/src/simulation/m_bubbles_EL.fypp @@ -1,8 +1,8 @@ !> -!! @file m_bubbles_EL.fpp +!! @file m_bubbles_EL.fypp !! @brief Contains module m_bubbles_EL -#:include 'macros.fpp' +#:include 'macros.fypp' !> @brief This module is used to to compute the volume-averaged bubble model module m_bubbles_EL diff --git a/src/simulation/m_bubbles_EL_kernels.fpp b/src/simulation/m_bubbles_EL_kernels.fypp similarity index 99% rename from src/simulation/m_bubbles_EL_kernels.fpp rename to src/simulation/m_bubbles_EL_kernels.fypp index 43246aad55..8d2adac2bd 100644 --- a/src/simulation/m_bubbles_EL_kernels.fpp +++ b/src/simulation/m_bubbles_EL_kernels.fypp @@ -2,7 +2,7 @@ !! @file m_bubbles_EL_kernels.f90 !! @brief Contains module m_bubbles_EL_kernels -#:include 'macros.fpp' +#:include 'macros.fypp' !> @brief This module contains kernel functions used to map the effect of the lagrangian bubbles !! in the Eulerian framework. diff --git a/src/simulation/m_cbc.fpp b/src/simulation/m_cbc.fypp similarity index 99% rename from src/simulation/m_cbc.fpp rename to src/simulation/m_cbc.fypp index 278e4c055e..6bca6b3741 100644 --- a/src/simulation/m_cbc.fpp +++ b/src/simulation/m_cbc.fypp @@ -18,7 +18,7 @@ !! 8) Supersonic Outflow !! Please refer to Thompson (1987, 1990) for detailed descriptions. -#:include 'macros.fpp' +#:include 'macros.fypp' module m_cbc @@ -52,7 +52,7 @@ module m_cbc real(wp), allocatable, dimension(:, :, :, :) :: F_rsz_vf, F_src_rsz_vf !< !! There is a CCE bug that is causing some subset of these variables to interfere - !! with variables of the same name in m_riemann_solvers.fpp, and giving this versions + !! with variables of the same name in m_riemann_solvers.fypp, and giving this versions !! unique "_l" names works around the bug. Other private module allocatable arrays !! in `acc declare create` clauses don't have this problem, so we still need to !! isolate this bug. diff --git a/src/simulation/m_checker.fpp b/src/simulation/m_checker.fypp similarity index 99% rename from src/simulation/m_checker.fpp rename to src/simulation/m_checker.fypp index a7f6665df4..c758edc293 100644 --- a/src/simulation/m_checker.fpp +++ b/src/simulation/m_checker.fypp @@ -2,8 +2,8 @@ !!@file m_start_up.f90 !!@brief Contains module m_checker -#:include 'macros.fpp' -#:include 'case.fpp' +#:include 'macros.fypp' +#:include 'case.fypp' !> @brief The purpose of the module is to check for compatible input files module m_checker diff --git a/src/simulation/m_compute_cbc.fpp b/src/simulation/m_compute_cbc.fypp similarity index 100% rename from src/simulation/m_compute_cbc.fpp rename to src/simulation/m_compute_cbc.fypp diff --git a/src/simulation/m_data_output.fpp b/src/simulation/m_data_output.fypp similarity index 99% rename from src/simulation/m_data_output.fpp rename to src/simulation/m_data_output.fypp index c2e6ddba27..17e3573c56 100644 --- a/src/simulation/m_data_output.fpp +++ b/src/simulation/m_data_output.fypp @@ -2,7 +2,7 @@ !! @file m_data_output.f90 !! @brief Contains module m_data_output -#:include 'macros.fpp' +#:include 'macros.fypp' !> @brief The primary purpose of this module is to output the grid and the !! conservative variables data at the chosen time-step interval. In diff --git a/src/simulation/m_fftw.fpp b/src/simulation/m_fftw.fypp similarity index 99% rename from src/simulation/m_fftw.fpp rename to src/simulation/m_fftw.fypp index 4adae18b14..560d765c30 100644 --- a/src/simulation/m_fftw.fpp +++ b/src/simulation/m_fftw.fypp @@ -2,7 +2,7 @@ !! @file m_fftw.f90 !! @brief Contains module m_fftw -#:include 'macros.fpp' +#:include 'macros.fypp' !> @brief The module contains the subroutines for the FFT routines module m_fftw diff --git a/src/simulation/m_global_parameters.fpp b/src/simulation/m_global_parameters.fypp similarity index 99% rename from src/simulation/m_global_parameters.fpp rename to src/simulation/m_global_parameters.fypp index 6963d6dfe2..c8f50d59df 100644 --- a/src/simulation/m_global_parameters.fpp +++ b/src/simulation/m_global_parameters.fypp @@ -2,8 +2,8 @@ !! @file m_global_parameters.f90 !! @brief Contains module m_global_parameters -#:include 'case.fpp' -#:include 'macros.fpp' +#:include 'case.fypp' +#:include 'macros.fypp' !> @brief The module contains all of the parameters describing the program !! logistics, the computational domain and the simulation algorithm. diff --git a/src/simulation/m_hyperelastic.fpp b/src/simulation/m_hyperelastic.fypp similarity index 99% rename from src/simulation/m_hyperelastic.fpp rename to src/simulation/m_hyperelastic.fypp index 46addb7685..0ed42232f2 100644 --- a/src/simulation/m_hyperelastic.fpp +++ b/src/simulation/m_hyperelastic.fypp @@ -2,7 +2,7 @@ !! @file m_hyperelastic.f90 !! @brief Contains module m_hyperelastic -#:include 'macros.fpp' +#:include 'macros.fypp' !> @brief This module consists of subroutines used in the calculation !! of the cauchy tensor diff --git a/src/simulation/m_hypoelastic.fpp b/src/simulation/m_hypoelastic.fypp similarity index 99% rename from src/simulation/m_hypoelastic.fpp rename to src/simulation/m_hypoelastic.fypp index 2e676ba087..d09e364c89 100644 --- a/src/simulation/m_hypoelastic.fpp +++ b/src/simulation/m_hypoelastic.fypp @@ -2,7 +2,7 @@ !! @file m_hypoelastic.f90 !! @brief Contains module m_hypoelastic -#:include 'macros.fpp' +#:include 'macros.fypp' !> @brief This module is used to compute source terms for hypoelastic model module m_hypoelastic diff --git a/src/simulation/m_ibm.fpp b/src/simulation/m_ibm.fypp similarity index 99% rename from src/simulation/m_ibm.fpp rename to src/simulation/m_ibm.fypp index 0b07317c67..e94e0a587f 100644 --- a/src/simulation/m_ibm.fpp +++ b/src/simulation/m_ibm.fypp @@ -1,8 +1,8 @@ !> -!! @file m_ibm.fpp +!! @file m_ibm.fypp !! @brief Contains module m_ibm -#:include 'macros.fpp' +#:include 'macros.fypp' !> @brief This module is used to handle all operations related to immersed !! boundary methods (IBMs) diff --git a/src/simulation/m_mpi_proxy.fpp b/src/simulation/m_mpi_proxy.fypp similarity index 99% rename from src/simulation/m_mpi_proxy.fpp rename to src/simulation/m_mpi_proxy.fypp index 1764c06832..5dc8b59ad4 100644 --- a/src/simulation/m_mpi_proxy.fpp +++ b/src/simulation/m_mpi_proxy.fypp @@ -2,8 +2,8 @@ !! @file m_mpi_proxy.f90 !! @brief Contains module m_mpi_proxy -#:include 'case.fpp' -#:include 'macros.fpp' +#:include 'case.fypp' +#:include 'macros.fypp' !> @brief The module serves as a proxy to the parameters and subroutines !! available in the MPI implementation's MPI module. Specifically, diff --git a/src/simulation/m_qbmm.fpp b/src/simulation/m_qbmm.fypp similarity index 99% rename from src/simulation/m_qbmm.fpp rename to src/simulation/m_qbmm.fypp index 11298e4f71..90eeb68a48 100644 --- a/src/simulation/m_qbmm.fpp +++ b/src/simulation/m_qbmm.fypp @@ -2,8 +2,8 @@ !! @file m_qbmm.f90 !! @brief Contains module m_qbmm -#:include 'case.fpp' -#:include 'macros.fpp' +#:include 'case.fypp' +#:include 'macros.fypp' !> @brief This module is used to compute moment inversion via qbmm module m_qbmm diff --git a/src/simulation/m_rhs.fpp b/src/simulation/m_rhs.fypp similarity index 99% rename from src/simulation/m_rhs.fpp rename to src/simulation/m_rhs.fypp index d9617f9304..c002561efc 100644 --- a/src/simulation/m_rhs.fpp +++ b/src/simulation/m_rhs.fypp @@ -2,8 +2,8 @@ !! @file m_rhs.f90 !! @brief Contains module m_rhs -#:include 'case.fpp' -#:include 'macros.fpp' +#:include 'case.fypp' +#:include 'macros.fypp' !> @brief The module contains the subroutines used to calculate the right- !! hane-side (RHS) in the quasi-conservative, shock- and interface- diff --git a/src/simulation/m_riemann_solvers.fpp b/src/simulation/m_riemann_solvers.fypp similarity index 99% rename from src/simulation/m_riemann_solvers.fpp rename to src/simulation/m_riemann_solvers.fypp index 04513e71ae..5684b41587 100644 --- a/src/simulation/m_riemann_solvers.fpp +++ b/src/simulation/m_riemann_solvers.fypp @@ -18,9 +18,9 @@ !! 2) Harten-Lax-van Leer-Contact (HLLC) !! 3) Exact -#:include 'case.fpp' -#:include 'macros.fpp' -#:include 'inline_riemann.fpp' +#:include 'case.fypp' +#:include 'macros.fypp' +#:include 'inline_riemann.fypp' module m_riemann_solvers diff --git a/src/simulation/m_start_up.fpp b/src/simulation/m_start_up.fypp similarity index 99% rename from src/simulation/m_start_up.fpp rename to src/simulation/m_start_up.fypp index 547502ff66..40fddca4be 100644 --- a/src/simulation/m_start_up.fpp +++ b/src/simulation/m_start_up.fypp @@ -2,7 +2,7 @@ !! @file m_start_up.f90 !! @brief Contains module m_start_up -#:include 'case.fpp' +#:include 'case.fypp' !> @brief The purpose of the module is primarily to read in the files that !! contain the inputs, the initial condition data and the grid data diff --git a/src/simulation/m_surface_tension.fpp b/src/simulation/m_surface_tension.fypp similarity index 99% rename from src/simulation/m_surface_tension.fpp rename to src/simulation/m_surface_tension.fypp index 06b230c60e..b82b7fb896 100644 --- a/src/simulation/m_surface_tension.fpp +++ b/src/simulation/m_surface_tension.fypp @@ -1,5 +1,5 @@ -#:include 'macros.fpp' -#:include 'inline_capillary.fpp' +#:include 'macros.fypp' +#:include 'inline_capillary.fypp' !> @brief This module is used to compute source terms for surface tension model module m_surface_tension diff --git a/src/simulation/m_time_steppers.fpp b/src/simulation/m_time_steppers.fypp similarity index 99% rename from src/simulation/m_time_steppers.fpp rename to src/simulation/m_time_steppers.fypp index 2ffbc8e58b..7c83477c69 100644 --- a/src/simulation/m_time_steppers.fpp +++ b/src/simulation/m_time_steppers.fypp @@ -2,7 +2,7 @@ !! @file m_time_steppers.f90 !! @brief Contains module m_time_steppers -#:include 'macros.fpp' +#:include 'macros.fypp' !> @brief The following module features a variety of time-stepping schemes. !! Currently, it includes the following Runge-Kutta (RK) algorithms: diff --git a/src/simulation/m_viscous.fpp b/src/simulation/m_viscous.fypp similarity index 99% rename from src/simulation/m_viscous.fpp rename to src/simulation/m_viscous.fypp index 44d6bbf62a..511094af7d 100644 --- a/src/simulation/m_viscous.fpp +++ b/src/simulation/m_viscous.fypp @@ -1,7 +1,7 @@ !> !! @file m_viscous.f90 !! @brief Contains module m_viscous -#:include 'macros.fpp' +#:include 'macros.fypp' !> @brief The module contains the subroutines used to compute viscous terms. module m_viscous diff --git a/src/simulation/m_weno.fpp b/src/simulation/m_weno.fypp similarity index 99% rename from src/simulation/m_weno.fpp rename to src/simulation/m_weno.fypp index feb182b60f..64dfd5533e 100644 --- a/src/simulation/m_weno.fpp +++ b/src/simulation/m_weno.fypp @@ -1,7 +1,7 @@ !> !! @file m_weno.f90 !! @brief Contains module m_weno -#:include 'macros.fpp' +#:include 'macros.fypp' !> @brief Weighted essentially non-oscillatory (WENO) reconstruction scheme !! that is supplemented with monotonicity preserving bounds (MPWENO) diff --git a/src/simulation/p_main.fpp b/src/simulation/p_main.fypp similarity index 100% rename from src/simulation/p_main.fpp rename to src/simulation/p_main.fypp diff --git a/src/syscheck/syscheck.fpp b/src/syscheck/syscheck.fypp similarity index 100% rename from src/syscheck/syscheck.fpp rename to src/syscheck/syscheck.fypp diff --git a/toolchain/bootstrap/format.sh b/toolchain/bootstrap/format.sh index f4baea506a..b12d9e6b52 100644 --- a/toolchain/bootstrap/format.sh +++ b/toolchain/bootstrap/format.sh @@ -17,7 +17,7 @@ done log "Formatting MFC:" -if ! find ${@:-src} -type f | grep -Ev 'autogen' | grep -E '\.(f90|fpp)$' \ +if ! find ${@:-src} -type f | grep -Ev 'autogen' | grep -E '\.(f90|fypp)$' \ | xargs -L 1 -P ${JOBS:-1} $SHELL toolchain/bootstrap/format_file.sh; then error "Formatting MFC source failed." exit 1 diff --git a/toolchain/mfc/build.py b/toolchain/mfc/build.py index 2de738986d..18febe9b03 100644 --- a/toolchain/mfc/build.py +++ b/toolchain/mfc/build.py @@ -39,7 +39,7 @@ def get_slug(self, case: Case ) -> str: m = hashlib.sha256() m.update(self.name.encode()) m.update(CFG().make_slug().encode()) - m.update(case.get_fpp(self, False).encode()) + m.update(case.get_fypp(self, False).encode()) if case.params.get('chemistry', 'F') == 'T': m.update(case.get_cantera_solution().name.encode()) @@ -150,7 +150,7 @@ def configure(self, case: Case): delete_directory(build_dirpath) create_directory(build_dirpath) - case.generate_fpp(self) + case.generate_fypp(self) if system(command).returncode != 0: raise MFCException(f"Failed to configure the [bold magenta]{self.name}[/bold magenta] target.") @@ -158,7 +158,7 @@ def configure(self, case: Case): cons.print(no_indent=True) def build(self, case: input.MFCInputFile): - case.generate_fpp(self) + case.generate_fypp(self) command = ["cmake", "--build", self.get_staging_dirpath(case), "--target", self.name, diff --git a/toolchain/mfc/case.py b/toolchain/mfc/case.py index 30f835a74b..3db2b619c6 100644 --- a/toolchain/mfc/case.py +++ b/toolchain/mfc/case.py @@ -94,7 +94,7 @@ def __is_ic_analytical(self, key: str, val: str) -> bool: return False # pylint: disable=too-many-locals - def __get_pre_fpp(self, print: bool) -> str: + def __get_pre_fypp(self, print: bool) -> str: DATA = { 1: {'ptypes': [1, 15, 16], 'sf_idx': 'i, 0, 0'}, 2: {'ptypes': [2, 3, 4, 5, 6, 7, 17, 18, 21], 'sf_idx': 'i, j, 0'}, @@ -170,7 +170,7 @@ def rhs_replace(match): return content - def __get_sim_fpp(self, print: bool) -> str: + def __get_sim_fypp(self, print: bool) -> str: if ARG("case_optimization"): if print: cons.print("Case optimization is enabled.") @@ -219,7 +219,7 @@ def __get_sim_fpp(self, print: bool) -> str: ! of --case-optimization. """ - def get_fpp(self, target, print = True) -> str: + def get_fypp(self, target, print = True) -> str: def _prepend() -> str: return f"""\ #:set chemistry = {self.params.get("chemistry", 'F') == 'T'} @@ -229,8 +229,8 @@ def _default(_) -> str: return "! This file is purposefully empty." result = { - "pre_process" : self.__get_pre_fpp, - "simulation" : self.__get_sim_fpp, + "pre_process" : self.__get_pre_fypp, + "simulation" : self.__get_sim_fypp, }.get(build.get_target(target).name, _default)(print) return _prepend() + result diff --git a/toolchain/mfc/run/input.py b/toolchain/mfc/run/input.py index 126fb032ba..d732a3ff65 100644 --- a/toolchain/mfc/run/input.py +++ b/toolchain/mfc/run/input.py @@ -24,14 +24,14 @@ def generate_inp(self, target) -> None: # Save .inp input file common.file_write(f"{self.dirpath}/{target.name}.inp", self.get_inp(target)) - def __save_fpp(self, target, contents: str) -> None: + def __save_fypp(self, target, contents: str) -> None: inc_dir = os.path.join(target.get_staging_dirpath(self), "include", target.name) common.create_directory(inc_dir) - fpp_path = os.path.join(inc_dir, "case.fpp") + fypp_path = os.path.join(inc_dir, "case.fypp") - cons.print("Writing a (new) custom case.fpp file.") - common.file_write(fpp_path, contents, True) + cons.print("Writing a (new) custom case.fypp file.") + common.file_write(fypp_path, contents, True) def get_cantera_solution(self) -> ct.Solution: if self.params.get("chemistry", 'F') == 'T': @@ -56,15 +56,15 @@ def get_cantera_solution(self) -> ct.Solution: raise common.MFCException(f"Cantera file '{cantera_file}' not found. Searched: {', '.join(candidates)}.") - def generate_fpp(self, target) -> None: + def generate_fypp(self, target) -> None: if target.isDependency: return - cons.print(f"Generating [magenta]case.fpp[/magenta].") + cons.print(f"Generating [magenta]case.fypp[/magenta].") cons.indent() - # Case FPP file - self.__save_fpp(target, self.get_fpp(target)) + # Case FYPP file + self.__save_fypp(target, self.get_fypp(target)) # (Thermo)Chemistry source file modules_dir = os.path.join(target.get_staging_dirpath(self), "modules", target.name) @@ -87,11 +87,11 @@ def generate_fpp(self, target) -> None: cons.unindent() - # Generate case.fpp & [target.name].inp + # Generate case.fypp & [target.name].inp def generate(self, target) -> None: self.generate_inp(target) cons.print() - self.generate_fpp(target) + self.generate_fypp(target) def clean(self, _targets) -> None: targets = [build.get_target(target) for target in _targets]