Rename folder names Solid and Fluid with capital letter. Add Allrun, update Allclean. Remove hard-coded path.

Author: micheltakken

cht/adapter.comm

@@ -10,6 +10,7 @@ from adapter import *
 # Note: In the OpenFOAM and CalculiX adapters, this is read from a command line argument (--precice-participant),
 #       but I don't know how to pass my own argument to as_run
 participantName = os.environ["PRECICE_PARTICIPANT"]
+tutorial_root = os.environ["TUTORIAL_ROOT"]
 
 # ==========================================================================================
 # Include file in UNITE 90: PreCICE setup (config.comm)

tutorials/buoyantSimpleFoam-aster/Allclean

@@ -5,13 +5,16 @@ echo "Cleaning..."
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 # Participant 1: Solid
-Participant1="solid"
+Participant1="Solid"
 rm -fv ${Participant1}/solid.mess
 rm -fv ${Participant1}/solid.resu
 rm -fv ${Participant1}/solid.rmed
+rm -fv ${Participant1}.log
+rm -fvr ${Participant1}/REPE_OUT
+mkdir ${Participant1}/REPE_OUT
 
 # Participant 2: Fluid
-Participant2="fluid"
+Participant2="Fluid"
 cd ${Participant2}
   cleanCase
   touch Fluid.foam

tutorials/buoyantSimpleFoam-aster/Allrun

@@ -0,0 +1,99 @@
+#!/bin/bash
+
+cd ${0%/*} || exit 1                        # Run from this directory
+. $WM_PROJECT_DIR/bin/tools/RunFunctions    # Tutorial run functions
+
+# This script prepares and runs all the participants in one terminal,
+# forwarding the solvers' output to log files.
+# Alternatively, you may execute the scripts "runSolid" and "runFluid"
+# in separate terminals.
+
+# Run this script with "-parallel" for parallel simulations
+
+# The script "Allclean" cleans-up the result and log files.
+# Set up the run parameters:
+
+# 1 for true, 0 for false
+parallel=0
+if [ "$1" = "-parallel" ]; then
+    parallel=1
+fi
+
+# =============== Participant 1: Fluid ===========================
+Participant1="Fluid"
+
+    # Prepare
+    echo "Preparing the ${Participant1} participant..."
+
+    cd $Participant1
+    echo "  Restoring 0/ from 0.orig/..."
+        #rm -rfv 0
+        #cp -r 0.orig 0
+        blockMesh > ${Participant1}_blockMesh.log 2>&1
+    cd ..
+
+    # Run and get the process id
+    if [ $parallel -eq 1 ]; then
+        echo "  Decomposing the case..."
+        decomposePar -force -case ${Participant1} > ${Participant1}_decomposePar.log 2>&1
+        cd ${Participant1}
+            nproc=$(getNumberOfProcessors)
+        cd ..
+        echo "  Starting the ${Participant1} participant in parallel..."
+        mpirun -np ${nproc} buoyantSimpleFoam -parallel -case ${Participant1} > ${Participant1}.log 2>&1 &
+    else
+        echo "  Starting the ${Participant1} participant in serial..."
+        buoyantSimpleFoam -case ${Participant1} > ${Participant1}.log 2>&1 &
+    fi
+    PIDParticipant1=$!
+
+# =============== Participant 2: Solid ===========================
+Participant2="Solid"
+export PRECICE_PARTICIPANT=${Participant2}
+export TUTORIAL_ROOT=${PWD%/*/*}
+
+    # Run
+    echo "  Starting the ${Participant2} participant..."
+    as_run --run ${Participant2}/solid.export > ${Participant2}.log  2>&1 &
+    PIDParticipant2=$!
+
+
+# =============== Wait for all the participants to finish =======
+echo "Waiting for the participants to exit..., PIDs: ${PIDParticipant1}, ${PIDParticipant2}"
+echo "(you may run 'tail -f ${Participant1}.log' in another terminal to check the progress)"
+
+echo "To interrupt the simulation, press 'c'. Ctrl+C will only send the processes to the background."
+while [ -e /proc/${PIDParticipant1} ]; do
+    read -r -t1 -n1 input
+    if [ "$input" = "c" ]; then
+        kill ${PIDParticipant1}
+        kill ${PIDParticipant2}
+        false
+    fi
+done
+
+if [ $? -ne 0 ] || [ "$(grep -c -E "error:" ${Participant1}.log)" -ne 0 ] || [ "$(grep -c -E "error:" ${Participant2}.log)" -ne 0 ]; then
+    echo ""
+    echo "Something went wrong... See the log files for more."
+    # Precaution
+    kill ${PIDParticipant1}
+    kill ${PIDParticipant2}
+else
+    echo ""
+    echo "The simulation completed! (check for any errors)"
+    if [ $parallel -eq 1 ]; then
+        echo "Reconstructing fields..."
+        reconstructPar -case ${Participant1} > ${Participant1}_reconstructPar.log 2>&1 &
+    fi
+
+    # Workaround for issue #26
+    echo "Problems with time directories without results? Run the script removeObsoleteFolders.sh and see issue #26 on GitHub."
+    # ./removeObsoleteFolders.sh
+
+    echo "You may now open '${Participant1}/${Participant1}.foam' in ParaView."
+    # Note: ".foam" triggers the native OpenFOAM reader of ParaView.
+    # Change to ".OpenFOAM" to use the OpenFOAM reader provided with OpenFOAM.
+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."

