From 536b94b21d20df332ebbb488e86235163d6f4e2a Mon Sep 17 00:00:00 2001 From: uekerman Date: Wed, 18 Dec 2019 13:20:23 +0100 Subject: [PATCH 01/12] Update HT --- HT/partitioned-heat/fenics-fenics/precice-config.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/HT/partitioned-heat/fenics-fenics/precice-config.xml b/HT/partitioned-heat/fenics-fenics/precice-config.xml index f9def0c20..20f8897b3 100644 --- a/HT/partitioned-heat/fenics-fenics/precice-config.xml +++ b/HT/partitioned-heat/fenics-fenics/precice-config.xml @@ -45,7 +45,7 @@ - + From bc1f4623d6d579c0701c8752e1b292e3a37b0636 Mon Sep 17 00:00:00 2001 From: uekerman Date: Wed, 18 Dec 2019 13:22:03 +0100 Subject: [PATCH 02/12] Update SSI --- SSI/loaded_beam/CalculiX-CalculiX/precice-config.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SSI/loaded_beam/CalculiX-CalculiX/precice-config.xml b/SSI/loaded_beam/CalculiX-CalculiX/precice-config.xml index 9247f7e85..2fa6ab17b 100755 --- a/SSI/loaded_beam/CalculiX-CalculiX/precice-config.xml +++ b/SSI/loaded_beam/CalculiX-CalculiX/precice-config.xml @@ -37,7 +37,7 @@ - + From cca9a4936aa073a3ee4d5987d91a338fd0a6cbf5 Mon Sep 17 00:00:00 2001 From: uekerman Date: Wed, 18 Dec 2019 13:29:58 +0100 Subject: [PATCH 03/12] Update heat_exchanger --- .../buoyantSimpleFoam-CalculiX/Allrun | 4 - .../Allrun_parallel | 4 - .../precice-config.xml | 93 +++++++++++++++++- .../precice-config_parallel.xml | 94 ------------------- .../precice-config_serial.xml | 92 ------------------ 5 files changed, 92 insertions(+), 195 deletions(-) mode change 120000 => 100644 CHT/heat_exchanger/buoyantSimpleFoam-CalculiX/precice-config.xml delete mode 100644 CHT/heat_exchanger/buoyantSimpleFoam-CalculiX/precice-config_parallel.xml delete mode 100644 CHT/heat_exchanger/buoyantSimpleFoam-CalculiX/precice-config_serial.xml diff --git a/CHT/heat_exchanger/buoyantSimpleFoam-CalculiX/Allrun b/CHT/heat_exchanger/buoyantSimpleFoam-CalculiX/Allrun index bd058b839..ffa213537 100755 --- a/CHT/heat_exchanger/buoyantSimpleFoam-CalculiX/Allrun +++ b/CHT/heat_exchanger/buoyantSimpleFoam-CalculiX/Allrun @@ -11,10 +11,6 @@ if [ ! -f Solid/all.msh ]; then exit fi -# Link to the precice-config for the serial run -echo "Setting up the preCICE configuration file for a serial simulation" -ln -s -f precice-config_serial.xml precice-config.xml - # Participant 1: Inner-Fluid Participant1="Inner-Fluid" Solver1="buoyantSimpleFoam" diff --git a/CHT/heat_exchanger/buoyantSimpleFoam-CalculiX/Allrun_parallel b/CHT/heat_exchanger/buoyantSimpleFoam-CalculiX/Allrun_parallel index a0659948f..42aaa6a6b 100755 --- a/CHT/heat_exchanger/buoyantSimpleFoam-CalculiX/Allrun_parallel +++ b/CHT/heat_exchanger/buoyantSimpleFoam-CalculiX/Allrun_parallel @@ -11,10 +11,6 @@ if [ ! -f Solid/all.msh ]; then exit fi -# Link to the precice-config for the parallel run -echo "Setting up the preCICE configuration file for a parallel simulation" -ln -s -f precice-config_parallel.xml precice-config.xml - # Participant 1: inner-fluid Participant1="Inner-Fluid" Solver1="buoyantSimpleFoam" diff --git a/CHT/heat_exchanger/buoyantSimpleFoam-CalculiX/precice-config.xml b/CHT/heat_exchanger/buoyantSimpleFoam-CalculiX/precice-config.xml deleted file mode 120000 index f12083976..000000000 --- a/CHT/heat_exchanger/buoyantSimpleFoam-CalculiX/precice-config.xml +++ /dev/null @@ -1 +0,0 @@ -precice-config_serial.xml \ No newline at end of file diff --git a/CHT/heat_exchanger/buoyantSimpleFoam-CalculiX/precice-config.xml b/CHT/heat_exchanger/buoyantSimpleFoam-CalculiX/precice-config.xml new file mode 100644 index 000000000..481294013 --- /dev/null +++ b/CHT/heat_exchanger/buoyantSimpleFoam-CalculiX/precice-config.xml @@ -0,0 +1,92 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/CHT/heat_exchanger/buoyantSimpleFoam-CalculiX/precice-config_parallel.xml b/CHT/heat_exchanger/buoyantSimpleFoam-CalculiX/precice-config_parallel.xml deleted file mode 100644 index d43350abe..000000000 --- a/CHT/heat_exchanger/buoyantSimpleFoam-CalculiX/precice-config_parallel.xml +++ /dev/null @@ -1,94 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/CHT/heat_exchanger/buoyantSimpleFoam-CalculiX/precice-config_serial.xml b/CHT/heat_exchanger/buoyantSimpleFoam-CalculiX/precice-config_serial.xml deleted file mode 100644 index a18292c43..000000000 --- a/CHT/heat_exchanger/buoyantSimpleFoam-CalculiX/precice-config_serial.xml +++ /dev/null @@ -1,92 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From 5d79c5237f0667c30d60bc3adc8655ce5ba0ab56 Mon Sep 17 00:00:00 2001 From: uekerman Date: Wed, 18 Dec 2019 13:32:34 +0100 Subject: [PATCH 04/12] Update flow-over-plate --- .../precice-config.xml | 62 ++++++++++++++++++- .../precice-config_serial.xml | 61 ------------------ .../precice-config.xml | 2 +- 3 files changed, 62 insertions(+), 63 deletions(-) mode change 120000 => 100644 CHT/flow-over-plate/buoyantPimpleFoam-fenics/precice-config.xml delete mode 100644 CHT/flow-over-plate/buoyantPimpleFoam-fenics/precice-config_serial.xml diff --git a/CHT/flow-over-plate/buoyantPimpleFoam-fenics/precice-config.xml b/CHT/flow-over-plate/buoyantPimpleFoam-fenics/precice-config.xml deleted file mode 120000 index f12083976..000000000 --- a/CHT/flow-over-plate/buoyantPimpleFoam-fenics/precice-config.xml +++ /dev/null @@ -1 +0,0 @@ -precice-config_serial.xml \ No newline at end of file diff --git a/CHT/flow-over-plate/buoyantPimpleFoam-fenics/precice-config.xml b/CHT/flow-over-plate/buoyantPimpleFoam-fenics/precice-config.xml new file mode 100644 index 000000000..9e3d8a7e8 --- /dev/null +++ b/CHT/flow-over-plate/buoyantPimpleFoam-fenics/precice-config.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/CHT/flow-over-plate/buoyantPimpleFoam-fenics/precice-config_serial.xml b/CHT/flow-over-plate/buoyantPimpleFoam-fenics/precice-config_serial.xml deleted file mode 100644 index 040c621d4..000000000 --- a/CHT/flow-over-plate/buoyantPimpleFoam-fenics/precice-config_serial.xml +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/CHT/flow-over-plate/buoyantPimpleFoam-nutils/precice-config.xml b/CHT/flow-over-plate/buoyantPimpleFoam-nutils/precice-config.xml index e9be123fb..21e6a8e76 100644 --- a/CHT/flow-over-plate/buoyantPimpleFoam-nutils/precice-config.xml +++ b/CHT/flow-over-plate/buoyantPimpleFoam-nutils/precice-config.xml @@ -40,7 +40,7 @@ - + From 86498e0d458b65ea02e22c939ab94d27bd76e584 Mon Sep 17 00:00:00 2001 From: uekerman Date: Wed, 18 Dec 2019 13:36:53 +0100 Subject: [PATCH 05/12] Update 3D Tube --- FSI/3D_Tube/OpenFOAM-CalculiX/Allrun | 6 +- ...config_parallel.xml => precice-config.xml} | 5 +- .../precice-config_serial.xml | 69 ------------------- 3 files changed, 3 insertions(+), 77 deletions(-) rename FSI/3D_Tube/OpenFOAM-CalculiX/{precice-config_parallel.xml => precice-config.xml} (94%) delete mode 100644 FSI/3D_Tube/OpenFOAM-CalculiX/precice-config_serial.xml diff --git a/FSI/3D_Tube/OpenFOAM-CalculiX/Allrun b/FSI/3D_Tube/OpenFOAM-CalculiX/Allrun index f9e87f5eb..1883a89c8 100755 --- a/FSI/3D_Tube/OpenFOAM-CalculiX/Allrun +++ b/FSI/3D_Tube/OpenFOAM-CalculiX/Allrun @@ -36,16 +36,12 @@ Solver1="pimpleDyMFoam" if [ $parallel -eq 1 ]; then echo " Decomposing the case..." decomposePar -force -case ${Participant1} > ${Participant1}_decomposePar.log 2>&1 - echo " Setting up the preCICE configuration file for a parallel simulation..." - ln -s -f precice-config_parallel.xml precice-config.xml cd ${Participant1} nproc=$(getNumberOfProcessors) cd .. echo " Starting the ${Participant1} participant in parallel..." mpirun -np ${nproc} ${Solver1} -parallel -case ${Participant1} > ${Participant1}.log 2>&1 & else - echo " Setting up the preCICE configuration file for a serial simulation..." - ln -s -f precice-config_serial.xml precice-config.xml echo " Starting the ${Participant1} participant in serial..." ${Solver1} -case ${Participant1} > ${Participant1}.log 2>&1 & fi @@ -96,4 +92,4 @@ else fi echo "" -echo "### NOTE ### Make sure to use the correct solver for your OpenFOAM version! (pimpleFoam for OpenFOAM v1806, OpenFOAM 6, or newer, vs pimpleDyMFoam for older) You may change this in your Fluid/system/controlDict file, if needed." \ No newline at end of file +echo "### NOTE ### Make sure to use the correct solver for your OpenFOAM version! (pimpleFoam for OpenFOAM v1806, OpenFOAM 6, or newer, vs pimpleDyMFoam for older) You may change this in your Fluid/system/controlDict file, if needed." diff --git a/FSI/3D_Tube/OpenFOAM-CalculiX/precice-config_parallel.xml b/FSI/3D_Tube/OpenFOAM-CalculiX/precice-config.xml similarity index 94% rename from FSI/3D_Tube/OpenFOAM-CalculiX/precice-config_parallel.xml rename to FSI/3D_Tube/OpenFOAM-CalculiX/precice-config.xml index 58e5f5c16..0c533b24d 100644 --- a/FSI/3D_Tube/OpenFOAM-CalculiX/precice-config_parallel.xml +++ b/FSI/3D_Tube/OpenFOAM-CalculiX/precice-config.xml @@ -25,7 +25,6 @@ - @@ -37,12 +36,12 @@ - + - + diff --git a/FSI/3D_Tube/OpenFOAM-CalculiX/precice-config_serial.xml b/FSI/3D_Tube/OpenFOAM-CalculiX/precice-config_serial.xml deleted file mode 100644 index f8ebab9ee..000000000 --- a/FSI/3D_Tube/OpenFOAM-CalculiX/precice-config_serial.xml +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From 72995ef7184aaadffaa110c06776b3a1fc8b7323 Mon Sep 17 00:00:00 2001 From: uekerman Date: Wed, 18 Dec 2019 13:42:31 +0100 Subject: [PATCH 06/12] Update CylinderFlap --- FSI/cylinderFlap/OpenFOAM-CalculiX/Allrun | 4 - .../OpenFOAM-CalculiX/precice-config.xml | 73 +++++++++++++++++- .../precice-config_parallel.xml | 73 ------------------ .../precice-config_serial.xml | 72 ------------------ FSI/cylinderFlap/OpenFOAM-CalculiX/runFluid | 9 +-- FSI/cylinderFlap/OpenFOAM-CalculiX/runSolid | 3 +- .../OpenFOAM-FEniCS/precice-config.xml | 73 +++++++++++++++++- .../OpenFOAM-FEniCS/precice-config_serial.xml | 72 ------------------ FSI/cylinderFlap/OpenFOAM-FEniCS/runFluid | 8 -- FSI/cylinderFlap/OpenFOAM-deal.II/Allrun | 4 - .../OpenFOAM-deal.II/precice-config.xml | 75 ++++++++++++++++++- .../precice-config_parallel.xml | 75 ------------------- .../precice-config_serial.xml | 74 ------------------ 13 files changed, 220 insertions(+), 395 deletions(-) mode change 120000 => 100644 FSI/cylinderFlap/OpenFOAM-CalculiX/precice-config.xml delete mode 100644 FSI/cylinderFlap/OpenFOAM-CalculiX/precice-config_parallel.xml delete mode 100644 FSI/cylinderFlap/OpenFOAM-CalculiX/precice-config_serial.xml mode change 120000 => 100644 FSI/cylinderFlap/OpenFOAM-FEniCS/precice-config.xml delete mode 100644 FSI/cylinderFlap/OpenFOAM-FEniCS/precice-config_serial.xml mode change 120000 => 100644 FSI/cylinderFlap/OpenFOAM-deal.II/precice-config.xml delete mode 100644 FSI/cylinderFlap/OpenFOAM-deal.II/precice-config_parallel.xml delete mode 100644 FSI/cylinderFlap/OpenFOAM-deal.II/precice-config_serial.xml diff --git a/FSI/cylinderFlap/OpenFOAM-CalculiX/Allrun b/FSI/cylinderFlap/OpenFOAM-CalculiX/Allrun index bff0c6ae3..69ffe44a9 100755 --- a/FSI/cylinderFlap/OpenFOAM-CalculiX/Allrun +++ b/FSI/cylinderFlap/OpenFOAM-CalculiX/Allrun @@ -48,16 +48,12 @@ Participant1="Fluid" if [ $parallel -eq 1 ]; then echo " Decomposing the case..." decomposePar -force -case ${Participant1} > ${Participant1}_decomposePar.log 2>&1 - echo " Setting up the preCICE configuration file for a parallel simulation..." - ln -s -f precice-config_parallel.xml precice-config.xml cd ${Participant1} nproc=$(getNumberOfProcessors) cd .. echo " Starting the ${Participant1} participant in parallel..." mpirun -np ${nproc} ${Solver1} -parallel -case ${Participant1} > ${Participant1}.log 2>&1 & else - echo " Setting up the preCICE configuration file for a serial simulation..." - ln -s -f precice-config_serial.xml precice-config.xml echo " Starting the ${Participant1} participant in serial..." ${Solver1} -case ${Participant1} > ${Participant1}.log 2>&1 & fi diff --git a/FSI/cylinderFlap/OpenFOAM-CalculiX/precice-config.xml b/FSI/cylinderFlap/OpenFOAM-CalculiX/precice-config.xml deleted file mode 120000 index f12083976..000000000 --- a/FSI/cylinderFlap/OpenFOAM-CalculiX/precice-config.xml +++ /dev/null @@ -1 +0,0 @@ -precice-config_serial.xml \ No newline at end of file diff --git a/FSI/cylinderFlap/OpenFOAM-CalculiX/precice-config.xml b/FSI/cylinderFlap/OpenFOAM-CalculiX/precice-config.xml new file mode 100644 index 000000000..5a76d7fbd --- /dev/null +++ b/FSI/cylinderFlap/OpenFOAM-CalculiX/precice-config.xml @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/FSI/cylinderFlap/OpenFOAM-CalculiX/precice-config_parallel.xml b/FSI/cylinderFlap/OpenFOAM-CalculiX/precice-config_parallel.xml deleted file mode 100644 index 9b49c6d2a..000000000 --- a/FSI/cylinderFlap/OpenFOAM-CalculiX/precice-config_parallel.xml +++ /dev/null @@ -1,73 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/FSI/cylinderFlap/OpenFOAM-CalculiX/precice-config_serial.xml b/FSI/cylinderFlap/OpenFOAM-CalculiX/precice-config_serial.xml deleted file mode 100644 index 04782ff7b..000000000 --- a/FSI/cylinderFlap/OpenFOAM-CalculiX/precice-config_serial.xml +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/FSI/cylinderFlap/OpenFOAM-CalculiX/runFluid b/FSI/cylinderFlap/OpenFOAM-CalculiX/runFluid index d97fda495..62cc3a5e9 100755 --- a/FSI/cylinderFlap/OpenFOAM-CalculiX/runFluid +++ b/FSI/cylinderFlap/OpenFOAM-CalculiX/runFluid @@ -20,13 +20,6 @@ fi echo "Preparing and running the Fluid participant..." -# Prepare -if [ $parallel -eq 1 ]; then - ln -s -f precice-config_parallel.xml precice-config.xml -else - ln -s -f precice-config_serial.xml precice-config.xml -fi - rm -rfv Fluid/0/ cp -r Fluid/0.orig/ Fluid/0/ blockMesh -case Fluid @@ -49,4 +42,4 @@ fi ./removeObsoleteFolders.sh echo "" -echo "### NOTE ### Make sure to use the correct solver for your OpenFOAM version! (pimpleFoam for OpenFOAM v1806, OpenFOAM 6, or newer, vs pimpleDyMFoam for older) You may change this in your Fluid/system/controlDict file, if needed." \ No newline at end of file +echo "### NOTE ### Make sure to use the correct solver for your OpenFOAM version! (pimpleFoam for OpenFOAM v1806, OpenFOAM 6, or newer, vs pimpleDyMFoam for older) You may change this in your Fluid/system/controlDict file, if needed." diff --git a/FSI/cylinderFlap/OpenFOAM-CalculiX/runSolid b/FSI/cylinderFlap/OpenFOAM-CalculiX/runSolid index 870de0cb8..58614c9ab 100755 --- a/FSI/cylinderFlap/OpenFOAM-CalculiX/runSolid +++ b/FSI/cylinderFlap/OpenFOAM-CalculiX/runSolid @@ -9,7 +9,6 @@ # The script "Allclean" cleans-up the result and log files. echo "Preparing and running the Solid participant..." -echo "Note: run the script runFluid first. It sets up a link to the correct precice-config.xml file." # Prepare in silent mode cd Solid @@ -17,4 +16,4 @@ cd Solid cd - # Run -ccx_preCICE -i Solid/flap -precice-participant Calculix \ No newline at end of file +ccx_preCICE -i Solid/flap -precice-participant Calculix diff --git a/FSI/cylinderFlap/OpenFOAM-FEniCS/precice-config.xml b/FSI/cylinderFlap/OpenFOAM-FEniCS/precice-config.xml deleted file mode 120000 index f12083976..000000000 --- a/FSI/cylinderFlap/OpenFOAM-FEniCS/precice-config.xml +++ /dev/null @@ -1 +0,0 @@ -precice-config_serial.xml \ No newline at end of file diff --git a/FSI/cylinderFlap/OpenFOAM-FEniCS/precice-config.xml b/FSI/cylinderFlap/OpenFOAM-FEniCS/precice-config.xml new file mode 100644 index 000000000..eae2347ef --- /dev/null +++ b/FSI/cylinderFlap/OpenFOAM-FEniCS/precice-config.xml @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/FSI/cylinderFlap/OpenFOAM-FEniCS/precice-config_serial.xml b/FSI/cylinderFlap/OpenFOAM-FEniCS/precice-config_serial.xml deleted file mode 100644 index 48d431c09..000000000 --- a/FSI/cylinderFlap/OpenFOAM-FEniCS/precice-config_serial.xml +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/FSI/cylinderFlap/OpenFOAM-FEniCS/runFluid b/FSI/cylinderFlap/OpenFOAM-FEniCS/runFluid index 0d1b19fa4..4c96e7be9 100755 --- a/FSI/cylinderFlap/OpenFOAM-FEniCS/runFluid +++ b/FSI/cylinderFlap/OpenFOAM-FEniCS/runFluid @@ -20,19 +20,11 @@ fi echo "Preparing and running the Fluid participant..." -# Prepare -if [ $parallel -eq 1 ]; then - ln -s -f precice-config_parallel.xml precice-config.xml -else - ln -s -f precice-config_serial.xml precice-config.xml -fi - rm -rfv Fluid/0/ cp -r Fluid/0.orig/ Fluid/0/ blockMesh -case Fluid checkMesh -case Fluid - # Run cd Fluid solver=$(getApplication) diff --git a/FSI/cylinderFlap/OpenFOAM-deal.II/Allrun b/FSI/cylinderFlap/OpenFOAM-deal.II/Allrun index 079c89309..5b2791eb9 100755 --- a/FSI/cylinderFlap/OpenFOAM-deal.II/Allrun +++ b/FSI/cylinderFlap/OpenFOAM-deal.II/Allrun @@ -45,16 +45,12 @@ Participant1="Fluid" if [ $parallel -eq 1 ]; then echo " Decomposing the case..." decomposePar -force -case ${Participant1} > ${Participant1}_decomposePar.log 2>&1 - echo " Setting up the preCICE configuration file for a parallel simulation..." - ln -s -f precice-config_parallel.xml precice-config.xml cd ${Participant1} nproc=$(getNumberOfProcessors) cd .. echo " Starting the ${Participant1} participant in parallel..." mpirun -np ${nproc} ${Solver1} -parallel -case ${Participant1} > ${Participant1}.log 2>&1 & else - echo " Setting up the preCICE configuration file for a serial simulation..." - ln -s -f precice-config_serial.xml precice-config.xml echo " Starting the ${Participant1} participant in serial..." ${Solver1} -case ${Participant1} > ${Participant1}.log 2>&1 & fi diff --git a/FSI/cylinderFlap/OpenFOAM-deal.II/precice-config.xml b/FSI/cylinderFlap/OpenFOAM-deal.II/precice-config.xml deleted file mode 120000 index f12083976..000000000 --- a/FSI/cylinderFlap/OpenFOAM-deal.II/precice-config.xml +++ /dev/null @@ -1 +0,0 @@ -precice-config_serial.xml \ No newline at end of file diff --git a/FSI/cylinderFlap/OpenFOAM-deal.II/precice-config.xml b/FSI/cylinderFlap/OpenFOAM-deal.II/precice-config.xml new file mode 100644 index 000000000..677649b0a --- /dev/null +++ b/FSI/cylinderFlap/OpenFOAM-deal.II/precice-config.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/FSI/cylinderFlap/OpenFOAM-deal.II/precice-config_parallel.xml b/FSI/cylinderFlap/OpenFOAM-deal.II/precice-config_parallel.xml deleted file mode 100644 index 0d681fb75..000000000 --- a/FSI/cylinderFlap/OpenFOAM-deal.II/precice-config_parallel.xml +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/FSI/cylinderFlap/OpenFOAM-deal.II/precice-config_serial.xml b/FSI/cylinderFlap/OpenFOAM-deal.II/precice-config_serial.xml deleted file mode 100644 index 7fc46f8bd..000000000 --- a/FSI/cylinderFlap/OpenFOAM-deal.II/precice-config_serial.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From 0a7db8b61735257ef77a0a217047a806c987fe32 Mon Sep 17 00:00:00 2001 From: uekerman Date: Wed, 18 Dec 2019 13:44:35 +0100 Subject: [PATCH 07/12] Update cylinderFlap_2D --- FSI/cylinderFlap_2D/OpenFOAM-deal.II/Allrun | 4 - .../OpenFOAM-deal.II/precice-config.xml | 75 ++++++++++++++++++- .../precice-config_parallel.xml | 75 ------------------- .../precice-config_serial.xml | 74 ------------------ FSI/cylinderFlap_2D/OpenFOAM-deal.II/runFluid | 7 -- 5 files changed, 74 insertions(+), 161 deletions(-) mode change 120000 => 100644 FSI/cylinderFlap_2D/OpenFOAM-deal.II/precice-config.xml delete mode 100644 FSI/cylinderFlap_2D/OpenFOAM-deal.II/precice-config_parallel.xml delete mode 100644 FSI/cylinderFlap_2D/OpenFOAM-deal.II/precice-config_serial.xml diff --git a/FSI/cylinderFlap_2D/OpenFOAM-deal.II/Allrun b/FSI/cylinderFlap_2D/OpenFOAM-deal.II/Allrun index 079c89309..5b2791eb9 100755 --- a/FSI/cylinderFlap_2D/OpenFOAM-deal.II/Allrun +++ b/FSI/cylinderFlap_2D/OpenFOAM-deal.II/Allrun @@ -45,16 +45,12 @@ Participant1="Fluid" if [ $parallel -eq 1 ]; then echo " Decomposing the case..." decomposePar -force -case ${Participant1} > ${Participant1}_decomposePar.log 2>&1 - echo " Setting up the preCICE configuration file for a parallel simulation..." - ln -s -f precice-config_parallel.xml precice-config.xml cd ${Participant1} nproc=$(getNumberOfProcessors) cd .. echo " Starting the ${Participant1} participant in parallel..." mpirun -np ${nproc} ${Solver1} -parallel -case ${Participant1} > ${Participant1}.log 2>&1 & else - echo " Setting up the preCICE configuration file for a serial simulation..." - ln -s -f precice-config_serial.xml precice-config.xml echo " Starting the ${Participant1} participant in serial..." ${Solver1} -case ${Participant1} > ${Participant1}.log 2>&1 & fi diff --git a/FSI/cylinderFlap_2D/OpenFOAM-deal.II/precice-config.xml b/FSI/cylinderFlap_2D/OpenFOAM-deal.II/precice-config.xml deleted file mode 120000 index f12083976..000000000 --- a/FSI/cylinderFlap_2D/OpenFOAM-deal.II/precice-config.xml +++ /dev/null @@ -1 +0,0 @@ -precice-config_serial.xml \ No newline at end of file diff --git a/FSI/cylinderFlap_2D/OpenFOAM-deal.II/precice-config.xml b/FSI/cylinderFlap_2D/OpenFOAM-deal.II/precice-config.xml new file mode 100644 index 000000000..691c80c56 --- /dev/null +++ b/FSI/cylinderFlap_2D/OpenFOAM-deal.II/precice-config.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/FSI/cylinderFlap_2D/OpenFOAM-deal.II/precice-config_parallel.xml b/FSI/cylinderFlap_2D/OpenFOAM-deal.II/precice-config_parallel.xml deleted file mode 100644 index 5a66ce133..000000000 --- a/FSI/cylinderFlap_2D/OpenFOAM-deal.II/precice-config_parallel.xml +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/FSI/cylinderFlap_2D/OpenFOAM-deal.II/precice-config_serial.xml b/FSI/cylinderFlap_2D/OpenFOAM-deal.II/precice-config_serial.xml deleted file mode 100644 index 516a4d4bd..000000000 --- a/FSI/cylinderFlap_2D/OpenFOAM-deal.II/precice-config_serial.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/FSI/cylinderFlap_2D/OpenFOAM-deal.II/runFluid b/FSI/cylinderFlap_2D/OpenFOAM-deal.II/runFluid index b5c16ddbd..3223006a0 100755 --- a/FSI/cylinderFlap_2D/OpenFOAM-deal.II/runFluid +++ b/FSI/cylinderFlap_2D/OpenFOAM-deal.II/runFluid @@ -20,13 +20,6 @@ fi echo "Preparing and running the Fluid participant..." -# Prepare -if [ $parallel -eq 1 ]; then - ln -s -f precice-config_parallel.xml precice-config.xml -else - ln -s -f precice-config_serial.xml precice-config.xml -fi - rm -rfv Fluid/0/ cp -r Fluid/0.orig/ Fluid/0/ blockMesh -case Fluid From 660629febfb907eaff7d6cdb6f0f03c4892e2751 Mon Sep 17 00:00:00 2001 From: uekerman Date: Wed, 18 Dec 2019 13:51:12 +0100 Subject: [PATCH 08/12] Update perpendicular flap --- FSI/flap_perp/OpenFOAM-CalculiX/Allrun | 4 - .../OpenFOAM-CalculiX/precice-config.xml | 82 +++++++++++++++++- .../precice-config_parallel.xml | 82 ------------------ .../precice-config_serial.xml | 81 ------------------ FSI/flap_perp/OpenFOAM-CalculiX/runFluid | 7 -- FSI/flap_perp/OpenFOAM-CalculiX/runSolid | 3 +- .../OpenFOAM-FEniCS/precice-config.xml | 82 +++++++++++++++++- .../OpenFOAM-FEniCS/precice-config_serial.xml | 81 ------------------ FSI/flap_perp/OpenFOAM-FEniCS/runFluid | 8 -- FSI/flap_perp/OpenFOAM-deal.II/Allrun | 4 - .../OpenFOAM-deal.II/precice-config.xml | 74 ++++++++++++++++- .../precice-config_parallel.xml | 74 ----------------- .../precice-config_serial.xml | 73 ---------------- FSI/flap_perp/OpenFOAM-deal.II/runFluid | 7 -- FSI/flap_perp/SU2-CalculiX/precice-config.xml | 83 ++++++++++++++++++- .../SU2-CalculiX/precice-config_parallel.xml | 83 ------------------- .../SU2-CalculiX/precice-config_serial.xml | 82 ------------------ .../SU2-CalculiX/runTutorial_parallel.sh | 2 - .../SU2-CalculiX/runTutorial_serial.sh | 2 - 19 files changed, 318 insertions(+), 596 deletions(-) mode change 120000 => 100644 FSI/flap_perp/OpenFOAM-CalculiX/precice-config.xml delete mode 100644 FSI/flap_perp/OpenFOAM-CalculiX/precice-config_parallel.xml delete mode 100644 FSI/flap_perp/OpenFOAM-CalculiX/precice-config_serial.xml mode change 120000 => 100644 FSI/flap_perp/OpenFOAM-FEniCS/precice-config.xml delete mode 100644 FSI/flap_perp/OpenFOAM-FEniCS/precice-config_serial.xml mode change 120000 => 100644 FSI/flap_perp/OpenFOAM-deal.II/precice-config.xml delete mode 100644 FSI/flap_perp/OpenFOAM-deal.II/precice-config_parallel.xml delete mode 100644 FSI/flap_perp/OpenFOAM-deal.II/precice-config_serial.xml mode change 120000 => 100644 FSI/flap_perp/SU2-CalculiX/precice-config.xml delete mode 100644 FSI/flap_perp/SU2-CalculiX/precice-config_parallel.xml delete mode 100644 FSI/flap_perp/SU2-CalculiX/precice-config_serial.xml diff --git a/FSI/flap_perp/OpenFOAM-CalculiX/Allrun b/FSI/flap_perp/OpenFOAM-CalculiX/Allrun index bff0c6ae3..69ffe44a9 100755 --- a/FSI/flap_perp/OpenFOAM-CalculiX/Allrun +++ b/FSI/flap_perp/OpenFOAM-CalculiX/Allrun @@ -48,16 +48,12 @@ Participant1="Fluid" if [ $parallel -eq 1 ]; then echo " Decomposing the case..." decomposePar -force -case ${Participant1} > ${Participant1}_decomposePar.log 2>&1 - echo " Setting up the preCICE configuration file for a parallel simulation..." - ln -s -f precice-config_parallel.xml precice-config.xml cd ${Participant1} nproc=$(getNumberOfProcessors) cd .. echo " Starting the ${Participant1} participant in parallel..." mpirun -np ${nproc} ${Solver1} -parallel -case ${Participant1} > ${Participant1}.log 2>&1 & else - echo " Setting up the preCICE configuration file for a serial simulation..." - ln -s -f precice-config_serial.xml precice-config.xml echo " Starting the ${Participant1} participant in serial..." ${Solver1} -case ${Participant1} > ${Participant1}.log 2>&1 & fi diff --git a/FSI/flap_perp/OpenFOAM-CalculiX/precice-config.xml b/FSI/flap_perp/OpenFOAM-CalculiX/precice-config.xml deleted file mode 120000 index f12083976..000000000 --- a/FSI/flap_perp/OpenFOAM-CalculiX/precice-config.xml +++ /dev/null @@ -1 +0,0 @@ -precice-config_serial.xml \ No newline at end of file diff --git a/FSI/flap_perp/OpenFOAM-CalculiX/precice-config.xml b/FSI/flap_perp/OpenFOAM-CalculiX/precice-config.xml new file mode 100644 index 000000000..40fa01135 --- /dev/null +++ b/FSI/flap_perp/OpenFOAM-CalculiX/precice-config.xml @@ -0,0 +1,81 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/FSI/flap_perp/OpenFOAM-CalculiX/precice-config_parallel.xml b/FSI/flap_perp/OpenFOAM-CalculiX/precice-config_parallel.xml deleted file mode 100644 index 25b7e28cb..000000000 --- a/FSI/flap_perp/OpenFOAM-CalculiX/precice-config_parallel.xml +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/FSI/flap_perp/OpenFOAM-CalculiX/precice-config_serial.xml b/FSI/flap_perp/OpenFOAM-CalculiX/precice-config_serial.xml deleted file mode 100644 index 0ad475537..000000000 --- a/FSI/flap_perp/OpenFOAM-CalculiX/precice-config_serial.xml +++ /dev/null @@ -1,81 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/FSI/flap_perp/OpenFOAM-CalculiX/runFluid b/FSI/flap_perp/OpenFOAM-CalculiX/runFluid index 16845e6b5..02e56e134 100755 --- a/FSI/flap_perp/OpenFOAM-CalculiX/runFluid +++ b/FSI/flap_perp/OpenFOAM-CalculiX/runFluid @@ -20,13 +20,6 @@ fi echo "Preparing and running the Fluid participant..." -# Prepare -if [ $parallel -eq 1 ]; then - ln -s -f precice-config_parallel.xml precice-config.xml -else - ln -s -f precice-config_serial.xml precice-config.xml -fi - rm -rfv Fluid/0/ cp -r Fluid/0.orig/ Fluid/0/ blockMesh -case Fluid diff --git a/FSI/flap_perp/OpenFOAM-CalculiX/runSolid b/FSI/flap_perp/OpenFOAM-CalculiX/runSolid index 870de0cb8..58614c9ab 100755 --- a/FSI/flap_perp/OpenFOAM-CalculiX/runSolid +++ b/FSI/flap_perp/OpenFOAM-CalculiX/runSolid @@ -9,7 +9,6 @@ # The script "Allclean" cleans-up the result and log files. echo "Preparing and running the Solid participant..." -echo "Note: run the script runFluid first. It sets up a link to the correct precice-config.xml file." # Prepare in silent mode cd Solid @@ -17,4 +16,4 @@ cd Solid cd - # Run -ccx_preCICE -i Solid/flap -precice-participant Calculix \ No newline at end of file +ccx_preCICE -i Solid/flap -precice-participant Calculix diff --git a/FSI/flap_perp/OpenFOAM-FEniCS/precice-config.xml b/FSI/flap_perp/OpenFOAM-FEniCS/precice-config.xml deleted file mode 120000 index f12083976..000000000 --- a/FSI/flap_perp/OpenFOAM-FEniCS/precice-config.xml +++ /dev/null @@ -1 +0,0 @@ -precice-config_serial.xml \ No newline at end of file diff --git a/FSI/flap_perp/OpenFOAM-FEniCS/precice-config.xml b/FSI/flap_perp/OpenFOAM-FEniCS/precice-config.xml new file mode 100644 index 000000000..3b041ada9 --- /dev/null +++ b/FSI/flap_perp/OpenFOAM-FEniCS/precice-config.xml @@ -0,0 +1,81 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/FSI/flap_perp/OpenFOAM-FEniCS/precice-config_serial.xml b/FSI/flap_perp/OpenFOAM-FEniCS/precice-config_serial.xml deleted file mode 100644 index b2a7b9da5..000000000 --- a/FSI/flap_perp/OpenFOAM-FEniCS/precice-config_serial.xml +++ /dev/null @@ -1,81 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/FSI/flap_perp/OpenFOAM-FEniCS/runFluid b/FSI/flap_perp/OpenFOAM-FEniCS/runFluid index 65f284804..d512d9e74 100755 --- a/FSI/flap_perp/OpenFOAM-FEniCS/runFluid +++ b/FSI/flap_perp/OpenFOAM-FEniCS/runFluid @@ -20,14 +20,6 @@ fi echo "Preparing and running the Fluid participant..." -# Prepare -if [ $parallel -eq 1 ]; then - ln -s -f precice-config_parallel.xml precice-config.xml -else - ln -s -f precice-config_serial.xml precice-config.xml -fi - - rm -rfv Fluid/0/ cp -r Fluid/0.orig/ Fluid/0/ diff --git a/FSI/flap_perp/OpenFOAM-deal.II/Allrun b/FSI/flap_perp/OpenFOAM-deal.II/Allrun index 079c89309..5b2791eb9 100755 --- a/FSI/flap_perp/OpenFOAM-deal.II/Allrun +++ b/FSI/flap_perp/OpenFOAM-deal.II/Allrun @@ -45,16 +45,12 @@ Participant1="Fluid" if [ $parallel -eq 1 ]; then echo " Decomposing the case..." decomposePar -force -case ${Participant1} > ${Participant1}_decomposePar.log 2>&1 - echo " Setting up the preCICE configuration file for a parallel simulation..." - ln -s -f precice-config_parallel.xml precice-config.xml cd ${Participant1} nproc=$(getNumberOfProcessors) cd .. echo " Starting the ${Participant1} participant in parallel..." mpirun -np ${nproc} ${Solver1} -parallel -case ${Participant1} > ${Participant1}.log 2>&1 & else - echo " Setting up the preCICE configuration file for a serial simulation..." - ln -s -f precice-config_serial.xml precice-config.xml echo " Starting the ${Participant1} participant in serial..." ${Solver1} -case ${Participant1} > ${Participant1}.log 2>&1 & fi diff --git a/FSI/flap_perp/OpenFOAM-deal.II/precice-config.xml b/FSI/flap_perp/OpenFOAM-deal.II/precice-config.xml deleted file mode 120000 index f12083976..000000000 --- a/FSI/flap_perp/OpenFOAM-deal.II/precice-config.xml +++ /dev/null @@ -1 +0,0 @@ -precice-config_serial.xml \ No newline at end of file diff --git a/FSI/flap_perp/OpenFOAM-deal.II/precice-config.xml b/FSI/flap_perp/OpenFOAM-deal.II/precice-config.xml new file mode 100644 index 000000000..64ab8b655 --- /dev/null +++ b/FSI/flap_perp/OpenFOAM-deal.II/precice-config.xml @@ -0,0 +1,73 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/FSI/flap_perp/OpenFOAM-deal.II/precice-config_parallel.xml b/FSI/flap_perp/OpenFOAM-deal.II/precice-config_parallel.xml deleted file mode 100644 index 06efe0e9b..000000000 --- a/FSI/flap_perp/OpenFOAM-deal.II/precice-config_parallel.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/FSI/flap_perp/OpenFOAM-deal.II/precice-config_serial.xml b/FSI/flap_perp/OpenFOAM-deal.II/precice-config_serial.xml deleted file mode 100644 index 1aed84992..000000000 --- a/FSI/flap_perp/OpenFOAM-deal.II/precice-config_serial.xml +++ /dev/null @@ -1,73 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/FSI/flap_perp/OpenFOAM-deal.II/runFluid b/FSI/flap_perp/OpenFOAM-deal.II/runFluid index 193375d3b..1a5b143a6 100755 --- a/FSI/flap_perp/OpenFOAM-deal.II/runFluid +++ b/FSI/flap_perp/OpenFOAM-deal.II/runFluid @@ -20,13 +20,6 @@ fi echo "Preparing and running the Fluid participant..." -# Prepare -if [ $parallel -eq 1 ]; then - ln -s -f precice-config_parallel.xml precice-config.xml -else - ln -s -f precice-config_serial.xml precice-config.xml -fi - rm -rfv Fluid/0/ cp -r Fluid/0.orig/ Fluid/0/ blockMesh -case Fluid diff --git a/FSI/flap_perp/SU2-CalculiX/precice-config.xml b/FSI/flap_perp/SU2-CalculiX/precice-config.xml deleted file mode 120000 index f12083976..000000000 --- a/FSI/flap_perp/SU2-CalculiX/precice-config.xml +++ /dev/null @@ -1 +0,0 @@ -precice-config_serial.xml \ No newline at end of file diff --git a/FSI/flap_perp/SU2-CalculiX/precice-config.xml b/FSI/flap_perp/SU2-CalculiX/precice-config.xml new file mode 100644 index 000000000..70642c2a3 --- /dev/null +++ b/FSI/flap_perp/SU2-CalculiX/precice-config.xml @@ -0,0 +1,82 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/FSI/flap_perp/SU2-CalculiX/precice-config_parallel.xml b/FSI/flap_perp/SU2-CalculiX/precice-config_parallel.xml deleted file mode 100644 index 8435be9af..000000000 --- a/FSI/flap_perp/SU2-CalculiX/precice-config_parallel.xml +++ /dev/null @@ -1,83 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/FSI/flap_perp/SU2-CalculiX/precice-config_serial.xml b/FSI/flap_perp/SU2-CalculiX/precice-config_serial.xml deleted file mode 100644 index 55eec6b2e..000000000 --- a/FSI/flap_perp/SU2-CalculiX/precice-config_serial.xml +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/FSI/flap_perp/SU2-CalculiX/runTutorial_parallel.sh b/FSI/flap_perp/SU2-CalculiX/runTutorial_parallel.sh index c22b9b69c..2d329f9a2 100755 --- a/FSI/flap_perp/SU2-CalculiX/runTutorial_parallel.sh +++ b/FSI/flap_perp/SU2-CalculiX/runTutorial_parallel.sh @@ -1,8 +1,6 @@ #! /bin/bash -ln -sf precice-config_parallel.xml precice-config.xml - tmux has-session -t PreciceSU2-Calculix-newtonParallel 2>/dev/null if [ "$?" -eq 1 ] ; then tmux new-session -d -s 'PreciceSU2-Calculix-newtonParallel' diff --git a/FSI/flap_perp/SU2-CalculiX/runTutorial_serial.sh b/FSI/flap_perp/SU2-CalculiX/runTutorial_serial.sh index a244af2ec..de486e22d 100755 --- a/FSI/flap_perp/SU2-CalculiX/runTutorial_serial.sh +++ b/FSI/flap_perp/SU2-CalculiX/runTutorial_serial.sh @@ -1,8 +1,6 @@ #! /bin/bash -ln -sf precice-config_serial.xml precice-config.xml - tmux has-session -t PreciceSU2-Calculix-newtonParallel 2>/dev/null if [ "$?" -eq 1 ] ; then tmux new-session -d -s 'PreciceSU2-Calculix-newtonParallel' From 323ff2ee5407ace42839d23e0b9bc221d519ffb0 Mon Sep 17 00:00:00 2001 From: uekerman Date: Wed, 18 Dec 2019 13:52:51 +0100 Subject: [PATCH 09/12] Update perp_flap_2D --- FSI/flap_perp_2D/OpenFOAM-deal.II/Allrun | 4 - .../OpenFOAM-deal.II/precice-config.xml | 74 +++++++++++++++- .../precice-config_parallel.xml | 74 ---------------- .../precice-config_serial.xml | 84 ------------------- FSI/flap_perp_2D/OpenFOAM-deal.II/runFluid | 7 -- 5 files changed, 73 insertions(+), 170 deletions(-) mode change 120000 => 100644 FSI/flap_perp_2D/OpenFOAM-deal.II/precice-config.xml delete mode 100644 FSI/flap_perp_2D/OpenFOAM-deal.II/precice-config_parallel.xml delete mode 100644 FSI/flap_perp_2D/OpenFOAM-deal.II/precice-config_serial.xml diff --git a/FSI/flap_perp_2D/OpenFOAM-deal.II/Allrun b/FSI/flap_perp_2D/OpenFOAM-deal.II/Allrun index 079c89309..5b2791eb9 100755 --- a/FSI/flap_perp_2D/OpenFOAM-deal.II/Allrun +++ b/FSI/flap_perp_2D/OpenFOAM-deal.II/Allrun @@ -45,16 +45,12 @@ Participant1="Fluid" if [ $parallel -eq 1 ]; then echo " Decomposing the case..." decomposePar -force -case ${Participant1} > ${Participant1}_decomposePar.log 2>&1 - echo " Setting up the preCICE configuration file for a parallel simulation..." - ln -s -f precice-config_parallel.xml precice-config.xml cd ${Participant1} nproc=$(getNumberOfProcessors) cd .. echo " Starting the ${Participant1} participant in parallel..." mpirun -np ${nproc} ${Solver1} -parallel -case ${Participant1} > ${Participant1}.log 2>&1 & else - echo " Setting up the preCICE configuration file for a serial simulation..." - ln -s -f precice-config_serial.xml precice-config.xml echo " Starting the ${Participant1} participant in serial..." ${Solver1} -case ${Participant1} > ${Participant1}.log 2>&1 & fi diff --git a/FSI/flap_perp_2D/OpenFOAM-deal.II/precice-config.xml b/FSI/flap_perp_2D/OpenFOAM-deal.II/precice-config.xml deleted file mode 120000 index f12083976..000000000 --- a/FSI/flap_perp_2D/OpenFOAM-deal.II/precice-config.xml +++ /dev/null @@ -1 +0,0 @@ -precice-config_serial.xml \ No newline at end of file diff --git a/FSI/flap_perp_2D/OpenFOAM-deal.II/precice-config.xml b/FSI/flap_perp_2D/OpenFOAM-deal.II/precice-config.xml new file mode 100644 index 000000000..d4593da98 --- /dev/null +++ b/FSI/flap_perp_2D/OpenFOAM-deal.II/precice-config.xml @@ -0,0 +1,73 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/FSI/flap_perp_2D/OpenFOAM-deal.II/precice-config_parallel.xml b/FSI/flap_perp_2D/OpenFOAM-deal.II/precice-config_parallel.xml deleted file mode 100644 index c20ca34d7..000000000 --- a/FSI/flap_perp_2D/OpenFOAM-deal.II/precice-config_parallel.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/FSI/flap_perp_2D/OpenFOAM-deal.II/precice-config_serial.xml b/FSI/flap_perp_2D/OpenFOAM-deal.II/precice-config_serial.xml deleted file mode 100644 index 205372bc4..000000000 --- a/FSI/flap_perp_2D/OpenFOAM-deal.II/precice-config_serial.xml +++ /dev/null @@ -1,84 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/FSI/flap_perp_2D/OpenFOAM-deal.II/runFluid b/FSI/flap_perp_2D/OpenFOAM-deal.II/runFluid index d890a7d42..f4b9b9102 100755 --- a/FSI/flap_perp_2D/OpenFOAM-deal.II/runFluid +++ b/FSI/flap_perp_2D/OpenFOAM-deal.II/runFluid @@ -20,13 +20,6 @@ fi echo "Preparing and running the Fluid participant..." -# Prepare -if [ $parallel -eq 1 ]; then - ln -s -f precice-config_parallel.xml precice-config.xml -else - ln -s -f precice-config_serial.xml precice-config.xml -fi - rm -rfv Fluid/0/ cp -r Fluid/0.orig/ Fluid/0/ blockMesh -case Fluid From 6db37f1ac36bcd2e4a9865c76207d4f9142121bc Mon Sep 17 00:00:00 2001 From: uekerman Date: Wed, 18 Dec 2019 16:36:06 +0100 Subject: [PATCH 10/12] Change post-processing to acceleration --- .../buoyantPimpleFoam-fenics/precice-config.xml | 4 ++-- .../buoyantPimpleFoam-nutils/precice-config.xml | 4 ++-- FSI/3D_Tube/OpenFOAM-CalculiX/precice-config.xml | 4 ++-- FSI/cylinderFlap/OpenFOAM-CalculiX/precice-config.xml | 4 ++-- FSI/cylinderFlap/OpenFOAM-FEniCS/precice-config.xml | 4 ++-- FSI/cylinderFlap/OpenFOAM-deal.II/precice-config.xml | 4 ++-- FSI/cylinderFlap_2D/OpenFOAM-deal.II/precice-config.xml | 4 ++-- FSI/flap_perp/OpenFOAM-CalculiX/precice-config.xml | 4 ++-- FSI/flap_perp/OpenFOAM-FEniCS/precice-config.xml | 4 ++-- FSI/flap_perp/OpenFOAM-deal.II/precice-config.xml | 4 ++-- FSI/flap_perp/SU2-CalculiX/precice-config.xml | 8 ++++---- FSI/flap_perp_2D/OpenFOAM-deal.II/precice-config.xml | 4 ++-- HT/partitioned-heat/fenics-fenics/precice-config.xml | 4 ++-- SSI/loaded_beam/CalculiX-CalculiX/precice-config.xml | 8 ++++---- 14 files changed, 32 insertions(+), 32 deletions(-) diff --git a/CHT/flow-over-plate/buoyantPimpleFoam-fenics/precice-config.xml b/CHT/flow-over-plate/buoyantPimpleFoam-fenics/precice-config.xml index 9e3d8a7e8..b667edfd0 100644 --- a/CHT/flow-over-plate/buoyantPimpleFoam-fenics/precice-config.xml +++ b/CHT/flow-over-plate/buoyantPimpleFoam-fenics/precice-config.xml @@ -47,13 +47,13 @@ - + - + diff --git a/CHT/flow-over-plate/buoyantPimpleFoam-nutils/precice-config.xml b/CHT/flow-over-plate/buoyantPimpleFoam-nutils/precice-config.xml index 21e6a8e76..445ebb39e 100644 --- a/CHT/flow-over-plate/buoyantPimpleFoam-nutils/precice-config.xml +++ b/CHT/flow-over-plate/buoyantPimpleFoam-nutils/precice-config.xml @@ -50,10 +50,10 @@ - + - + diff --git a/FSI/3D_Tube/OpenFOAM-CalculiX/precice-config.xml b/FSI/3D_Tube/OpenFOAM-CalculiX/precice-config.xml index 0c533b24d..2afc839ef 100644 --- a/FSI/3D_Tube/OpenFOAM-CalculiX/precice-config.xml +++ b/FSI/3D_Tube/OpenFOAM-CalculiX/precice-config.xml @@ -54,13 +54,13 @@ - + - + diff --git a/FSI/cylinderFlap/OpenFOAM-CalculiX/precice-config.xml b/FSI/cylinderFlap/OpenFOAM-CalculiX/precice-config.xml index 5a76d7fbd..fdc692105 100644 --- a/FSI/cylinderFlap/OpenFOAM-CalculiX/precice-config.xml +++ b/FSI/cylinderFlap/OpenFOAM-CalculiX/precice-config.xml @@ -55,14 +55,14 @@ - + - + diff --git a/FSI/cylinderFlap/OpenFOAM-FEniCS/precice-config.xml b/FSI/cylinderFlap/OpenFOAM-FEniCS/precice-config.xml index eae2347ef..fc40a0525 100644 --- a/FSI/cylinderFlap/OpenFOAM-FEniCS/precice-config.xml +++ b/FSI/cylinderFlap/OpenFOAM-FEniCS/precice-config.xml @@ -55,14 +55,14 @@ - + - + diff --git a/FSI/cylinderFlap/OpenFOAM-deal.II/precice-config.xml b/FSI/cylinderFlap/OpenFOAM-deal.II/precice-config.xml index 677649b0a..f11d038a5 100644 --- a/FSI/cylinderFlap/OpenFOAM-deal.II/precice-config.xml +++ b/FSI/cylinderFlap/OpenFOAM-deal.II/precice-config.xml @@ -59,14 +59,14 @@ - + - + diff --git a/FSI/cylinderFlap_2D/OpenFOAM-deal.II/precice-config.xml b/FSI/cylinderFlap_2D/OpenFOAM-deal.II/precice-config.xml index 691c80c56..ab8e5cc5f 100644 --- a/FSI/cylinderFlap_2D/OpenFOAM-deal.II/precice-config.xml +++ b/FSI/cylinderFlap_2D/OpenFOAM-deal.II/precice-config.xml @@ -59,14 +59,14 @@ - + - + diff --git a/FSI/flap_perp/OpenFOAM-CalculiX/precice-config.xml b/FSI/flap_perp/OpenFOAM-CalculiX/precice-config.xml index 40fa01135..99fe039f0 100644 --- a/FSI/flap_perp/OpenFOAM-CalculiX/precice-config.xml +++ b/FSI/flap_perp/OpenFOAM-CalculiX/precice-config.xml @@ -64,14 +64,14 @@ - + - + --> diff --git a/FSI/flap_perp/OpenFOAM-FEniCS/precice-config.xml b/FSI/flap_perp/OpenFOAM-FEniCS/precice-config.xml index 3b041ada9..93ae23e11 100644 --- a/FSI/flap_perp/OpenFOAM-FEniCS/precice-config.xml +++ b/FSI/flap_perp/OpenFOAM-FEniCS/precice-config.xml @@ -64,14 +64,14 @@ - + - + diff --git a/FSI/flap_perp/OpenFOAM-deal.II/precice-config.xml b/FSI/flap_perp/OpenFOAM-deal.II/precice-config.xml index 64ab8b655..c797f4c4f 100644 --- a/FSI/flap_perp/OpenFOAM-deal.II/precice-config.xml +++ b/FSI/flap_perp/OpenFOAM-deal.II/precice-config.xml @@ -58,14 +58,14 @@ - + - + diff --git a/FSI/flap_perp/SU2-CalculiX/precice-config.xml b/FSI/flap_perp/SU2-CalculiX/precice-config.xml index 70642c2a3..c5c3030df 100644 --- a/FSI/flap_perp/SU2-CalculiX/precice-config.xml +++ b/FSI/flap_perp/SU2-CalculiX/precice-config.xml @@ -54,7 +54,7 @@ - + @@ -62,12 +62,12 @@ - + - + --> diff --git a/FSI/flap_perp_2D/OpenFOAM-deal.II/precice-config.xml b/FSI/flap_perp_2D/OpenFOAM-deal.II/precice-config.xml index d4593da98..751a20808 100644 --- a/FSI/flap_perp_2D/OpenFOAM-deal.II/precice-config.xml +++ b/FSI/flap_perp_2D/OpenFOAM-deal.II/precice-config.xml @@ -58,14 +58,14 @@ - + - + diff --git a/HT/partitioned-heat/fenics-fenics/precice-config.xml b/HT/partitioned-heat/fenics-fenics/precice-config.xml index 20f8897b3..4a7edf4d0 100644 --- a/HT/partitioned-heat/fenics-fenics/precice-config.xml +++ b/HT/partitioned-heat/fenics-fenics/precice-config.xml @@ -57,14 +57,14 @@ - + - + diff --git a/SSI/loaded_beam/CalculiX-CalculiX/precice-config.xml b/SSI/loaded_beam/CalculiX-CalculiX/precice-config.xml index 2fa6ab17b..0af590e2f 100755 --- a/SSI/loaded_beam/CalculiX-CalculiX/precice-config.xml +++ b/SSI/loaded_beam/CalculiX-CalculiX/precice-config.xml @@ -54,7 +54,7 @@ - + @@ -62,13 +62,13 @@ - + - + - + From 02974bf8c66d54c4410704e2f7a6e98edc7e34f8 Mon Sep 17 00:00:00 2001 From: uekerman Date: Wed, 18 Dec 2019 16:43:17 +0100 Subject: [PATCH 11/12] Format some cosmetics --- SSI/loaded_beam/CalculiX-CalculiX/precice-config.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SSI/loaded_beam/CalculiX-CalculiX/precice-config.xml b/SSI/loaded_beam/CalculiX-CalculiX/precice-config.xml index 216ab0bb7..c1481e281 100755 --- a/SSI/loaded_beam/CalculiX-CalculiX/precice-config.xml +++ b/SSI/loaded_beam/CalculiX-CalculiX/precice-config.xml @@ -43,7 +43,7 @@ - + From 00bd4a8459661ca184e23d80f29445ba9b93d141 Mon Sep 17 00:00:00 2001 From: Gerasimos Chourdakis Date: Thu, 19 Dec 2019 22:50:34 +0100 Subject: [PATCH 12/12] flap_perp/OF-CCX: Remove duplicate precice-config_[serial|parallel].xml --- .../precice-config_parallel.xml | 81 ------------------- .../precice-config_serial.xml | 80 ------------------ 2 files changed, 161 deletions(-) delete mode 100644 FSI/flap_perp/OpenFOAM-CalculiX/precice-config_parallel.xml delete mode 100644 FSI/flap_perp/OpenFOAM-CalculiX/precice-config_serial.xml diff --git a/FSI/flap_perp/OpenFOAM-CalculiX/precice-config_parallel.xml b/FSI/flap_perp/OpenFOAM-CalculiX/precice-config_parallel.xml deleted file mode 100644 index 4bb505821..000000000 --- a/FSI/flap_perp/OpenFOAM-CalculiX/precice-config_parallel.xml +++ /dev/null @@ -1,81 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/FSI/flap_perp/OpenFOAM-CalculiX/precice-config_serial.xml b/FSI/flap_perp/OpenFOAM-CalculiX/precice-config_serial.xml deleted file mode 100644 index 7aff0958f..000000000 --- a/FSI/flap_perp/OpenFOAM-CalculiX/precice-config_serial.xml +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -