Use NINT to compare with integer and let hopr build the meshes for th…

…e DSMC_QualityFactors reggies
piclas-framework · Feb 13, 2024 · ceac36c · ceac36c
1 parent c591b59
commit ceac36c
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 1 deletion.
diff --git a/regressioncheck/CHE_DSMC/DSMC_QualityFactors/cube_mesh.h5 b/regressioncheck/CHE_DSMC/DSMC_QualityFactors/cube_mesh.h5
diff --git a/regressioncheck/CHE_DSMC/DSMC_QualityFactors/externals.ini b/regressioncheck/CHE_DSMC/DSMC_QualityFactors/externals.ini
@@ -0,0 +1,6 @@
+! --- Externals Tool Reggie
+MPI               = 1
+externalbinary    = ./hopr/build/bin/hopr
+externaldirectory = hopr.ini
+externalruntime   = pre
+cmd_suffix        =
diff --git a/regressioncheck/CHE_DSMC/DSMC_QualityFactors_MPI/cube_8_cells_mesh.h5 b/regressioncheck/CHE_DSMC/DSMC_QualityFactors_MPI/cube_8_cells_mesh.h5
diff --git a/regressioncheck/CHE_DSMC/DSMC_QualityFactors_MPI/externals.ini b/regressioncheck/CHE_DSMC/DSMC_QualityFactors_MPI/externals.ini
@@ -0,0 +1,6 @@
+! --- Externals Tool Reggie
+MPI               = 1
+externalbinary    = ./hopr/build/bin/hopr
+externaldirectory = hopr.ini
+externalruntime   = pre
+cmd_suffix        =
diff --git a/src/particles/dsmc/dsmc_init.f90 b/src/particles/dsmc/dsmc_init.f90
@@ -869,7 +869,7 @@ SUBROUTINE InitDSMC()
   DSMC%UseOctree = GETLOGICAL('Particles-DSMC-UseOctree')
   IF(DSMC%ReservoirSimu.AND.DSMC%UseOctree) CALL abort(__STAMP__,'Particles-DSMC-UseOctree = T not allowed for RESERVOIR simulations!')
   DSMC%UseNearestNeighbour = GETLOGICAL('Particles-DSMC-UseNearestNeighbour')
-  IF(DSMC%ReservoirSimu.AND.DSMC%UseNearestNeighbour.AND.(DoRestart.OR.((TEnd/ManualTimeStep).GT.1))) THEN
+  IF(DSMC%ReservoirSimu.AND.DSMC%UseNearestNeighbour.AND.(DoRestart.OR.(NINT(TEnd/ManualTimeStep).GT.1))) THEN
     CALL abort(__STAMP__,'Particles-DSMC-UseNearestNeighbour = T not allowed for RESERVOIR simulations, if you simulate more than one time step!')
   END IF
   IF(DSMC%UseOctree) THEN