tutorials/buoyantSimpleFoam-aster/Allrun_parallel

@@ -0,0 +1 @@
+./Allrun -parallel

…s/buoyantSimpleFoam-aster/solid/def.comm …s/buoyantSimpleFoam-aster/Solid/def.commtutorials/buoyantSimpleFoam-aster/solid/def.comm renamed to tutorials/buoyantSimpleFoam-aster/Solid/def.comm tutorials/buoyantSimpleFoam-aster/solid/def.comm renamed to tutorials/buoyantSimpleFoam-aster/Solid/def.comm

@@ -1,30 +1,32 @@
 etude,fich,3,FR F
 opt_val,rep_dex _VIDE
-etude,fich,3,UL 91
 etude,fich,2,type libr
+etude,fich,3,UL 91
 option,ORBInitRef 0
 etude,fich,4,donnee 0
 option,nbmaxnook 1
 etude,fich,2,resultat 0
+etude,fich,7,serv Local
 nom_fich_export _VIDE
 option,rep_dex 0
 etude,fich,4,compress 0
 etude oui
 debug 0
 opt_val,cpresok RESNOOK
-etude,fich,4,serv Local
 etude,fich,3,donnee 1
+etude,fich,4,serv Local
 serv_fich_export -1
 surcharge,nbfic 0
 etude,fich,6,FR F
-path_etude /home/michel/Git/code_aster-adapter/tutorials/buoyantSimpleFoam-aster/solid
+path_etude /home/michel/Git/code_aster-adapter/tutorials/buoyantSimpleFoam-aster/Solid
 option,rep_outils 0
-etude,fich,6,UL 8
 etude,fich,3,resultat 0
+etude,fich,6,UL 8
 option,cpresok 1
-etude,fich,5,compress 0
-etude,fich,1,FR F
+etude,fich,7,type repe
 etude,fich,1,serv Local
+etude,fich,1,FR F
+etude,fich,5,compress 0
 memoire 512
 etude,fich,1,UL 20
 onglet_actif etude
@@ -35,77 +37,83 @@ etude,fich,4,type mess
 opt_val,exectool _VIDE
 etude,fich,4,resultat 1
 opt_val,mpi_nbcpu 1
-etude,fich,6,compress 0
 etude,fich,1,donnee 1
+etude,fich,6,compress 0
 rex non
+etude,fich,1,nom ./solid.mmed
 etude,fich,1,type mmed
-etude,fich,1,nom /home/michel/Git/code_aster-adapter/tutorials/buoyantSimpleFoam-aster/solid/solid.mmed
 suivi_interactif 0
