Merge pull request #6 from precice/develop

Update adapter.py conform preCICE v2.0 and Code_Aster v14.4

Author: micheltakken

README.md

@@ -1,5 +1,9 @@
 # preCICE-adapter for the CSM code Code_Aster
 
-This adapter was implemented as part of the [master thesis of Lucia Cheung](https://www5.in.tum.de/pub/Cheung2016_Thesis.pdf) in cooperation with [SimScale](https://www.simscale.com/). Currently only conjugate heat transfer is supported. 
+This adapter was implemented as part of the [master thesis of Lucia Cheung](https://www5.in.tum.de/pub/Cheung2016_Thesis.pdf) in cooperation with [SimScale](https://www.simscale.com/). Currently only conjugate heat transfer is supported.
 
-A documentation is available in the `cht` subfolder. 
+The adapter currently supports preCICE v1.4.1 and Code_Aster v14.4. The following tutorials are available.
+
+* Flow over plate OpenFoam-Code_Aster ([wiki](https://github.com/precice/code_aster-adapter/wiki/Flow-over-plate-Code_Aster-Tutorial))
+
+A documentation is available in the `cht` subfolder, and in the [wiki](https://github.com/precice/code_aster-adapter/wiki).

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)
@@ -33,7 +34,7 @@ isSteadyState = ("steady-state" in settings["simulation"]) and (settings["simula
 # Include case definition.comm.
 # Defines: MESH, MODEL, BC[], MAT[], MATS
 INCLUDE(UNITE=91)
-                         
+
 # ==========================================================================================
 # Create and initialize the adapter
 # ==========================================================================================
@@ -62,13 +63,13 @@ while adapter.isCouplingOngoing():
 
     adapter.writeCheckpoint()
     adapter.readCouplingData()
-    
+
     # ======================================================================================
     # Solve
     # ======================================================================================
-    
+
     if isSteadyState:
-        
+
         if participant["non-linear"]:
             TEMP = THER_NON_LINE(
                 MODELE=MODEL,
@@ -92,12 +93,12 @@ while adapter.isCouplingOngoing():
         )
 
     else:
-    
+
         STEP = DEFI_LIST_REEL(
             DEBUT=time,
             INTERVALLE=(_F(JUSQU_A=time+dt, NOMBRE=1))
         )
-        
+
         if participant["non-linear"]:
             TEMP = THER_NON_LINE(
                 MODELE=MODEL,
@@ -134,11 +135,10 @@ while adapter.isCouplingOngoing():
         # Output if necessary
         k += 1
         if k % settings["simulation"]["output-frequency"] == 0:
-               filename = "output-" + str(k) + ".rmed"
-               DEFI_FICHIER(FICHIER=filename, UNITE=80)
-               IMPR_RESU(FORMAT='MED', RESU=_F(RESULTAT=TEMP))
-               call(["mv", filename, settings["base-path"] + "/" + participant["directory"]])
-               DEFI_FICHIER(ACTION='LIBERER', UNITE=80)
+               filename = "REPE_OUT/output-" + str(k) + ".rmed"
+               DEFI_FICHIER(FICHIER=filename, UNITE=80+k, TYPE='BINARY')
+               IMPR_RESU(FORMAT='MED', UNITE=80+k, RESU=_F(RESULTAT=TEMP))
+               DEFI_FICHIER(ACTION='LIBERER', UNITE=80+k)
 
         # Use current solution as initial condition for the next time step
         if time > 0:
@@ -153,7 +153,7 @@ while adapter.isCouplingOngoing():
 
     DETRUIRE(CONCEPT=_F(NOM=TEMP))
     DETRUIRE(CONCEPT=_F(NOM=T))
-    
+
     if not isSteadyState:
         DETRUIRE(CONCEPT=_F(NOM=STEP))