Skip to content

Commit

Permalink
Merge branch 'fix.reggie.externals.mpi.usage' into 'master.dev'
Browse files Browse the repository at this point in the history
[fix.reggie.externals.mpi.usage] Changed "mpirun" to "MPI" in regression tests parameter files externals.ini

See merge request piclas/piclas!666
  • Loading branch information
pnizenkov committed Jul 13, 2022
2 parents 25194b6 + 888a444 commit d4e74dd
Show file tree
Hide file tree
Showing 10 changed files with 19 additions and 19 deletions.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
! --- Externals Tool Reggie
mpirun = 1 ! Single execution
MPI = 1 ! Single execution
externalbinary = ./bin/piclas2vtk ! Relative binary path in build directory
externaldirectory = post-vtk-statefile-conversion ! Directory name, where the files are located for the external tool reggie
externalruntime = post ! Run after piclas is completed (post: after, pre: before)
Expand Down
4 changes: 2 additions & 2 deletions regressioncheck/NIG_DSMC/RotPeriodicBC/externals.ini
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
! --- Externals Tool Reggie
mpirun = 1 , 1 ! Single execution
MPI = 1 , 1 ! Single execution
externalbinary = ./hopr/build/bin/hopr , ./hopr/build/bin/hopr ! Relative binary path in build directory
externaldirectory = pre-hopr , pre-hopr-mortar ! Directory name, where the files are located for the external tool reggie
externalruntime = pre , pre ! Run after piclas is completed (post: after, pre: before)

nocrosscombination:mpirun,externalbinary,externaldirectory,externalruntime
nocrosscombination:MPI,externalbinary,externaldirectory,externalruntime
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
! --- Externals Tool Reggie
mpirun = 1
MPI = 1
externalbinary = ./hopr/build/bin/hopr
externaldirectory = pre-hopr
externalruntime = pre

!nocrosscombination:mpirun,externalbinary,externaldirectory,externalruntime
!nocrosscombination:MPI,externalbinary,externaldirectory,externalruntime
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
! --- Externals Tool Reggie
mpirun = 1 ! Single execution
MPI = 1 ! Single execution
externalbinary = ./bin/piclas2vtk ! Relative binary path in build directory
externaldirectory = post-vtk-statefile-conversion ! Directory name, where the files are located for the external tool reggie
externalruntime = post ! Run after piclas is completed (post: after, pre: before)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
! --- Externals Tool Reggie
mpirun = 1 ! Single execution
MPI = 1 ! Single execution
externalbinary = ./bin/piclas2vtk ! Relative binary path in build directory
externaldirectory = post-VTK-conversion ! Directory name, where the files are located for the external tool reggie
externalruntime = post ! Run after piclas is completed (post: after, pre: before)
cmd_suffix = ../turner2013_State_000.00000000010000000.h5,../turner2013_DSMCState_000.00000000010000000.h5,../turner2013_DSMCSurfState_000.00000000010000000.h5 ! Suffix for the binary execution
cmd_pre_execute = ln\s-sf\s../turner2013_mesh.h5 ! "\s" resembles a white space character in the command (simply using " " is not allowed)
cmd_pre_execute = ln\s-sf\s../turner2013_mesh.h5 ! "\s" resembles a white space character in the command (simply using " " is not allowed)
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
! --- Externals Tool Reggie
mpirun = 1 ! Single execution
MPI = 1 ! Single execution
externalbinary = ./bin/piclas2vtk ! Relative binary path in build directory
externaldirectory = post-vtk-DSMC-conversion ! Directory name, where the files are located for the external tool reggie
externalruntime = post ! Run after piclas is completed (post: after, pre: before)
cmd_suffix = ../CouetteFlow_DSMCState_001.000000.h5 ! Suffix for the binary execution
cmd_pre_execute = ln\s-s\s../tunnel_mesh.h5 ! "\s" resembles a white space character in the command (simply using " " is not allowed)
cmd_pre_execute = ln\s-s\s../tunnel_mesh.h5 ! "\s" resembles a white space character in the command (simply using " " is not allowed)
4 changes: 2 additions & 2 deletions regressioncheck/WEK_DSMC/Flow_N2_70degCone/externals.ini
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
! --- Externals Tool Reggie
mpirun = 1 ! Single execution
MPI = 1 ! Single execution
externalbinary = ./bin/piclas2vtk ! Relative binary path in build directory
externaldirectory = post-vtk-DSMC-conversion ! Directory name, where the files are located for the external tool reggie
externalruntime = post ! Run after piclas is completed (post: after, pre: before)
cmd_suffix = ../70degCone2D_Set1_DSMCSurfState_000.00200000000000000.h5 ! Suffix for the binary execution
cmd_pre_execute = ln\s-s\s../mesh_70degCone2D_Set1_noWake_mesh.h5 ! "\s" resembles a white space character in the command (simply using " " is not allowed)
cmd_pre_execute = ln\s-s\s../mesh_70degCone2D_Set1_noWake_mesh.h5 ! "\s" resembles a white space character in the command (simply using " " is not allowed)
4 changes: 2 additions & 2 deletions regressioncheck/WEK_DSMC/fully_periodic_3D/externals.ini
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
! --- Externals Tool Reggie
mpirun = 1
MPI = 1
externalbinary = ./hopr/build/bin/hopr
externaldirectory = pre-hopr
externalruntime = pre

!nocrosscombination:mpirun,externalbinary,externaldirectory,externalruntime
!nocrosscombination:MPI,externalbinary,externaldirectory,externalruntime
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
! --- Externals Tool Reggie
mpirun = 1
MPI = 1
externalbinary = ./hopr/build/bin/hopr
externaldirectory = pre-hopr
externalruntime = pre

!nocrosscombination:mpirun,externalbinary,externaldirectory,externalruntime
!nocrosscombination:MPI,externalbinary,externaldirectory,externalruntime
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
! --- Externals Tool Reggie
mpirun = 1 , 1
MPI = 1 , 1
externalbinary = ./hopr/build/bin/hopr , ./bin/superB
externaldirectory = pre-hopr , pre-superB
externalruntime = pre , pre
cmd_pre_execute = ln\s-s\s./pre-hopr/90_deg_segment_mesh.h5\s../. , ln\s-s\s./pre-superB/HEMPT_90deg_BGField.h5\s../.

nocrosscombination:mpirun,externalbinary,externaldirectory,externalruntime,cmd_pre_execute
!nocrosscombination:mpirun,externalbinary,externaldirectory,externalruntime,cmd_pre_execute
nocrosscombination:MPI,externalbinary,externaldirectory,externalruntime,cmd_pre_execute
!nocrosscombination:MPI,externalbinary,externaldirectory,externalruntime,cmd_pre_execute

0 comments on commit d4e74dd

Please sign in to comment.