-path_sources /home/michel/Git/code_aster-adapter/tutorials/buoyantSimpleFoam-aster/solid
+path_sources /home/michel/Git/code_aster-adapter/tutorials/buoyantSimpleFoam-aster/Solid
 pre_eda non
 etude,fich,4,FR F
 option,multiple 1
 opt_val,only_nook _VIDE
+etude,fich,3,nom ./def.comm
 etude,fich,4,UL 6
-etude,fich,3,nom /home/michel/Git/code_aster-adapter/tutorials/buoyantSimpleFoam-aster/solid/def.comm
 option,mpi_nbcpu 1
 serv_tests -1
 etude,fich,6,serv Local
-etude,fich,5,nom /home/michel/Git/code_aster-adapter/tutorials/buoyantSimpleFoam-aster/solid/solid.rmed
+etude,fich,5,nom ./solid.rmed
 make_etude run
 option,depart 1
 option,only_nook 1
 opt_val,ORBInitRef _VIDE
-nom_profil /home/michel/Git/code_aster-adapter/tutorials/buoyantSimpleFoam-aster/solid/solid.astk
+nom_profil /home/michel/Git/code_aster-adapter/tutorials/buoyantSimpleFoam-aster/Solid/solid.astk
 args _VIDE
-etude,fich,5,resultat 1
+etude,fich,7,nom /home/michel/Git/code_aster-adapter/tutorials/buoyantSimpleFoam-aster/Solid/REPE_OUT
 etude,fich,0,donnee 1
+etude,fich,5,resultat 1
+etude,fich,7,compress 0
 etude,fich,3,serv Local
 etude,fich,0,compress 0
 option,corefilesize 1
 opt_val,distrib _VIDE
 asdeno non
 serv_surcharge -1
 serv_sources -1
+etude,fich,7,FR R
 surcharge non
-etude,fich,6,type resu
+etude,fich,7,UL 0
 etude,fich,0,serv Local
+etude,fich,6,type resu
 M_1 oui
 option,distrib 1
 serv_etude -1
 asdenot non
 M_2 non
-etude,fich,6,resultat 1
 etude,fich,2,FR F
+etude,fich,6,resultat 1
 opt_val,rep_outils _VIDE
 M_3 non
 etude,fich,2,UL 90
-path_surcharge /home/michel/Git/code_aster-adapter/tutorials/buoyantSimpleFoam-aster/solid
+path_surcharge /home/michel/Git/code_aster-adapter/tutorials/buoyantSimpleFoam-aster/Solid
 consult non
 M_4 non
 asno non
-etude,fich,3,type libr
 etude,fich,1,compress 0
+etude,fich,3,type libr
 opt_val,ncpus _VIDE
-serveur michel-HP-ZBook-Studio-G4
+serveur localhost
 opt_val,classe _VIDE
+etude,fich,7,donnee 1
 opt_val,dbgjeveux _VIDE
 option,ncpus 1
 etude,fich,0,type comm
 opt_val,facmtps 1
+etude,fich,7,resultat 1
 args_fixe _VIDE
 etude,fich,0,resultat 0
 opt_val,rep_mat _VIDE
 special _VIDE
 tests,nbfic 0
 temps 3600.0
 option,dbgjeveux 0
-etude,fich,5,FR F
 etude,fich,5,serv Local
+etude,fich,5,FR F
 asrest non
 batch 0
-etude,fich,5,UL 80
 etude,fich,2,compress 0
+etude,fich,5,UL 80
 option,facmtps 1
 serv_profil -1
 etude,fich,6,donnee 0
@@ -114,27 +122,27 @@ opt_val,multiple _VIDE
 opt_val,after_job _VIDE
 option,rep_mat 0
 etude,fich,0,UL 1
-etude,fich,2,serv Local
 etude,fich,0,nom /home/michel/Git/code_aster-adapter/cht/adapter.comm
+etude,fich,2,serv Local
 option,exectool 1
 asverif non
-etude,fich,2,nom /home/michel/Git/code_aster-adapter/tutorials/buoyantSimpleFoam-aster/solid/../config.comm
+etude,fich,2,nom ./../config.comm
 option,after_job 1
 opt_val,depart _VIDE
 opt_val,mpi_nbnoeud 1
 etude,fich,1,resultat 0
 sources,nbfic 0
