Merge remote-tracking branch 'upstream/master' into 6EqnEnergiesOutput

Author: wilfonba

.github/workflows/phoenix/submit-bench.sh

@@ -42,7 +42,7 @@ sbatch <<EOT
 #SBATCH --account=gts-sbryngelson3 # charge account
 #SBATCH -N1                        # Number of nodes required
 $sbatch_device_opts
-#SBATCH -t 02:00:00                # Duration of the job (Ex: 15 mins)
+#SBATCH -t 03:00:00                # Duration of the job (Ex: 15 mins)
 #SBATCH -q embers                  # QOS Name
 #SBATCH -o$job_slug.out            # Combined output and error messages file
 #SBATCH -W                         # Do not exit until the submitted job terminates.

src/simulation/m_bubbles.fpp

@@ -4,7 +4,7 @@
 
 #:include 'macros.fpp'
 
-!> @brief This module contains the procedures shared by the ensemble-averaged and volume-averaged bubble models.
+!> @brief This module contains procedures shared by the ensemble-averaged and volume-averaged bubble models.
 module m_bubbles
 
     use m_derived_types        !< Definitions of the derived types