Fix ccx paths and cleaning script

elastic-tube-3d/clean.sh

@@ -7,52 +7,43 @@ echo "Cleaning..."
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 # Participant 1: Fluid
-Participant1="Fluid"
+Participant1="fluid-openfoam"
 cd ${Participant1}
     # Clean the case
-    #cleanCase
+    # prevent cleaning the mesh
+    mv ./constant/polyMesh ./constant/mesh
+    cleanCase
     rm -rfv 0
+    # restore mesh files
+    mv ./constant/mesh ./constant/polyMesh
     # Create an empty .foam file for ParaView
     # Note: ".foam" triggers the native OpenFOAM reader of ParaView.
     # Change to ".OpenFOAM" to use the OpenFOAM reader provided with OpenFOAM.
     touch ${Participant1}.foam
+    rm -fv ${Participant1}_decomposePar.log
+    rm -fv ${Participant1}.log
+    rm -fv ${Participant1}_reconstructPar.log
+    rm -fv precice-*.log
+    rm -fv precice-*-events.json
 cd ..
-# Remove the log files
-rm -fv ${Participant1}_decomposePar.log
-rm -fv ${Participant1}.log
-rm -fv ${Participant1}_reconstructPar.log
 
 # Participant 2: Solid
-Participant2="Solid"
+Participant2="solid-calculix"
 cd ${Participant2}
     # Clean the case
     rm -fv *.log
     rm -fv tube.cvg
     rm -fv tube.dat
     rm -fv tube.frd
     rm -fv tube.sta
+    rm -fv tube.12d
+    rm -fv spooles.out
+    rm -fv precice-*.log
+    rm -fv precice-*-events.json
 cd ..
-# Remove the log files
-rm -fv spooles.out
-rm -fv ${Participant2}.log
-
-# Remove the preCICE-related log files
-echo "Deleting the preCICE log files..."
-rm -fv \
-    precice-*.log \
-    precice-postProcessingInfo.log \
-    precice-*-events.json
-
-# Output files for preCICE versions before 1.2:
-rm -fv \
-    iterations-${Participant1}.txt iterations-${Participant2}.txt \
-    convergence-${Participant1}.txt convergence-${Participant2}.txt \
-    Events-${Participant1}.log Events-${Participant2}.log \
-    EventTimings-${Participant1}.log EventTimings-${Participant2}.log
 
 # Remove the preCICE address files
 rm -rfv precice-run
-rm -fv .*.address
 
 echo "Cleaning complete!"
 #------------------------------------------------------------------------------

elastic-tube-3d/solid-calculix/tube.inp

@@ -1,9 +1,9 @@
-*INCLUDE, INPUT=Solid/all.msh
-*INCLUDE, INPUT=Solid/inlet.nam
-*INCLUDE, INPUT=Solid/outlet.nam
-*INCLUDE, INPUT=Solid/wall.nam
-*INCLUDE, INPUT=Solid/interface.nam
-*INCLUDE, INPUT=Solid/interface.sur
+*INCLUDE, INPUT=all.msh
+*INCLUDE, INPUT=inlet.nam
+*INCLUDE, INPUT=outlet.nam
+*INCLUDE, INPUT=wall.nam
+*INCLUDE, INPUT=interface.nam
+*INCLUDE, INPUT=interface.sur
 *MATERIAL, Name=EL
 *ELASTIC
 300000.0, 0.3