From 1a8f5583115ba0d104dd45280f08d8bab96fb0c0 Mon Sep 17 00:00:00 2001
From: Boris Basic <boris.basic@edf.fr>
Date: Wed, 14 Jun 2023 17:27:44 +0200
Subject: [PATCH] [fix] Follow up of SISYPHE removal, thanks to CTP
---
.../TexFileExample/TextEquations.tex | 2 +-
.../telemac3d/Rouse/user_fortran/erodnc.f | 47 +++++-------
scripts/python3/telapy/api/api_module.py | 2 +-
sources/api/api.cmdf | 73 +++++++++----------
sources/nestor/readactiontorestart.f | 2 +-
sources/telemac2d/telemac2d.cmdf | 26 +++----
sources/telemac3d/erodnc.f | 37 ++++------
sources/telemac3d/telemac3d.cmdf | 49 +++----------
8 files changed, 95 insertions(+), 143 deletions(-)
diff --git a/documentation/Misc/TelemacDocTemplate/TexFileExample/TextEquations.tex b/documentation/Misc/TelemacDocTemplate/TexFileExample/TextEquations.tex
index 51b0b0666f..b8fc451a02 100644
--- a/documentation/Misc/TelemacDocTemplate/TexFileExample/TextEquations.tex
+++ b/documentation/Misc/TelemacDocTemplate/TexFileExample/TextEquations.tex
@@ -224,5 +224,5 @@ in the name, and the following naming convention is suggested:
Shortcuts are given for all the modules, i.e. \telemacsystem{}, \artemis{},
\bief{}, \telemac{2D}, \telemac{3D}, \tomawac{}, \khione{} and \gaia{}. As a
reminder, when using the commands, brackets should be used afterwards to ensure
-that the spacing is correrctly defined; i.e. \verb+\telemacsystem{}+.
+that the spacing is correctly defined; i.e. \verb+\telemacsystem{}+.
diff --git a/examples/telemac3d/Rouse/user_fortran/erodnc.f b/examples/telemac3d/Rouse/user_fortran/erodnc.f
index 2a8c6a01d1..f5583583a1 100644
--- a/examples/telemac3d/Rouse/user_fortran/erodnc.f
+++ b/examples/telemac3d/Rouse/user_fortran/erodnc.f
@@ -132,7 +132,7 @@
! OF THE PREVIOUS SISYPHE ONES
CALL BIEF_ALLVEC(1, RATIO_TOCE, 'RATIO_TOCE', IELM2H, 1, 1,
& MESH2D)
- RATIO_TOCE%R(:) = 1
+ RATIO_TOCE%R(:) = 1.D0
!
IF(S3D_ICQ.EQ.1) THEN
CALL OS('X=CY ', X=ZREF, Y=S3D_DMOY, C=2.D0)
@@ -175,37 +175,26 @@
! ------------------------------------------------------------
!
IF(S3D_MIXTE) THEN
-
DO I=1,NPOIN2
-!
- S3D_FLUER(I)= S3D_WCS(I)*S3D_CREF%R(I)
- QS=S3D_CFDEP*S3D_EPAINCO(I)
- S3D_FLUER(I)=MIN(S3D_FLUER(I),QS/DT)
-!
+ S3D_FLUER(I)=S3D_WCS(I)*S3D_CREF%R(I)
+ QS=S3D_CFDEP*S3D_EPAINCO(I)
+ S3D_FLUER(I)=MIN(S3D_FLUER(I),QS/DT)
ENDDO
-
ELSE
-!
- DO I=1,NPOIN2
-!
-! COMPUTES THE EROSION FLUX
-!
- S3D_FLUER(I)= S3D_WCS(I)*S3D_CREF%R(I)
-!
-! QUANTITY OF SOLID IN THE LAYER BEFORE EROSION
-!
-! S3D_CFDEPIN KG/M3 ( ~ 0.65 S3D_RHOS)
- QS=S3D_CFDEP*S3D_HDEP(I)
-!
-! LIMITS THE EROSION FLUX
-!
-! BEGINNING OF SPECIFIC TO THIS CASE
-! S3D_FLUER(I)=MIN(S3D_FLUER(I),QS/DT)
- S3D_FLUER(I)=0.D0
-! END OF SPECIFIC TO THIS CASE
-!
- ENDDO
-!
+ DO I=1,NPOIN2
+! COMPUTES THE EROSION FLUX
+ S3D_FLUER(I)=S3D_WCS(I)*S3D_CREF%R(I)
+!
+! QUANTITY OF SOLID IN THE LAYER BEFORE EROSION
+! S3D_CFDEPIN KG/M3 ( ~ 0.65 S3D_RHOS)
+ QS=S3D_CFDEP*S3D_HDEP(I)
+!
+! LIMITS THE EROSION FLUX
+! BEGINNING OF SPECIFIC TO THIS CASE
+! S3D_FLUER(I)=MIN(S3D_FLUER(I),QS/DT)
+ S3D_FLUER(I)=0.D0
+! END OF SPECIFIC TO THIS CASE
+ ENDDO
ENDIF
!-----------------------------------------------------------------------
!
diff --git a/scripts/python3/telapy/api/api_module.py b/scripts/python3/telapy/api/api_module.py
index fa656b269f..3a281e78ee 100644
--- a/scripts/python3/telapy/api/api_module.py
+++ b/scripts/python3/telapy/api/api_module.py
@@ -46,7 +46,7 @@ def get_file_format(key, cas):
def get_dico(name):
"""
- Returns path to the dictionary associated with the short_name (t2d,t3,...)
+ Returns path to the dictionary associated with the short name (t2d, t3d...)
If HOMETEL is set the full path otherwise just the name
@param name (str) Short name of the module
diff --git a/sources/api/api.cmdf b/sources/api/api.cmdf
index ae591d131f..ef17b52792 100644
--- a/sources/api/api.cmdf
+++ b/sources/api/api.cmdf
@@ -46,8 +46,8 @@ files: api_handle_error.f
api_instance_t2d.f
api_instance_t3d.f
api_instance_wac.f
- api_handle_var_t2d.f
api_handle_var_art.f
+ api_handle_var_t2d.f
api_handle_var_t3d.f
api_handle_var_wac.f
api_run_art.f
@@ -542,27 +542,38 @@ files: bief_def.f
segbor.f
almesh.f
bief_allvec_in_block.f
+ config_code.f
outbief.f
- flux_ef_vf.f
- positive_depths_eria.f
- mult_interface_seg.f
- positive_depths_nerd.f
- positive_depths.f
+ gregtim.f
+ jultim.f
+ addtracer.f
+ check_sortgai.f
+ couple_mod.F
somme.f
bief_sum.f
- global_to_local_point.f
dots.f
- masktf.f
- maskto.f
- char_gauss.f
- ad_solve.F
- char_weak.F
+ bilant.f
cg1112.f
cg1113.f
chgdis.f
+ ovbd.f
+ osbd.f
+ global_to_local_point.f
+ proxim.f
+ cflp11.f
+ cflp12.f
+ cflpsi.f
+ char_gauss.f
+ ad_solve.F
+ char_weak.F
gtsh11.f
gtsh41.f
charac.f
+ flux_ef_vf.f
+ positive_depths_eria.f
+ mult_interface_seg.f
+ positive_depths_nerd.f
+ positive_depths.f
cflvf.f
flux_ef_vf_2.f
flux_ef_vf_3.f
@@ -581,33 +592,21 @@ files: bief_def.f
kspg11.f
ksupg.f
cvdftr.F
- diffin.f
- ovbd.f
- osbd.f
- bief_gammln.f
- bief_gcf.f
- bief_gser.f
- bief_gammp.f
- bief_erf.f
- cflp11.f
- cflp12.f
- cflpsi.f
- time_in_seconds.f
- config_code.f
- gregtim.f
- jultim.f
- addtracer.f
- check_sortgai.f
- couple_mod.F
- bilant.f
- proxim.f
derive.f
derlag.f
diffcl.f
+ diffin.f
+ masktf.f
+ maskto.f
inclu2.f
cvtrvf_nerd_2.f
maskbd.f
read_bin_2d.f
+ bief_gammln.f
+ bief_gcf.f
+ bief_gser.f
+ bief_gammp.f
+ bief_erf.f
lubksb.f
ludcmp.f
invmtx.f
@@ -658,6 +657,7 @@ files: majus.f
path: <root>|sources|gaia
files: declarations_gaia.f
deall_gaia.f
+ lecdon_split_outputpoints.f
nomvar_gaia.f
lecdon_gaia.f
ad_get_gaia.F
@@ -777,7 +777,6 @@ files: declarations_gaia.f
settling_vel.f
shields.f
gaia_init.F
- lecdon_split_outputpoints.f
[gretel]
path: <root>|sources|utils|gretel
@@ -1264,6 +1263,8 @@ files: declarations_telemac3d.f
clsedi.f
compute_bc_sedi.f
soulsbyfloc3d.f
+ user_compute_settling_vel.f
+ user_hindering_formula.f
wchind.f
calcg.f
wcturb.f
@@ -1348,6 +1349,8 @@ files: declarations_telemac3d.f
user_condi3d_uvw.f
user_mesh_transf.f
condim.f
+ user_noerod.f
+ noerod.f
condis.f
cstkep.f
cstsa.f
@@ -1394,10 +1397,6 @@ files: declarations_telemac3d.f
sumver.f
wave_equation.F
telemac3d.F
- user_compute_settling_vel.f
- user_hindering_formula.f
- user_noerod.f
- noerod.f
[tomawac]
path: <root>|sources|tomawac
diff --git a/sources/nestor/readactiontorestart.f b/sources/nestor/readactiontorestart.f
index 8b7610d9ba..7de249dab1 100644
--- a/sources/nestor/readactiontorestart.f
+++ b/sources/nestor/readactiontorestart.f
@@ -41,7 +41,7 @@
& "while try to read the Nestor restart file "
& ,"reason: I am reading a wrong file! "
& ," Check setting for NESTOR RESTART FILE "
- & ," in the TELEMAC-2 or GAIA cas-file "
+ & ," in the TELEMAC-2D or GAIA cas-file "
& , -1, SRname, ipid )
!
fu = LuRstF ! LuRstF: Logical Unit ReSTart File
diff --git a/sources/telemac2d/telemac2d.cmdf b/sources/telemac2d/telemac2d.cmdf
index 263fa837a3..85916ec126 100644
--- a/sources/telemac2d/telemac2d.cmdf
+++ b/sources/telemac2d/telemac2d.cmdf
@@ -469,9 +469,21 @@ files: bief_def.f
crosfr.f
fasp.f
hydromap.f
+ parcom_bord.f
fond.f
fonstr.f
front2.f
+ bief_ininds.f
+ bief_nbfel.f
+ bief_nbsegel.f
+ cpikle2.f
+ cpikle3.f
+ mxptel31.f
+ mxptel.f
+ read_mesh_conn.f
+ read_mesh_coord.f
+ segbor.f
+ almesh.f
centre_mass_seg.f
checkmesh.f
comp_fac.f
@@ -497,7 +509,6 @@ files: bief_def.f
longitu.f
parcom2i_seg.f
make_eltcar.f
- parcom_bord.f
normab.f
parini.f
ptel11.f
@@ -514,17 +525,6 @@ files: bief_def.f
voisin.f
voisin31.f
inbief.f
- bief_ininds.f
- bief_nbfel.f
- bief_nbsegel.f
- cpikle2.f
- cpikle3.f
- mxptel31.f
- mxptel.f
- read_mesh_conn.f
- read_mesh_coord.f
- segbor.f
- almesh.f
read_partel_info.f
leclim.f
read_drogues.f
@@ -677,11 +677,11 @@ files: declarations_gaia.f
settling_vel.f
shields.f
gaia_init.F
+ lecdon_split_outputpoints.f
nomvar_gaia.f
lecdon_gaia.f
read_sections_gaia.f
point_gaia.f
- lecdon_split_outputpoints.f
[hermes]
path: <root>|sources|utils|hermes
diff --git a/sources/telemac3d/erodnc.f b/sources/telemac3d/erodnc.f
index 282cd37880..dcd08f91b8 100644
--- a/sources/telemac3d/erodnc.f
+++ b/sources/telemac3d/erodnc.f
@@ -132,7 +132,7 @@
! OF THE PREVIOUS SISYPHE ONES
CALL BIEF_ALLVEC(1, RATIO_TOCE, 'RATIO_TOCE', IELM2H, 1, 1,
& MESH2D)
- RATIO_TOCE%R(:) = 1
+ RATIO_TOCE%R(:) = 1.D0
!
IF(S3D_ICQ.EQ.1) THEN
CALL OS('X=CY ', X=ZREF, Y=S3D_DMOY, C=2.D0)
@@ -175,34 +175,23 @@
! ------------------------------------------------------------
!
IF(S3D_MIXTE) THEN
-
DO I=1,NPOIN2
-!
- S3D_FLUER(I)= S3D_WCS(I)*S3D_CREF%R(I)
- QS=S3D_CFDEP*S3D_EPAINCO(I)
- S3D_FLUER(I)=MIN(S3D_FLUER(I),QS/DT)
-!
+ S3D_FLUER(I)=S3D_WCS(I)*S3D_CREF%R(I)
+ QS=S3D_CFDEP*S3D_EPAINCO(I)
+ S3D_FLUER(I)=MIN(S3D_FLUER(I),QS/DT)
ENDDO
-
ELSE
+ DO I=1,NPOIN2
+! COMPUTES THE EROSION FLUX
+ S3D_FLUER(I)=S3D_WCS(I)*S3D_CREF%R(I)
!
- DO I=1,NPOIN2
-!
-! COMPUTES THE EROSION FLUX
-!
- S3D_FLUER(I)= S3D_WCS(I)*S3D_CREF%R(I)
-!
-! QUANTITY OF SOLID IN THE LAYER BEFORE EROSION
-!
-! S3D_CFDEPIN KG/M3 ( ~ 0.65 S3D_RHOS)
- QS=S3D_CFDEP*S3D_HDEP(I)
-!
-! LIMITS THE EROSION FLUX
-!
- S3D_FLUER(I)=MIN(S3D_FLUER(I),QS/DT)
-!
- ENDDO
+! QUANTITY OF SOLID IN THE LAYER BEFORE EROSION
+! S3D_CFDEPIN KG/M3 ( ~ 0.65 S3D_RHOS)
+ QS=S3D_CFDEP*S3D_HDEP(I)
!
+! LIMITS THE EROSION FLUX
+ S3D_FLUER(I)=MIN(S3D_FLUER(I),QS/DT)
+ ENDDO
ENDIF
!-----------------------------------------------------------------------
!
diff --git a/sources/telemac3d/telemac3d.cmdf b/sources/telemac3d/telemac3d.cmdf
index 0e704d9f13..d31e44ece2 100644
--- a/sources/telemac3d/telemac3d.cmdf
+++ b/sources/telemac3d/telemac3d.cmdf
@@ -434,6 +434,7 @@ files: bief_def.f
charac.f
asseg_3d.f
na_flux3d_lim.f
+ parcom_bord.f
crosfr.f
fasp.f
fond.f
@@ -466,7 +467,6 @@ files: bief_def.f
longitu.f
parcom2i_seg.f
make_eltcar.f
- parcom_bord.f
normab.f
parini.f
ptel11.f
@@ -483,42 +483,16 @@ files: bief_def.f
voisin.f
voisin31.f
inbief.f
- dots.f
read_partel_info.f
leclim.f
- cflvf.f
- flux_ef_vf_2.f
- flux_ef_vf_3.f
- flux_mask.f
- hvf.f
- tvf.f
- tracvf.f
- tvf_2.f
- tvf_imp.F
- cvtrvf.f
- cvtrvf_eria.f
- cvtrvf_nerd.f
- diri04.f
- diri09.f
- dirich.f
- kspg11.f
- ksupg.f
- cvdftr.F
- diffin.f
- osbd.f
- bief_gammln.f
- bief_gcf.f
- bief_gser.f
- bief_gammp.f
- bief_erf.f
- cflp11.f
- cflp12.f
- cflpsi.f
proxim.f
topogr.f
build_ikle_ext.f
lubksb.f
ludcmp.f
+ diri04.f
+ diri09.f
+ dirich.f
walldist.f
dmo.f
tsloc.f
@@ -526,6 +500,7 @@ files: bief_def.f
gettriebe.f
gettriseg.f
gettri.f
+ osbd.f
slop10.f
slopes.f
@@ -554,6 +529,7 @@ files: declarations_damocles.f
path: <root>|sources|gaia
files: declarations_gaia.f
deall_gaia.f
+ lecdon_split_outputpoints.f
nomvar_gaia.f
lecdon_gaia.f
ad_get_gaia.F
@@ -562,6 +538,8 @@ files: declarations_gaia.f
interface_gaia_bedload.f
interface_gaia_suspension.f
interface_gaia.f
+ suspension_fredsoe_gaia.f
+ suspension_vanrijn_gaia.f
bed1_update.f
bedload_diffin_gaia.f
bedload_nerbed_vf_gaia.f
@@ -646,9 +624,7 @@ files: declarations_gaia.f
bed1_suspension_deposit.f
gaia_suspension_deposit.f
suspension_bijker_gaia.f
- suspension_fredsoe_gaia.f
suspension_sandflow_gaia.f
- suspension_vanrijn_gaia.f
user_suspension_cae_gaia.f
suspension_compute_cae.f
bed1_suspension_erode.f
@@ -668,7 +644,6 @@ files: declarations_gaia.f
settling_vel.f
shields.f
gaia_init.F
- lecdon_split_outputpoints.f
[hermes]
path: <root>|sources|utils|hermes
@@ -925,6 +900,8 @@ files: declarations_telemac3d.f
clsedi.f
compute_bc_sedi.f
soulsbyfloc3d.f
+ user_compute_settling_vel.f
+ user_hindering_formula.f
wchind.f
calcg.f
wcturb.f
@@ -1008,6 +985,8 @@ files: declarations_telemac3d.f
user_condi3d_uvw.f
user_mesh_transf.f
condim.f
+ user_noerod.f
+ noerod.f
condis.f
cstkep.f
cstsa.f
@@ -1055,10 +1034,6 @@ files: declarations_telemac3d.f
wave_equation.F
telemac3d.F
homere_telemac3d.f
- user_compute_settling_vel.f
- user_hindering_formula.f
- user_noerod.f
- noerod.f
[tomawac]
path: <root>|sources|tomawac
--
GitLab