Renaming mixed rk to MixedRK in the codebase

Author: AbbBallout

.github/workflows/CI_parallel.yml

@@ -1172,7 +1172,7 @@ jobs:
         if: ('!cancelled()')
 
 #
-# 8) Mixed RK
+# 8) MixedRK
 # ----------------------------
       - name: Build MultiphaseMixedRK
         working-directory: ./Solver/test/Multiphase/MixedRK/SETUP

.github/workflows/CI_sequential 3.yml

@@ -337,7 +337,7 @@ jobs:
         if: ('!cancelled()')
 
 #
-# 10) Mixed RK
+# 10) MixedRK
 # ----------------------------
       - name: Build MultiphaseMixedRK
         working-directory: ./Solver/test/Multiphase/MixedRK/SETUP

Solver/src/libs/discretization/DGSEMClass.f90

@@ -268,8 +268,8 @@ SUBROUTINE ConstructDGSem( self, meshFileName_, controlVariables, &
 !           -------------------------
             call constructMeshFromFile( self % mesh, self % mesh % meshFileName, CurrentNodes, Nx, Ny, Nz, MeshInnerCurves , dir2D, useRelaxPeriodic, success )
 
-!           initialize the solution if the time stepping scheme is mixed RK, since Q is needed in the METIS partitioning  
-            if(trim(controlVariables % stringValueForKey('explicit method', requestedLength = LINE_LENGTH)) == 'mixed rk') then
+!           initialize the solution if the time stepping scheme is MixedRK, since Q is needed in the METIS partitioning  
+            if(trim(controlVariables % stringValueForKey('explicit method', requestedLength = LINE_LENGTH)) == 'MixedRK') then
                call self % mesh % CheckIfMeshIs2D(.true.)
                call self % mesh % ConstructGeometry()
                call self % mesh % AllocateStorage(self % NDOF, controlVariables,computeGradients)

Solver/src/libs/mesh/HexMesh.f90

@@ -1886,7 +1886,7 @@ END SUBROUTINE WriteCoordFile
 !
       subroutine HexMesh_CheckIfMeshIs2D(self, ignore_mpi_section)
          implicit none
-         logical, optional , intent(in)    :: ignore_mpi_section !added bool to ignore the mpi section in this code. First used in relation to mixed RK stepping 
+         logical, optional , intent(in)    :: ignore_mpi_section !added bool to ignore the mpi section in this code. First used in relation to MixedRK stepping 
 
          !-arguments---------------------------------------
          class(HexMesh),   intent(inout) :: self

Solver/src/libs/mesh/METISPartitioning.f90

@@ -2,7 +2,7 @@ subroutine GetMETISElementsPartition(mesh, no_of_domains, elementsDomain, nodesD
 !
 !     *********************************************************************
 !        This subroutine performs the mesh partitioning using METIS
-!        and then manual load balancing for mixed RK used in multiphase
+!        and then manual load balancing for MixedRK used in multiphase
 !     *********************************************************************
 !        
       use HexMeshClass
@@ -57,7 +57,7 @@ subroutine GetMETISElementsPartition(mesh, no_of_domains, elementsDomain, nodesD
 
       ! Check if we should do water/air counting based on explicit method
       do_water_air_count = .false.
-      if(trim(controlVariables % stringValueForKey('explicit method', requestedLength = LINE_LENGTH)) == 'mixed rk') then
+      if(trim(controlVariables % stringValueForKey('explicit method', requestedLength = LINE_LENGTH)) == 'MixedRK') then
           do_water_air_count = .true.
       end if
 

Solver/src/libs/timeintegrator/ExplicitMethods.f90

@@ -41,7 +41,7 @@ MODULE ExplicitMethods
    character(len=*), parameter :: SSPRK43_NAME = "ssprk43"
    character(len=*), parameter :: EULER_RK3_NAME = "euler rk3"
    character(len=*), parameter :: LSERK14_4_NAME = "lserk14-4"
-   character(len=*), parameter :: MIXED_RK_NAME = "mixed rk"
+   character(len=*), parameter :: MIXED_RK_NAME = "mixedrk"
    character(len=*), parameter :: ML_RK3_NAME  = "multi level rk3"
 
 
@@ -212,10 +212,10 @@ SUBROUTINE TakeMixedRKStep( mesh, particles, t, deltaT, ComputeTimeDerivative ,
 !
 !        *****************************************************************************************
 !          Uses RK3 in phase1 and LSERK14-4 in phase2, think phase1 is air and phase2 is water. Of course, this will only yield an advantage if: 
-!          - you can get away with a time step using the mixed RK that is 5x times larger than that in pure RK3 scheme,
+!          - you can get away with a time step using the MixedRK that is 5x times larger than that in pure RK3 scheme,
 !          - AND if there are at LEAST 20+% air elements (aim for 50% or more)
 !          A stand-alone LSERK14-4 implimetnation is given in TakeLSERK14_4Step
-!          The mixed RK scheme is valid only for the multiphase solver and throws an error otherwise,  
+!          The MixedRK scheme is valid only for the multiphase solver and throws an error otherwise,  
 !          However, the rest of this function still has its implementation consistent
 !          with the other RK steppers in case anyone needed to extend it
 !        *****************************************************************************************
@@ -247,7 +247,7 @@ SUBROUTINE TakeMixedRKStep( mesh, particles, t, deltaT, ComputeTimeDerivative ,
 
 
 #if !defined(MULTIPHASE)
-   error stop 'Mixed RK time stepping is only implemented for the multiphase solver'
+   error stop 'MixedRK time stepping is only implemented for the multiphase solver'
 #else
 
       ! Arrays to store the original solution for all elements

Solver/src/libs/timeintegrator/TimeIntegrator.f90

@@ -365,7 +365,7 @@ SUBROUTINE constructTimeIntegrator(self,controlVariables, sem, initial_iter, ini
             case (EULER_RK3_KEY)
                write(STD_OUT,'(A)') "Euler-RK3"
             case (MIXED_RK_KEY)
-               write(STD_OUT,'(A)') "Mixed rk"
+               write(STD_OUT,'(A)') "MixedRK"
 			case (ML_RK3_KEY)
                write(STD_OUT,'(A)') "Multi-Level RK3"
 			   write(STD_OUT,'(35X,A,A23,I14)')   "->" , "Number of Level: ", self % ML_nLevel

Solver/test/Multiphase/MixedRK/mixedRK.control

@@ -55,7 +55,7 @@ interface width (m) = 0.01
 interface tension (N/m) = 1e-16   !72.8e-3
 
 Time integration = Explicit
-explicit method  = mixed rk 
+explicit method  = MixedRK 
 
 partitioning = METIS
 

doc/UserManual.tex

@@ -1064,7 +1064,7 @@ \chapter{Explicit Solvers}
 
 \textbf{simulation type} & \textit{CHARACTER}: Specifies if HORSES3D must perform a ’steady-state’ or a ’time-accurate’. If 'time-accurate' the solver switches to BDF integration and uses FAS as a pseudo problem solver. Compatible only with 'FAS'. & 'steady-state' \\ \hline
 
-explicit method & \textit{CHARACTER}: Select desired Runge-Kutta solver. Options are: 'Euler', 'RK3', 'RK5', 'RKOpt', 'SSPRK33',  'SSPRK43', 'EULER RK3', and Mixed RK. The option 'EULER RK3' is a hybrid temporal scheme thought to be used with RL p-Adaptation and BR1 as viscous discretization. & RK3 \\ \hline
+explicit method & \textit{CHARACTER}: Select desired Runge-Kutta solver. Options are: 'Euler', 'RK3', 'RK5', 'RKOpt', 'SSPRK33',  'SSPRK43', 'EULER RK3', and MixedRK. The option 'EULER RK3' is a hybrid temporal scheme thought to be used with RL p-Adaptation and BR1 as viscous discretization. & RK3 \\ \hline
 
 rk order & \textit{INTEGER}: Order of Runge-Kutta method optimized for steady-state solver ('RKOpt'). Possible orders are from 2 to 7. & 2 \\ \hline
 

doc/pages/user_manual/explicit-solvers.md

@@ -9,7 +9,7 @@ The main keywords to use it are shown in the table below
 |---------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------|
 | time integration    | *CHARACTER*: This is the main keyword to activate the multigrid solvers. The value of it should be set to 'FAS' for the Full Approximation Scheme (FAS) nonlinear multigrid  solvers and to 'AnisFAS' for anisotropic FAS schemes.                                                                 | 'explicit'    |
 | simulation type     | *CHARACTER*: Specifies if HORSES3D must perform a ’steady-state’ or a ’time-accurate’. If 'time-accurate' the solver switches to BDF integration and uses FAS as a pseudo problem solver. Compatible only with 'FAS'.                                                                                  | 'steady-state' |
-| explicit method     | *CHARACTER*: Select desired Runge-Kutta solver. Options are: 'Euler', 'RK3', 'RK5', 'RKOpt', 'SSPRK33', 'SSPRK43, and 'Mixed RK'                                                                                                                                                                            | RK3           |
+| explicit method     | *CHARACTER*: Select desired Runge-Kutta solver. Options are: 'Euler', 'RK3', 'RK5', 'RKOpt', 'SSPRK33', 'SSPRK43, and 'MixedRK'                                                                                                                                                                            | RK3           |
 | rk order            | *INTEGER*: Order of Runge-Kutta method optimized for steady-state solver ('RKOpt'). Possible orders are from 2 to 7.                                                                                                                                                                                  | 2             |
 | limit timestep      | *LOGICAL*: Activate the positivity limiter of Zhang and Shu (only for SSPRK methods).                                                                                                                                                                                                                | .false.       |
 | limiter minimum     | *REAL*: Minimum value of density and pressure allowed by the limiter.                                                                                                                                                                                                                               | 1e-13         |