+etude,fich,4,nom ./solid.mess
 etude,fich,5,donnee 0
-etude,fich,4,nom /home/michel/Git/code_aster-adapter/tutorials/buoyantSimpleFoam-aster/solid/solid.mess
 tests non
 noeud localhost
-etude,fich,5,type rmed
 etude,fich,3,compress 0
-etude,fich,6,nom /home/michel/Git/code_aster-adapter/tutorials/buoyantSimpleFoam-aster/solid/solid.resu
+etude,fich,5,type rmed
+etude,fich,6,nom ./solid.resu
 option,mpi_nbnoeud 1
 opt_val,corefilesize unlimited
-etude,nbfic 7
+etude,nbfic 8
 agla non
 opt_val,nbmaxnook 5
 version stable
-path_tests /home/michel/Git/code_aster-adapter/tutorials/buoyantSimpleFoam-aster/solid
+path_tests /home/michel/Git/code_aster-adapter/tutorials/buoyantSimpleFoam-aster/Solid

…buoyantSimpleFoam-aster/solid/solid.astk …buoyantSimpleFoam-aster/Solid/solid.astktutorials/buoyantSimpleFoam-aster/solid/solid.astk renamed to tutorials/buoyantSimpleFoam-aster/Solid/solid.astk tutorials/buoyantSimpleFoam-aster/solid/solid.astk renamed to tutorials/buoyantSimpleFoam-aster/Solid/solid.astk

@@ -1,7 +1,7 @@
 settings = \
-{'base-path': 'path/to/code_aster-adapter/tutorials/buoyantSimpleFoam-aster',
+{'base-path': tutorial_root+'/tutorials/buoyantSimpleFoam-aster',
  'couplings': [['Solid-Interface', 'Fluid-Interface']],
- 'participants': {'Fluid': {'directory': 'fluid',
+ 'participants': {'Fluid': {'directory': 'Fluid',
                             'domain-decomposed': False,
                             'interfaces': [{'mesh': 'Fluid-Interface',
                                             'name': 'Fluid-Interface',
@@ -11,7 +11,7 @@ settings = \
                                             'write-data': ['Sink-Temperature-Fluid',
                                                            'Heat-Transfer-Coefficient-Fluid']}],
                             'solver': 'OpenFOAM'},
-                  'Solid': {'directory': 'solid',
+                  'Solid': {'directory': 'Solid',
                             'domain-decomposed': False,
                             'interfaces': [{'material-id': 0,
                                             'name': 'Solid-Interface',

…buoyantSimpleFoam-aster/solid/solid.mmed …buoyantSimpleFoam-aster/Solid/solid.mmedtutorials/buoyantSimpleFoam-aster/solid/solid.mmed renamed to tutorials/buoyantSimpleFoam-aster/Solid/solid.mmed tutorials/buoyantSimpleFoam-aster/solid/solid.mmed renamed to tutorials/buoyantSimpleFoam-aster/Solid/solid.mmed

@@ -1,6 +1,6 @@
 participants:
   Solid:
-    directory: solid
+    directory: Solid
     domain-decomposed: false
     interfaces:
     - material-id: 0

tutorials/buoyantSimpleFoam-aster/config.comm

@@ -41,7 +41,7 @@
       <read-data mesh="Fluid-Interface" name="Heat-Transfer-Coefficient-Solid"/>
       <mapping:nearest-neighbor constraint="consistent" direction="read" to="Fluid-Interface" from="Solid-Interface-Nodes"/>
     </participant>
-    <m2n:sockets to="Fluid" from="Solid" exchange-directory="/home/michel/Desktop/Code_Aster-Adapter-Dummy/buoyantSimpleFoam-aster" distribution-type="gather-scatter"/>
+    <m2n:sockets to="Fluid" from="Solid" exchange-directory="/home/michel/Desktop/Code_Aster-Adapter-Dummy/buoyantSimpleFoam-aster"/>
     <coupling-scheme:serial-explicit>
       <time-window-size value="1"/>
       <max-time-windows value="100"/>