fix regression test residuals

Author: bigfooted

TestCases/parallel_regression.py

@@ -1479,17 +1479,17 @@ def main():
     pywrapper_buoyancy = TestCase('pywrapper_buoyancy')
     pywrapper_buoyancy.cfg_dir = "py_wrapper/custom_source_buoyancy"
     pywrapper_buoyancy.cfg_file = "lam_buoyancy_cavity.cfg"
-    pywrapper_buoyancy.test_iter = 1
-    pywrapper_buoyancy.test_vals = [0.500000]
+    pywrapper_buoyancy.test_iter = 0
+    pywrapper_buoyancy.test_vals = [-17.746018,  -17.462127,  -17.428851,  -12.260605]
     pywrapper_buoyancy.command = TestCase.Command("mpirun -np 2", "python", "run.py")
     test_list.append(pywrapper_buoyancy)
 
     # custom source: turbulent flamespeed closure (Zimont model) for PSI testcase
     pywrapper_zimont = TestCase('pywrapper_zimont')
     pywrapper_zimont.cfg_dir = "py_wrapper/turbulent_premixed_psi"
     pywrapper_zimont.cfg_file = "psi.cfg"
-    pywrapper_zimont.test_iter = 1
-    pywrapper_zimont.test_vals = [0.500000]
+    pywrapper_zimont.test_iter = 0
+    pywrapper_zimont.test_vals = [-3.229704,   -1.602176,   -3.904854,   -2.631849,   -0.325639,   -3.498356]
     pywrapper_zimont.command = TestCase.Command("mpirun -np 2", "python", "run.py")
     test_list.append(pywrapper_zimont)
 

TestCases/py_wrapper/custom_source_buoyancy/run.py

@@ -77,7 +77,7 @@ def main():
   sys.stdout.flush()
 
   # run N iterations
-  for inner_iter in range(11):
+  for inner_iter in range(2):
     if (rank==0):
       print("python iteration ", inner_iter)
 

TestCases/py_wrapper/turbulent_premixed_psi/psi.cfg

@@ -143,10 +143,8 @@ CONV_STARTITER= 10
 MESH_FILENAME= psi.su2
 %
 SCREEN_OUTPUT= INNER_ITER WALL_TIME \
-               RMS_PRESSURE RMS_VELOCITY-X RMS_VELOCITY-Y RMS_TKE RMS_DISSIPATION RMS_SPECIES_0 \
-               LINSOL_ITER LINSOL_RESIDUAL \
-               LINSOL_ITER_TURB LINSOL_RESIDUAL_TURB \
-               LINSOL_ITER_SPECIES LINSOL_RESIDUAL_SPECIES AVG_CFL
+               RMS_PRESSURE RMS_VELOCITY-X RMS_VELOCITY-Y RMS_TKE RMS_DISSIPATION RMS_SPECIES_0
+
 SCREEN_WRT_FREQ_INNER= 1
 %
 HISTORY_OUTPUT= ITER RMS_RES LINSOL SPECIES_COEFF SPECIES_COEFF_SURF

TestCases/py_wrapper/turbulent_premixed_psi/run.py

@@ -27,7 +27,6 @@
 
 import sys
 import pysu2
-from mpi4py import MPI
 import numpy as np
 
 # with mpi:
@@ -77,9 +76,7 @@ def initC(coord):
 def SetInitialSpecies(SU2Driver):
     allCoords = SU2Driver.Coordinates()
     iSPECIESSOLVER = SU2Driver.GetSolverIndices()['SPECIES']
-    print("index of species solver = ",iSPECIESSOLVER)
     nVarsSpecies = SU2Driver.GetNumberSolverVars(iSPECIESSOLVER)
-    print("number of species solver variables:",nVarsSpecies)
     for iPoint in range(SU2Driver.GetNumberNodes() - SU2Driver.GetNumberHaloNodes()):
       coord = allCoords.Get(iPoint)
       C = initC(coord)
@@ -168,7 +165,6 @@ def main():
     sys.stdout.flush()
 
   nDim = driver.GetNumberDimensions()
-  print("Dimensions of the problem = ",nDim)
 
   # index to the flow solver
   # C.FLOW
@@ -179,69 +175,65 @@ def main():
   # SA
   # SST
   iFLOWSOLVER = driver.GetSolverIndices()['INC.FLOW']
-  print("index of flow solver = ",iFLOWSOLVER)
   iSPECIESSOLVER = driver.GetSolverIndices()['SPECIES']
-  print("index of species solver = ",iSPECIESSOLVER)
   iSSTSOLVER = driver.GetSolverIndices()['SST']
-  print("index of turbulence solver = ",iSSTSOLVER)
-
   # all the indices and the map to the names of the primitives
   primindex = driver.GetPrimitiveIndices()
-  print("indices of primitives=",primindex)
-  print("number of primitives:",len(primindex))
-
   nElem = driver.GetNumberElements()
-  print("number of elements:",nElem)
-
   nVars = driver.GetNumberSolverVars(iFLOWSOLVER)
-  print("number of flow solver variables:",nVars)
-
   nVarsSpecies = driver.GetNumberSolverVars(iSPECIESSOLVER)
-  print("number of species solver variables:",nVarsSpecies)
   nVarsTurb = driver.GetNumberSolverVars(iSSTSOLVER)
-  print("number of turbulence solver variables:",nVarsTurb)
+
+  if rank == 0:
+    print("Dimensions of the problem = ",nDim)
+    print("index of flow solver = ",iFLOWSOLVER)
+    print("index of turbulence solver = ",iSSTSOLVER)
+    print("indices of primitives=",primindex)
+    print("number of primitives:",len(primindex))
+    print("number of elements:",nElem)
+    print("number of flow solver variables:",nVars)
+    print("number of species solver variables:",nVarsSpecies)
+    print("number of turbulence solver variables:",nVarsTurb)
+    sys.stdout.flush()
+
+
 
   # ### Check if we do a restart or not. ###
   with open('psi.cfg') as f:
     if 'RESTART_SOL= YES' in f.read():
+      if rank == 0:
         print("restarting from file")
     else:
         # We can set an initial condition by calling this function:
-        print("Start calling SetInitialSpecies")
+        if rank == 0:
+          print("Using user defined initial condition.")
         SetInitialSpecies(driver)
-        print("End calling SetInitialSpecies")
 
   # super important to actually push the commands.
   sys.stdout.flush()
 
   # run N iterations
-  for inner_iter in range(1000):
+  for inner_iter in range(2):
     if (rank==0):
       print("python iteration ", inner_iter)
     driver.Preprocess(inner_iter)
     driver.Run()
 
-    # set the source term, per point,
+    # set the source term, per point
     for i_node in range(driver.GetNumberNodes() - driver.GetNumberHaloNodes()):
       # add source term:
       # default TFC of Zimont: rho*Sc = rho_u * U_t * grad(c)
       S = zimont(driver,i_node)
       driver.UserDefinedSource(iSPECIESSOLVER).Set(i_node,0,S)
 
-
-      #S = [zimont(driver,i_node)]
-      #driver.SetPointCustomSource(iSPECIESSOLVER, i_node,S)
-
-
-
     # for the update of temperature, we need to update also the halo nodes
     for i_node in range(driver.GetNumberNodes()):
       # set the temperature to T = c*Tf + (1-c)*Tu
       update_temperature(driver, i_node)
 
     driver.Postprocess()
     driver.Update()
-    # Monitor the solver and output solution to file if required
+    # Monitor the solver and output solution to file if required.
     #driver.Monitor(inner_iter)
     # Output the solution to file
     driver.Output(inner_iter)