Compare revisions

Boris Basic · Chi-Tuân Pham · Thierry Fouquet · Chi-Tuân Pham · Boris Basic · Chi-Tuân Pham
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -4,7 +4,7 @@ Latest developments on main
 GAIA: Add a feature to skip bed updates in a first period of the simulation.
 New keyword: SPINUP TIME FOR BED UPDATING.

-TELEMAC3D: TELEMAC3D was not correctly giving the wind to TOMAWAC.
+TELEMAC3D: TELEMAC-3D was not correctly giving the wind to TOMAWAC.
 It was using TOM2TEL instead of TEL2TOM.

 Python: Fix url of Corine Land Cover (CLC) database and possibility to use

--- a/configs/systel.edf.cfg
+++ b/configs/systel.edf.cfg
@@ -11,6 +11,7 @@ configs: S9.gfortran.dyn S9.gfortran S9.gfortran.debug S9.gfortran.verrou
         S9.intel S9.intel.debug
         S10.gfortran.dyn S10.gfortran.debug
         S10.nag.dyn S10.nag.debug
+         S11.gfortran.dyn S11.gfortran.debug
         gaia.intel.dyn gaia.intel.debug gaia.gnu.dyn gaia.gnu.debug
         gaia.nag.dyn gaia.nag.debug cronos.intel.dyn cronos.intel.debug
         cronos.gnu.dyn cronos.gnu.debug cronos.nag.dyn cronos.nag.debug
@@ -378,6 +379,48 @@ incs_all: [incs_med] [incs_mumps] [incs_gotm]
 libs_all: [libs_so_mumps] [libs_med] [libs_metis] [libs_gotm]
 cflags: -fPIC
 #
+# _____             __________________________________
+# ____/ Scibian 11 /_________________________________/
+#
+# GFortran
+#
+[S11.gfortran.dyn]
+brief: Scibian 11 dynamic build using GFortran 10.2.1 and Open MPI.
+options: api
+#
+f2py_name: f2py3
+pyd_fcompiler: gnu95
+sfx_lib:    .so
+#
+libs_med: -lm -L$MEDHOME/lib -lmed -lhdf5_serial -ldl -lstdc++ -lz
+obj_flags: -O2 -fPIC [fflags_gfo] [flags_mpi] [flags_mumps] [flags_med] [flags_aed] [flags_gotm]
+lib_flags: -fPIC -shared [fflags_gfo]
+#
+exe_flags: -fPIC [fflags_gfo]
+#
+cmd_lib:    [fc] [lib_flags] -o <libname> <objs>
+libs_all: [libs_so]
+cflags: -fPIC
+#
+[S11.gfortran.debug]
+brief: Scibian 11 dynamic build using GFortran 10.2.1 and Open MPI, in debug mode.
+options: api
+#
+f2py_name: f2py3
+pyd_fcompiler: gnu95
+sfx_lib:    .so
+#
+libs_med: -lm -L$MEDHOME/lib -lmed -lhdf5_serial -ldl -lstdc++ -lz
+obj_flags: -c -O0 -fPIC [fflags_gfo] [fflags_debug_gfo] [flags_mpi] [flags_mumps] [flags_med] [flags_aed] [flags_gotm]
+lib_flags: -fPIC -shared [fflags_gfo] [fflags_debug_gfo]
+#
+exe_flags: -fPIC [fflags_gfo]
+libs_all: [libs_so]
+#
+cflags: -fPIC
+#
+cmd_lib: [fc] [lib_flags] -o <libname> <objs>
+#
 # _____               ____________________________________
 # ____/ Gaia cluster /___________________________________/
 #

--- a/documentation/gaia/user/latex/HowTos.tex
+++ b/documentation/gaia/user/latex/HowTos.tex
@@ -20,7 +20,7 @@ Typically, these files are contained in a folder, for example in the folder simu
 simulation\bc_bifurcation_tel.cli
 simulation\geo_bifurcation.slf
 simulation\res_bifurcation_hotstart_tel.slf
-simulation\run_bifurcation_sis.cas
+simulation\run_bifurcation_gai.cas
 simulation\run_bifurcation_tel.cas
 \end{verbatim}
 \end{footnotesize}

