Merge branch 'master' into MTHINC

Author: sbryngelson

.github/scripts/submit-slurm-job.sh

@@ -51,7 +51,7 @@ case "$cluster" in
         compiler_flag="f"
         account="CFD154"
         job_prefix="MFC"
-        qos="develop"
+        qos="hackathon"
         extra_sbatch=""
         test_time="01:59:00"
         bench_time="01:59:00"
@@ -61,7 +61,7 @@ case "$cluster" in
         compiler_flag="famd"
         account="CFD154"
         job_prefix="MFC"
-        qos="develop"
+        qos="hackathon"
         extra_sbatch=""
         test_time="01:59:00"
         bench_time="01:59:00"
@@ -92,7 +92,7 @@ if [ "$device" = "cpu" ]; then
         frontier|frontier_amd)
             sbatch_device_opts="\
 #SBATCH -n 32
-#SBATCH -p service"
+#SBATCH -p batch"
             ;;
     esac
 elif [ "$device" = "gpu" ]; then
@@ -120,7 +120,7 @@ elif [ "$device" = "gpu" ]; then
         frontier|frontier_amd)
             sbatch_device_opts="\
 #SBATCH -n 8
-#SBATCH -p service"
+#SBATCH -p batch"
             ;;
     esac
 else

src/simulation/p_main.fpp

@@ -3,11 +3,6 @@
 !! @brief Contains program p_main
 
 !> @brief Quasi-conservative, shock- and interface- capturing finite-volume scheme for the multicomponent Navier-Stokes equations.
-!! The system is augmented with the relevant advection equations to capture the material interfaces and closed by the stiffened
-!! equation of state as well as any required mixture relations. The effects of surface tension are included and modeled through a
-!! volume force that acts across the diffuse material interface regions. The implementation specifics of surface tension may be
-!! found in the work by Perigaud and Saurel (2005). Note that both viscous and capillarity effects are only available in the volume
-!! fraction model.
 program p_main
 
     use m_global_parameters