Merge pull request #107 from anshgupta1234/post_tests

Author: sbryngelson

.github/workflows/ci.yml

@@ -49,7 +49,7 @@ jobs:
         run:  /bin/bash mfc.sh build -j $(nproc)
 
       - name: Test Suite
-        run:  /bin/bash mfc.sh test  -j $(nproc)
+        run:  /bin/bash mfc.sh test  -j $(nproc) -a
 
   self-cpu:
     name: (Self) Test Suite - CPU
@@ -69,14 +69,14 @@ jobs:
       - name: Build
         run:  |
           module use /opt/nvidia/hpc_sdk/modulefiles/
-          module load nvhpc/22.11
+          module load nvhpc
           /bin/bash mfc.sh build -j 4
 
       - name: Test Suite
         run:  |
           module use /opt/nvidia/hpc_sdk/modulefiles/
-          module load nvhpc/22.11
-          /bin/bash mfc.sh test  -j 4
+          module load nvhpc
+          /bin/bash mfc.sh test  -j 4 -a
 
   self-gpu:
     name: (Self) Test Suite - GPU
@@ -96,12 +96,12 @@ jobs:
       - name: Build
         run:  |
           module use /opt/nvidia/hpc_sdk/modulefiles/
-          module load nvhpc/22.11
+          module load nvhpc
           /bin/bash mfc.sh build -j 4 --gpu
 
       - name: Test Suite
         run:  |
           module use /opt/nvidia/hpc_sdk/modulefiles/
-          module load nvhpc/22.11
-          /bin/bash mfc.sh test  -b mpirun --gpu
+          module load nvhpc
+          /bin/bash mfc.sh test  -b mpirun --gpu -a
 

src/common/m_variables_conversion.fpp

@@ -681,7 +681,7 @@ contains
                     ! If pre-processing, use non acc mixture subroutines
                         if (hypoelasticity) then
                             call s_convert_to_mixture_variables(qK_cons_vf, j, k, l, &
-                                                                rho_K, gamma_K, pi_inf_K, Re_K, G_K)
+                                                                rho_K, gamma_K, pi_inf_K, Re_K, G_K, fluid_pp(:)%G)
                         else
                             call s_convert_to_mixture_variables(qK_cons_vf, j, k, l, &
                                                                 rho_K, gamma_K, pi_inf_K)

toolchain/mfc/args.py

@@ -69,6 +69,7 @@ def add_common_arguments(p, mask = None):
     test.add_argument("-o", "--only",        nargs="+", type=str, default=[], metavar="L", help="Only run tests with UUIDs or hashes L.")
     test.add_argument("-b", "--binary",      choices=binaries, type=str, default=None, help="(Serial) Override MPI execution binary")
     test.add_argument("-r", "--relentless",  action="store_true", default=False, help="Run all tests, even if multiple fail.")
+    test.add_argument("-a", "--test-all",  action="store_true", default=False, help="Run the Post Process Tests too.")
     test.add_argument("--case-optimization", action="store_true", default=False, help="(GPU Optimization) Compile MFC targets with some case parameters hard-coded.")
 
     # === RUN ===

toolchain/mfc/test/case.py

@@ -101,7 +101,7 @@ def __init__(self, trace: str, mods: dict, ppn: int = None) -> None:
         self.ppn   = ppn if ppn is not None else 1
         super().__init__({**BASE_CFG.copy(), **mods})
 
-    def run(self) -> subprocess.CompletedProcess:
+    def run(self, post_process_toggle) -> subprocess.CompletedProcess:
         filepath          = f'"{self.get_dirpath()}/case.py"'
         tasks             = f"-n {self.ppn}"
         jobs              = f"-j {ARG('jobs')}"    if ARG("case_optimization")  else ""
@@ -110,10 +110,16 @@ def run(self) -> subprocess.CompletedProcess:
 
         mfc_script = ".\mfc.bat" if os.name == 'nt' else "./mfc.sh"
 
-        command: str = f'''\
-{mfc_script} run {filepath} {tasks} {binary_option} {case_optimization} \
-{jobs} -t pre_process simulation 2>&1\
-'''
+        if post_process_toggle:
+            command: str = f'''\
+                {mfc_script} run {filepath} {tasks} {binary_option} {case_optimization} \
+                {jobs} 2>&1\
+                '''
+        else:
+            command: str = f'''\
+                {mfc_script} run {filepath} {tasks} {binary_option} {case_optimization} \
+                {jobs} -t pre_process simulation 2>&1\
+                '''
 
         return subprocess.run(command, stdout=subprocess.PIPE,
                               stderr=subprocess.PIPE, universal_newlines=True,

toolchain/mfc/test/cases.py

@@ -271,7 +271,6 @@ def alter_bubbles(dimInfo, dimParams):
             if len(dimInfo[0]) >= 3:
                 stack.pop()
 
-
     def alter_hypoelasticity(dimInfo, dimParams):
         # Hypoelasticity checks
         for num_fluids in [1,2]:

toolchain/mfc/test/test.py

@@ -11,6 +11,8 @@
 from .         import pack as packer
 
 import rich, rich.table
+import h5py
+import numpy as np
 
 
 CASES = generate_cases()
@@ -81,7 +83,7 @@ def test():
         return
 
     if not ARG("case_optimization"):
-        build_targets(["pre_process", "simulation"])
+        build_targets(["pre_process", "simulation", "post_process"])
 
     range_str = f"from [bold magenta]{ARG('from')}[/bold magenta] to [bold magenta]{ARG('to')}[/bold magenta]"
 
@@ -110,17 +112,34 @@ def test():
         sched.Task(ppn=case.ppn, func=handle_case, args=[ case ]) for case in CASES
     ]
     sched.sched(tasks, nThreads)