--- a/documentation/telapy/user/latex/chap2.tex
+++ b/documentation/telapy/user/latex/chap2.tex
@@ -109,7 +109,6 @@ by the API\@. The definition of the ``instance'' structure is made in a
 %Automatically generated by python list of variables
 \input{latex/var_list_t2d.tex}
 \input{latex/var_list_t3d.tex}
-\input{latex/var_list_sis.tex}
 \input{latex/var_list_art.tex}
 \input{latex/var_list_wac.tex}


--- a/examples/gaia/littoral-t2d-tom/vnv_tel2tom.py
+++ b/examples/gaia/littoral-t2d-tom/vnv_tel2tom.py
@@ -299,8 +299,8 @@ class VnvStudy(AbstractVnvStudy):
        # Getting files
        vnv_1_wacres = self.get_study_file('vnv_1:WACRES')
        res_vnv_1_wacres = TelemacFile(vnv_1_wacres)
-        vnv_1_sisres = self.get_study_file('vnv_1:GAIRES')
-        res_vnv_1_sisres = TelemacFile(vnv_1_sisres)
+        vnv_1_gaires = self.get_study_file('vnv_1:GAIRES')
+        res_vnv_1_gaires = TelemacFile(vnv_1_gaires)
        vnv_1_t2dgeo = self.get_study_file('vnv_1:T2DGEO')
        res_vnv_1_t2dgeo = TelemacFile(vnv_1_t2dgeo)
        vnv_1_t2dres = self.get_study_file('vnv_1:T2DRES')
@@ -312,8 +312,8 @@ class VnvStudy(AbstractVnvStudy):
        res_vnv_3_tomgeo = TelemacFile(vnv_3_tomgeo)
        vnv_3_wacres = self.get_study_file('vnv_3:WACRES')
        res_vnv_3_wacres = TelemacFile(vnv_3_wacres)
-        vnv_3_sisres = self.get_study_file('vnv_3:GAIRES')
-        res_vnv_3_sisres = TelemacFile(vnv_3_sisres)
+        vnv_3_gaires = self.get_study_file('vnv_3:GAIRES')
+        res_vnv_3_gaires = TelemacFile(vnv_3_gaires)
        vnv_3_t2dres = self.get_study_file('vnv_3:T2DRES')
        res_vnv_3_t2dres = TelemacFile(vnv_3_t2dres)

