update testcases

Author: bigfooted

SU2_CFD/src/numerics/flow/flow_sources.cpp

@@ -847,7 +847,7 @@ CSourceUserDefined::CSourceUserDefined(unsigned short val_nDim, unsigned short v
 CNumerics::ResidualType<> CSourceUserDefined::ComputeResidual(const CConfig *config) {
 
   unsigned short iDim;
-
+  cout << "CSourceUserDefined" << endl;
   /*--- Zero the continuity contribution. ---*/
 
   residual[0] = 0.0;

SU2_CFD/src/solvers/CIncEulerSolver.cpp

@@ -1833,13 +1833,13 @@ void CIncEulerSolver::Custom_Source_Residual(CGeometry *geometry, CSolver **solv
 
     numerics->SetVolume(geometry->nodes->GetVolume(iPoint));
 
-      /*--- Get control volume size. ---*/
-      su2double Volume = geometry->nodes->GetVolume(iPoint);
+    /*--- Get control volume size. ---*/
+    su2double Volume = geometry->nodes->GetVolume(iPoint);
 
-      /*--- Compute the residual for this control volume and subtract. ---*/
-      for (iVar = 0; iVar < nVar; iVar++) {
-        LinSysRes[iPoint*nVar+iVar] += PointSource[iPoint][iVar] * Volume;
-      }
+    /*--- Compute the residual for this control volume and subtract. ---*/
+    for (iVar = 0; iVar < nVar; iVar++) {
+      LinSysRes[iPoint*nVar+iVar] += PointSource[iPoint][iVar] * Volume;
+    }
   }
   END_SU2_OMP_FOR
 

TestCases/py_wrapper/turbulent_premixed_psi/psi.cfg

@@ -15,6 +15,8 @@ SOLVER= INC_RANS
 KIND_TURB_MODEL= SST
 SST_OPTIONS= V1994m
 
+RESTART_SOL= YES
+
 MGLEVEL= 0
 %
 
@@ -63,11 +65,12 @@ MARKER_SYM= ( symmetry )
 AXISYMMETRIC= YES
 %
 SPECIFIED_INLET_PROFILE= YES
+INLET_MATCHING_TOLERANCE=1e-4
 INLET_FILENAME= inlet.dat
 %INLET_INTERPOLATION_FUNCTION= LINEAR_1D
 INC_INLET_TYPE=  VELOCITY_INLET
 INC_INLET_DAMPING= 0.01
-MARKER_INLET= ( inlet,       673, 40.0, 1.0,  0.0, 0.0)
+MARKER_INLET= ( inlet, 673, 40.0, 1.0,  0.0, 0.0)
 MARKER_INLET_TURBULENT = (inlet, 0.10, 15)
 MARKER_INLET_SPECIES= (inlet, 0.0)
 %
@@ -79,7 +82,7 @@ MARKER_OUTLET= ( outlet, 0.0 )
 %
 NUM_METHOD_GRAD= WEIGHTED_LEAST_SQUARES
 %
-CFL_NUMBER= 20.0
+CFL_NUMBER= 1.0
 CFL_REDUCTION_SPECIES= 1.0
 CFL_REDUCTION_TURB= 1.0
 %
@@ -90,7 +93,7 @@ ITER= 1
 LINEAR_SOLVER= FGMRES
 LINEAR_SOLVER_PREC= ILU
 LINEAR_SOLVER_ERROR= 1E-8
-LINEAR_SOLVER_ITER= 5
+LINEAR_SOLVER_ITER= 10
 
 % -------------------- FLOW NUMERICAL METHOD DEFINITION -----------------------%
 %
@@ -136,15 +139,14 @@ CONV_STARTITER= 10
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
 %MESH_FILENAME= psi_coarse.su2
-MESH_FILENAME= psi_medium.su2
+MESH_FILENAME= psi.su2
 %MESH_FILENAME= psi_fine.su2
 %
 SCREEN_OUTPUT= INNER_ITER WALL_TIME \
-               RMS_PRESSURE RMS_VELOCITY-X RMS_VELOCITY-Y RMS_TKE RMS_DISSIPATION RMS_SPECIES_0 RMS_SPECIES_1 \
+               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 \
-               SURFACE_SPECIES_0
+               LINSOL_ITER_SPECIES LINSOL_RESIDUAL_SPECIES
 SCREEN_WRT_FREQ_INNER= 1
 %
 HISTORY_OUTPUT= ITER RMS_RES LINSOL SPECIES_COEFF SPECIES_COEFF_SURF
@@ -156,7 +158,6 @@ OUTPUT_FILES= RESTART_ASCII, PARAVIEW_MULTIBLOCK
 VOLUME_OUTPUT= RESIDUAL, PRIMITIVE
 OUTPUT_WRT_FREQ= 100
 %
-RESTART_SOL= YES
 READ_BINARY_RESTART= NO
 RESTART_FILENAME= restart
 SOLUTION_FILENAME= solution

TestCases/py_wrapper/turbulent_premixed_psi/run.py

@@ -27,6 +27,7 @@
 
 import sys
 import pysu2
+from mpi4py import MPI
 import numpy as np
 #from mpi4py import MPI
 
@@ -121,6 +122,7 @@ def zimont(SU2Driver, iPoint):
     # laminar burning velocity of methane-air at phi=0.5, P=5
     Slu = 0.232
 
+
     rho = primvar[iDENSITY]
     mu = primvar[iMU]
     nu=mu/rho
@@ -131,10 +133,10 @@ def zimont(SU2Driver, iPoint):
     lt = (0.09**0.75) * (tke**1.5) / dissipation
     Re = up*lt/nu
     Le = 1.0
-    Ut = Slu * (1.0 + (0.46/Le)*np.power(Re,0.25)*np.power(up/Slu,0.3)*np.power(Pu,0.2))
-
+    Ut = Slu * (1.0 + (0.46/Le) * np.power(Re,0.25) * np.power(up/Slu,0.3) * np.power(Pu,0.2) )
     norm_gradc = np.sqrt(gradc[0]*gradc[0] + gradc[1]*gradc[1])
-
+    #if (norm_gradc > 1.):
+    #  print(tke," ",rho_u," Ut=",Ut," , |grad(c)| = ",norm_gradc, " ",gradc[0]," ",gradc[1])
     Sc = rho_u * Ut * norm_gradc
 
     return Sc
@@ -152,11 +154,8 @@ def getsolvar(SU2Driver):
 
 
 def main():
-  """
-  Run the flow solver with a custom inlet (function of time and space).
-  """
-  # comm = MPI.COMM_WORLD
-  comm = 0
+  comm = MPI.COMM_WORLD
+  rank = comm.Get_rank()
 
   # Initialize the primal driver of SU2, this includes solver preprocessing.
   try:
@@ -165,8 +164,9 @@ def main():
     print('A TypeError occured in pysu2.CSinglezoneDriver : ', exception)
     raise
 
-  print("\n------------------------------ Begin Solver -----------------------------")
-  sys.stdout.flush()
+  if rank == 0:
+    print("\n------------------------------ Begin Solver -----------------------------")
+    sys.stdout.flush()
 
   nDim = driver.GetNumberDimensions()
   print("Dimensions of the problem = ",nDim)
@@ -223,7 +223,8 @@ def main():
 #
 
   #print("solver variable names:",varindex)
-  #print("index of density = ",primindex.get("DENSITY"))
+  iDENSITY = primindex.get("DENSITY")
+  #print("index of density = ",iDENSITY)
 
   index_Vel = varindex.get("VELOCITY_X")
   #print("index of velocity = ",index_Vel)
@@ -233,17 +234,20 @@ def main():
 
   #print("max. number of inner iterations: ",driver.GetNumberInnerIter());
   #print("max nr of outer iterations: ",driver.GetNumberOuterIter());
-
-  # We can set an initial condition by calling this function:
-  #print("Start calling SetInitialSpecies")
-  #SetInitialSpecies(driver)
-  #print("End calling SetInitialSpecies")
+  with open('psi.cfg') as f:
+    if 'RESTART_SOL= YES' in f.read():
+        print("restarting from file")
+    else:
+        # We can set an initial condition by calling this function:
+        print("Start calling SetInitialSpecies")
+        SetInitialSpecies(driver)
+        print("End calling SetInitialSpecies")
 
   # super important to actually push the commands.
   sys.stdout.flush()
 
-  # run 5 iterations
-  for inner_iter in range(5):
+  # run N iterations
+  for inner_iter in range(10000):
 
     driver.Preprocess(inner_iter)
     driver.Run()
@@ -260,7 +264,7 @@ def main():
 
     driver.Postprocess()
     driver.Update()
-    driver.Monitor(inner_iter)
+    #driver.Monitor(inner_iter)
     driver.Output(inner_iter)
 
   # Finalize the solver and exit cleanly.