-    
+
     cons.print()
     if nFAIL == 0:
-        cons.print(f"Tested [bold green]✓[/bold green]")
-        cons.unindent()
+        cons.print(f"Tested Simulation [bold green]✓[/bold green]")
     else:
         if nFAIL == 1:
             raise MFCException(f"Testing: There was [bold red]1[/bold red] failure.")
         else:
             raise MFCException(f"Testing: There were [bold red]{nFAIL}[/bold red] failures.")
 
+    if ARG("test_all"):
+        cons.print(f"Now testing post process...")
+        cons.print()
+        nFAIL = 0
+        tasks = [
+            sched.Task(ppn=case.ppn, func=handle_case_post_process, args=[ case ]) for case in CASES
+        ]
+        sched.sched(tasks, nThreads)
+        cons.print()
+        if nFAIL == 0:
+            cons.print(f"Tested Post Process [bold green]✓[/bold green]")
+        else:
+            if nFAIL == 1:
+                raise MFCException(f"Testing: There was [bold red]1[/bold red] failure.")
+            else:
+                raise MFCException(f"Testing: There were [bold red]{nFAIL}[/bold red] failures.")
+    cons.unindent()
+
 
 def handle_case(test: TestCase):
     global nFAIL
@@ -137,7 +156,7 @@ def handle_case(test: TestCase):
         else:
             tol = 1e-12
 
-        cmd = test.run()
+        cmd = test.run(False)
 
         out_filepath = os.path.join(test.get_dirpath(), "out.txt")
 
@@ -161,6 +180,7 @@ def handle_case(test: TestCase):
             packer.check_tolerance(test, pack, packer.load(golden_filepath), tol)
 
         cons.print(f"  [bold magenta]{test.get_uuid()}[/bold magenta]    {test.trace}")
+
     except Exception as exc:
         nFAIL = nFAIL + 1
 
@@ -169,3 +189,71 @@ def handle_case(test: TestCase):
 
         cons.print(f"[bold red]Failed test {test}.[/bold red]")
         cons.print(f"{exc}")
+
+def handle_case_post_process(test: TestCase):
+    global nFAIL
+    
+    try:
+        test.params.update({
+            'parallel_io'       : 'T',
+            'cons_vars_wrt'     : 'T',
+            'prim_vars_wrt'     : 'T',
+            'alpha_rho_wrt(1)'  : 'T',
+            'rho_wrt'           : 'T',
+            'mom_wrt(1)'        : 'T',
+            'vel_wrt(1)'        : 'T',
+            'E_wrt'             : 'T',
+            'pres_wrt'          : 'T',
+            'alpha_wrt(1)'      : 'T',
+            'gamma_wrt'         : 'T',
+            'heat_ratio_wrt'    : 'T',
+            'pi_inf_wrt'        : 'T',
+            'pres_inf_wrt'      : 'T',
+            'c_wrt'             : 'T',
+        })
+
+        if test.params['p'] != 0:
+            test.params['omega_wrt'] = 'T'
+            test.params['fd_order'] = 1
+
+        test.create_directory()
+
+        cmd = test.run(True)
+
+        out_filepath = os.path.join(test.get_dirpath(), "out_pp.txt")
+
+        common.file_write(out_filepath, cmd.stdout)
+
+        if cmd.returncode != 0:
+            cons.print(cmd.stdout)
+            raise MFCException(f"""Test {test}: Failed to execute MFC. You can find the run's output in {out_filepath}, and the case dictionary in {os.path.join(test.get_dirpath(), "case.py")}.""")
+
+        silo_filepath = os.path.join(test.get_dirpath(), 'silo_hdf5', 'p0', '50.silo')
+        f = h5py.File(silo_filepath, 'r')
+        silo = f['.silo']
+        for key in silo.keys():
+            dataset = silo[key]
+            for data in dataset:
+                check_data(data)
+        
+        cons.print(f"  [bold magenta]{test.get_uuid()}[/bold magenta]    {test.trace}")
+
+    except Exception as exc:
+        nFAIL = nFAIL + 1
+
+        if not ARG("relentless"):
+            raise exc
+
+        cons.print(f"[bold red]Failed test {test}.[/bold red]")
+        cons.print(f"{exc}")
+
+def check_data(data):
+    if isinstance(data, np.ndarray):
+        for subdata in data:
+            check_data(subdata)
+    else:
+        if np.isnan(data):
+            raise MFCException(f"""Test {test}: Post Process has detected a NaN. You can find the run's output in {out_filepath}, and the case dictionary in {os.path.join(test.get_dirpath(), "case.py")}.""")
+        if np.isinf(data):
+            raise MFCException(f"""Test {test}: Post Process has detected an Infinity. You can find the run's output in {out_filepath}, and the case dictionary in {os.path.join(test.get_dirpath(), "case.py")}.""")
+

toolchain/requirements.txt

@@ -5,3 +5,4 @@ typing
 PyYAML
 argparse
 dataclasses
+h5py