@@ -334,7 +334,7 @@ class VnvStudy(AbstractVnvStudy):

        # Plotting BED SHEAR STRESS at -1
        vnv_plot2d('BED SHEAR STRESS',
-                   res_vnv_1_sisres,
+                   res_vnv_1_gaires,
                   record=-1,
                   filled_contours=True,
                   fig_size=(12, 7),
@@ -375,7 +375,7 @@ class VnvStudy(AbstractVnvStudy):

        # Plotting BED SHEAR STRESS at -1
        vnv_plot2d('BED SHEAR STRESS',
-                   res_vnv_1_sisres,
+                   res_vnv_1_gaires,
                   record=-1,
                   filled_contours=True,
                   fig_size=(12, 7),
@@ -399,7 +399,7 @@ class VnvStudy(AbstractVnvStudy):

        # Plotting BED SHEAR STRESS at -1
        vnv_plot2d('BED SHEAR STRESS',
-                   res_vnv_3_sisres,
+                   res_vnv_3_gaires,
                   record=-1,
                   filled_contours=True,
                   fig_size=(12, 7),
@@ -415,5 +415,5 @@ class VnvStudy(AbstractVnvStudy):

        # Closing files
        res_vnv_1_wacres.close()
-        res_vnv_1_sisres.close()
+        res_vnv_1_gaires.close()
        res_vnv_1_t2dres.close()
--- a/examples/tomawac/Coupling_Wind/f3d_3Dcoupling.slf
+++ b/examples/tomawac/Coupling_Wind/f3d_3Dcoupling.slf
--- a/examples/tomawac/Coupling_Wind/f3d_3Dcoupling_diff.slf
+++ b/examples/tomawac/Coupling_Wind/f3d_3Dcoupling_diff.slf
--- a/examples/tomawac/Coupling_Wind/f3d_littoral_diff.slf
+++ b/examples/tomawac/Coupling_Wind/f3d_littoral_diff.slf
--- a/examples/tomawac/Coupling_Wind/fom_3Dcoupling.slf
+++ b/examples/tomawac/Coupling_Wind/fom_3Dcoupling.slf
--- a/examples/tomawac/Coupling_Wind/fom_3Dcouplittoral_diff.slf
+++ b/examples/tomawac/Coupling_Wind/fom_3Dcouplittoral_diff.slf
--- a/examples/tomawac/Coupling_Wind/geo_littoral-tom2tel.cli
+++ b/examples/tomawac/Coupling_Wind/geo_littoral-tom2tel.cli
--- a/examples/tomawac/Coupling_Wind/geo_littoral-tom2tel.slf
+++ b/examples/tomawac/Coupling_Wind/geo_littoral-tom2tel.slf
--- a/examples/tomawac/Coupling_Wind/geo_t3d_tel2tom_diff.slf
+++ b/examples/tomawac/Coupling_Wind/geo_t3d_tel2tom_diff.slf
--- a/examples/tomawac/Coupling_Wind/geo_tom_different.cli
+++ b/examples/tomawac/Coupling_Wind/geo_tom_different.cli
+5 4 4  0.000 0.000 0.000 0.000  2  0.000 0.000 0.000         714           1   # newBoundary (68 - 714)
+5 4 4  0.000 0.000 0.000 0.000  2  0.000 0.000 0.000         713           2   # newBoundary (713 - 35)
+5 4 4  0.000 0.000 0.000 0.000  2  0.000 0.000 0.000         712           3   # newBoundary (713 - 35)
+5 4 4  0.000 0.000 0.000 0.000  2  0.000 0.000 0.000         711           4   # newBoundary (713 - 35)
+5 4 4  0.000 0.000 0.000 0.000  2  0.000 0.000 0.000         710           5   # newBoundary (713 - 35)
+5 4 4  0.000 0.000 0.000 0.000  2  0.000 0.000 0.000         709           6   # newBoundary (713 - 35)
+5 4 4  0.000 0.000 0.000 0.000  2  0.000 0.000 0.000         708           7   # newBoundary (713 - 35)
+5 4 4  0.000 0.000 0.000 0.000  2  0.000 0.000 0.000         707           8   # newBoundary (713 - 35)
+5 4 4  0.000 0.000 0.000 0.000  2  0.000 0.000 0.000         706           9   # newBoundary (713 - 35)
+5 4 4  0.000 0.000 0.000 0.000  2  0.000 0.000 0.000         705          10   # newBoundary (713 - 35)
+5 4 4  0.000 0.000 0.000 0.000  2  0.000 0.000 0.000         704          11   # newBoundary (713 - 35)
+5 4 4  0.000 0.000 0.000 0.000  2  0.000 0.000 0.000         703          12   # newBoundary (713 - 35)
+5 4 4  0.000 0.000 0.000 0.000  2  0.000 0.000 0.000         702          13   # newBoundary (713 - 35)
+5 4 4  0.000 0.000 0.000 0.000  2  0.000 0.000 0.000         701          14   # newBoundary (713 - 35)
+5 4 4  0.000 0.000 0.000 0.000  2  0.000 0.000 0.000         700          15   # newBoundary (713 - 35)
+5 4 4  0.000 0.000 0.000 0.000  2  0.000 0.000 0.000         699          16   # newBoundary (713 - 35)
+5 4 4  0.000 0.000 0.000 0.000  2  0.000 0.000 0.000         698          17   # newBoundary (713 - 35)
+5 4 4  0.000 0.000 0.000 0.000  2  0.000 0.000 0.000         697          18   # newBoundary (713 - 35)
+5 4 4  0.000 0.000 0.000 0.000  2  0.000 0.000 0.000         696          19   # newBoundary (713 - 35)
+5 4 4  0.000 0.000 0.000 0.000  2  0.000 0.000 0.000         695          20   # newBoundary (713 - 35)
+5 4 4  0.000 0.000 0.000 0.000  2  0.000 0.000 0.000         694          21   # newBoundary (713 - 35)
+5 4 4  0.000 0.000 0.000 0.000  2  0.000 0.000 0.000         693          22   # newBoundary (713 - 35)
+5 4 4  0.000 0.000 0.000 0.000  2  0.000 0.000 0.000         692          23   # newBoundary (713 - 35)
+5 4 4  0.000 0.000 0.000 0.000  2  0.000 0.000 0.000         691          24   # newBoundary (713 - 35)
+5 4 4  0.000 0.000 0.000 0.000  2  0.000 0.000 0.000         690          25   # newBoundary (713 - 35)
+5 4 4  0.000 0.000 0.000 0.000  2  0.000 0.000 0.000         689          26   # newBoundary (713 - 35)
+5 4 4  0.000 0.000 0.000 0.000  2  0.000 0.000 0.000         688          27   # newBoundary (713 - 35)
+5 4 4  0.000 0.000 0.000 0.000  2  0.000 0.000 0.000         687          28   # newBoundary (713 - 35)
+5 4 4  0.000 0.000 0.000 0.000  2  0.000 0.000 0.000         686          29   # newBoundary (713 - 35)
+5 4 4  0.000 0.000 0.000 0.000  2  0.000 0.000 0.000         685          30   # newBoundary (713 - 35)
+5 4 4  0.000 0.000 0.000 0.000  2  0.000 0.000 0.000         684          31   # newBoundary (713 - 35)
+5 4 4  0.000 0.000 0.000 0.000  2  0.000 0.000 0.000         683          32   # newBoundary (713 - 35)
+5 4 4  0.000 0.000 0.000 0.000  2  0.000 0.000 0.000         682          33   # newBoundary (713 - 35)
+5 4 4  0.000 0.000 0.000 0.000  2  0.000 0.000 0.000         681          34   # newBoundary (713 - 35)
+5 4 4  0.000 0.000 0.000 0.000  2  0.000 0.000 0.000         647          35   # newBoundary (713 - 35)
+5 4 4  0.000 0.000 0.000 0.000  2  0.000 0.000 0.000         613          36   # newBoundary (713 - 35)
+5 4 4  0.000 0.000 0.000 0.000  2  0.000 0.000 0.000         579          37   # newBoundary (713 - 35)
+5 4 4  0.000 0.000 0.000 0.000  2  0.000 0.000 0.000         545          38   # newBoundary (713 - 35)
+5 4 4  0.000 0.000 0.000 0.000  2  0.000 0.000 0.000         511          39   # newBoundary (713 - 35)
+5 4 4  0.000 0.000 0.000 0.000  2  0.000 0.000 0.000         477          40   # newBoundary (713 - 35)
+5 4 4  0.000 0.000 0.000 0.000  2  0.000 0.000 0.000         443          41   # newBoundary (713 - 35)
+5 4 4  0.000 0.000 0.000 0.000  2  0.000 0.000 0.000         409          42   # newBoundary (713 - 35)
+5 4 4  0.000 0.000 0.000 0.000  2  0.000 0.000 0.000         375          43   # newBoundary (713 - 35)
+5 4 4  0.000 0.000 0.000 0.000  2  0.000 0.000 0.000         341          44   # newBoundary (713 - 35)
+5 4 4  0.000 0.000 0.000 0.000  2  0.000 0.000 0.000         307          45   # newBoundary (713 - 35)
+5 4 4  0.000 0.000 0.000 0.000  2  0.000 0.000 0.000         273          46   # newBoundary (713 - 35)
+5 4 4  0.000 0.000 0.000 0.000  2  0.000 0.000 0.000         239          47   # newBoundary (713 - 35)
+5 4 4  0.000 0.000 0.000 0.000  2  0.000 0.000 0.000         205          48   # newBoundary (713 - 35)
+5 4 4  0.000 0.000 0.000 0.000  2  0.000 0.000 0.000         171          49   # newBoundary (713 - 35)
+5 4 4  0.000 0.000 0.000 0.000  2  0.000 0.000 0.000         137          50   # newBoundary (713 - 35)
+5 4 4  0.000 0.000 0.000 0.000  2  0.000 0.000 0.000         103          51   # newBoundary (713 - 35)
+5 4 4  0.000 0.000 0.000 0.000  2  0.000 0.000 0.000          69          52   # newBoundary (713 - 35)
+5 4 4  0.000 0.000 0.000 0.000  2  0.000 0.000 0.000          35          53   # newBoundary (713 - 35)
+2 2 2  0.000 0.000 0.000 0.000  2  0.000 0.000 0.000           1          54   # 
+2 2 2  0.000 0.000 0.000 0.000  2  0.000 0.000 0.000           2          55   # 
+2 2 2  0.000 0.000 0.000 0.000  2  0.000 0.000 0.000           3          56   # 
+2 2 2  0.000 0.000 0.000 0.000  2  0.000 0.000 0.000           4          57   # 
+2 2 2  0.000 0.000 0.000 0.000  2  0.000 0.000 0.000           5          58   # 
+2 2 2  0.000 0.000 0.000 0.000  2  0.000 0.000 0.000           6          59   # 
+2 2 2  0.000 0.000 0.000 0.000  2  0.000 0.000 0.000           7          60   # 
+2 2 2  0.000 0.000 0.000 0.000  2  0.000 0.000 0.000           8          61   # 
+2 2 2  0.000 0.000 0.000 0.000  2  0.000 0.000 0.000           9          62   # 
+2 2 2  0.000 0.000 0.000 0.000  2  0.000 0.000 0.000          10          63   # 
+2 2 2  0.000 0.000 0.000 0.000  2  0.000 0.000 0.000          11          64   # 
+2 2 2  0.000 0.000 0.000 0.000  2  0.000 0.000 0.000          12          65   # 
+2 2 2  0.000 0.000 0.000 0.000  2  0.000 0.000 0.000          13          66   # 
+2 2 2  0.000 0.000 0.000 0.000  2  0.000 0.000 0.000          14          67   # 
+2 2 2  0.000 0.000 0.000 0.000  2  0.000 0.000 0.000          15          68   # 
+2 2 2  0.000 0.000 0.000 0.000  2  0.000 0.000 0.000          16          69   # 
+2 2 2  0.000 0.000 0.000 0.000  2  0.000 0.000 0.000          17          70   # 
+2 2 2  0.000 0.000 0.000 0.000  2  0.000 0.000 0.000          18          71   # 
+2 2 2  0.000 0.000 0.000 0.000  2  0.000 0.000 0.000          19          72   # 
+2 2 2  0.000 0.000 0.000 0.000  2  0.000 0.000 0.000          20          73   # 
+2 2 2  0.000 0.000 0.000 0.000  2  0.000 0.000 0.000          21          74   # 
+2 2 2  0.000 0.000 0.000 0.000  2  0.000 0.000 0.000          22          75   # 
+2 2 2  0.000 0.000 0.000 0.000  2  0.000 0.000 0.000          23          76   # 
+2 2 2  0.000 0.000 0.000 0.000  2  0.000 0.000 0.000          24          77   # 
+2 2 2  0.000 0.000 0.000 0.000  2  0.000 0.000 0.000          25          78   # 
+2 2 2  0.000 0.000 0.000 0.000  2  0.000 0.000 0.000          26          79   # 
+2 2 2  0.000 0.000 0.000 0.000  2  0.000 0.000 0.000          27          80   # 
+2 2 2  0.000 0.000 0.000 0.000  2  0.000 0.000 0.000          28          81   # 
+2 2 2  0.000 0.000 0.000 0.000  2  0.000 0.000 0.000          29          82   # 
+2 2 2  0.000 0.000 0.000 0.000  2  0.000 0.000 0.000          30          83   # 
+2 2 2  0.000 0.000 0.000 0.000  2  0.000 0.000 0.000          31          84   # 
+2 2 2  0.000 0.000 0.000 0.000  2  0.000 0.000 0.000          32          85   # 
+2 2 2  0.000 0.000 0.000 0.000  2  0.000 0.000 0.000          33          86   # 
+2 2 2  0.000 0.000 0.000 0.000  2  0.000 0.000 0.000          34          87   # 
+5 4 4  0.000 0.000 0.000 0.000  2  0.000 0.000 0.000          68          88   # newBoundary (68 - 714)
+5 4 4  0.000 0.000 0.000 0.000  2  0.000 0.000 0.000         102          89   # newBoundary (68 - 714)
+5 4 4  0.000 0.000 0.000 0.000  2  0.000 0.000 0.000         136          90   # newBoundary (68 - 714)
+5 4 4  0.000 0.000 0.000 0.000  2  0.000 0.000 0.000         170          91   # newBoundary (68 - 714)
+5 4 4  0.000 0.000 0.000 0.000  2  0.000 0.000 0.000         204          92   # newBoundary (68 - 714)
+5 4 4  0.000 0.000 0.000 0.000  2  0.000 0.000 0.000         238          93   # newBoundary (68 - 714)
+5 4 4  0.000 0.000 0.000 0.000  2  0.000 0.000 0.000         272          94   # newBoundary (68 - 714)
+5 4 4  0.000 0.000 0.000 0.000  2  0.000 0.000 0.000         306          95   # newBoundary (68 - 714)
+5 4 4  0.000 0.000 0.000 0.000  2  0.000 0.000 0.000         340          96   # newBoundary (68 - 714)
+5 4 4  0.000 0.000 0.000 0.000  2  0.000 0.000 0.000         374          97   # newBoundary (68 - 714)
+5 4 4  0.000 0.000 0.000 0.000  2  0.000 0.000 0.000         408          98   # newBoundary (68 - 714)
+5 4 4  0.000 0.000 0.000 0.000  2  0.000 0.000 0.000         442          99   # newBoundary (68 - 714)
+5 4 4  0.000 0.000 0.000 0.000  2  0.000 0.000 0.000         476         100   # newBoundary (68 - 714)
+5 4 4  0.000 0.000 0.000 0.000  2  0.000 0.000 0.000         510         101   # newBoundary (68 - 714)
+5 4 4  0.000 0.000 0.000 0.000  2  0.000 0.000 0.000         544         102   # newBoundary (68 - 714)
+5 4 4  0.000 0.000 0.000 0.000  2  0.000 0.000 0.000         578         103   # newBoundary (68 - 714)
+5 4 4  0.000 0.000 0.000 0.000  2  0.000 0.000 0.000         612         104   # newBoundary (68 - 714)
+5 4 4  0.000 0.000 0.000 0.000  2  0.000 0.000 0.000         646         105   # newBoundary (68 - 714)
+5 4 4  0.000 0.000 0.000 0.000  2  0.000 0.000 0.000         680         106   # newBoundary (68 - 714)
--- a/examples/tomawac/Coupling_Wind/geo_tom_littoral-tel2tom.cli
+++ b/examples/tomawac/Coupling_Wind/geo_tom_littoral-tel2tom.cli
--- a/examples/tomawac/Coupling_Wind/geo_tom_littoral-tel2tom.slf
+++ b/examples/tomawac/Coupling_Wind/geo_tom_littoral-tel2tom.slf
--- a/examples/tomawac/Coupling_Wind/geo_tom_tom2tel_diff.slf
+++ b/examples/tomawac/Coupling_Wind/geo_tom_tom2tel_diff.slf
--- a/examples/tomawac/Coupling_Wind/t3d_3Dcoupling.cas
+++ b/examples/tomawac/Coupling_Wind/t3d_3Dcoupling.cas
@@ -7,7 +7,9 @@
 TITLE = 'TELEMAC 3D : COUPLAGE TOMAWAC'
 /
 /----------------------------------------------------------------------/
-/ COUPLAGE AVEC TOMAWAC                                                /
+/     GENERAL OPTIONS
+/----------------------------------------------------------------------/
+/ COUPLING WITH TOMAWAC                                                /
 /----------------------------------------------------------------------/
 WAVE DRIVEN CURRENTS = YES
 COUPLING WITH = 'TOMAWACT3D'
@@ -35,7 +37,7 @@ INITIAL ELEVATION : 0.
 PRESCRIBED ELEVATIONS : 0.;0.;0.
 PRESCRIBED VELOCITIES : 0.;0.;0.
 MASS-BALANCE = YES
-TIDAL FLATS = NO
+TIDAL FLATS = YES
 NON-HYDROSTATIC VERSION = NO
 /-------------------------
 /  CONVECTION-DIFFUSION-PROPAGATION
@@ -53,14 +55,15 @@ FREE SURFACE GRADIENT COMPATIBILITY = 0.9
 MATRIX STORAGE = 3

 MASS-LUMPING FOR DEPTH = 1.0
-MASS-LUMPING FOR VELOCITIES = 0.9
 IMPLICITATION FOR DEPTH = 0.6
 IMPLICITATION FOR VELOCITIES = 1.0
 HORIZONTAL TURBULENCE MODEL = 4
+/ This choice of vertical turbulence is chosen to be simple
+/ but not recommanded for use.
 VERTICAL TURBULENCE MODEL = 1

 /----------------------------/
-/     TERMES SOURCES
+/     SOURCE TERMS
 /----------------------------/
 LAW OF BOTTOM FRICTION = 5
 FRICTION COEFFICIENT FOR THE BOTTOM = 0.001D0

--- a/examples/tomawac/Coupling_Wind/t3d_littoral.cas
+++ b/examples/tomawac/Coupling_Wind/t3d_littoral.cas
@@ -52,6 +52,8 @@ MASS-LUMPING FOR DIFFUSION = 1.
 IMPLICITATION FOR DIFFUSION = 1.
 /
 HORIZONTAL TURBULENCE MODEL = 4
+/ This choice of vertical turbulence is chosen to be simple
+/ but not recommanded for use.
 VERTICAL TURBULENCE MODEL = 1

 /----------------------------/

--- a/examples/tomawac/Coupling_Wind/t3d_tel2tom_different.cas
+++ b/examples/tomawac/Coupling_Wind/t3d_tel2tom_different.cas
+TITLE = 'TELEMAC 3D : COUPLAGE TOMAWAC'
+/
+/----------------------------------------------------------------------/
+/     GENERAL OPTIONS
+/----------------------------------------------------------------------/
+/ COUPLING WITH TOMAWAC                                                /
+/----------------------------------------------------------------------/
+WAVE DRIVEN CURRENTS = YES
+COUPLING WITH = 'TOMAWACT3D2'
+COUPLING PERIOD FOR TOMAWAC = 1
+TOMAWAC STEERING FILE = 'tom_3Dcouplittoral_diff.cas'
+BOUNDARY CONDITIONS FILE : geo_t3d_littoral.cli
+GEOMETRY FILE          : geo_t3d_tel2tom_diff.slf
+3D RESULT FILE : r3d_3Dcoupling_diff.slf
+2D RESULT FILE : r2d_3Dcoupling_diff.slf
+/
+/----------------------------------------------------------------------/
+/     OPTIONS GENERALES
+/----------------------------------------------------------------------/
+NUMBER OF TIME STEPS : 100
+TIME STEP           : 10.
+LISTING PRINTOUT PERIOD : 10
+GRAPHIC PRINTOUT PERIOD : 10
+VARIABLES FOR 2D GRAPHIC PRINTOUTS : X,Y
+VARIABLES FOR 3D GRAPHIC PRINTOUTS : Z,U,V,W,US,VS,WS
+NUMBER OF HORIZONTAL LEVELS = 5
+INITIAL CONDITIONS : 'CONSTANT ELEVATION'
+INITIAL ELEVATION : 0.
+PRESCRIBED ELEVATIONS : 0.;0.;0.
+PRESCRIBED VELOCITIES : 0.;0.;0.
+MASS-BALANCE = YES
+TIDAL FLATS = YES
+NON-HYDROSTATIC VERSION = NO
+/-------------------------
+/  CONVECTION-DIFFUSION-PROPAGATION
+/-------------------------
+SOLVER FOR DIFFUSION OF VELOCITIES = 1
+MAXIMUM NUMBER OF ITERATIONS FOR DIFFUSION OF VELOCITIES = 200
+ACCURACY FOR DIFFUSION OF VELOCITIES = 1.D-9
+/
+SOLVER FOR PROPAGATION = 7
+MAXIMUM NUMBER OF ITERATIONS FOR PROPAGATION = 200
+ACCURACY FOR PROPAGATION = 1.D-9
+/ diminuer si pas stable, jusqu'à 0
+FREE SURFACE GRADIENT COMPATIBILITY = 0.9
+/
+MATRIX STORAGE = 3
+
+MASS-LUMPING FOR DEPTH = 1.0
+IMPLICITATION FOR DEPTH = 0.6
+IMPLICITATION FOR VELOCITIES = 1.0
+HORIZONTAL TURBULENCE MODEL = 4
+/ This choice of vertical turbulence is chosen to be simple
+/ but not recommanded for use.
+VERTICAL TURBULENCE MODEL = 1
+
+/----------------------------/
+/     SOURCE TERMS
+/----------------------------/
+LAW OF BOTTOM FRICTION = 5
+FRICTION COEFFICIENT FOR THE BOTTOM = 0.001D0
+
+WIND                          : YES
+ASCII ATMOSPHERIC DATA FILE     = 'fo1_wind'
+OPTION FOR WIND                              = 2
No results found