From 82118f8bcb38a057b997dd40009202b90cd4da46 Mon Sep 17 00:00:00 2001
From: Quentin Rodier <quentin.rodier@meteo.fr>
Date: Wed, 14 Dec 2022 17:33:50 +0100
Subject: [PATCH] Quentin 14/12/2022: clean MODE, unused GATHER_ll (moved out
of turb) and include ARGSLIST_ll in mode_ll
---
docs/TODO | 1 -
src/common/aux/mode_argslist_ll.F90 | 44 -----------------------------
src/common/aux/mode_gather_ll.F90 | 28 ------------------
src/common/aux/mode_ll.F90 | 42 ++++++++++++++++++++++++++-
src/mesonh/filesToSuppress.txt | 2 --
5 files changed, 41 insertions(+), 76 deletions(-)
delete mode 100644 src/common/aux/mode_argslist_ll.F90
delete mode 100644 src/common/aux/mode_gather_ll.F90
diff --git a/docs/TODO b/docs/TODO
index 8ce6da5ad..e2a31546c 100644
--- a/docs/TODO
+++ b/docs/TODO
@@ -37,7 +37,6 @@ Merge pb:
- KFB ?
Pb identifiés à corriger plus tard:
- - LHGRAD non porté sur GPU (mis en commentaire) : trop de gradient horizontaux à traiter et utilisation de XXHAT (domaine carré seulement). A traiter plus tard
- deposition devrait être déplacée dans ice4_tendencies
- avec les optimisations de Ryad, les tableaux 3D de precip passés à ice4_tendencies
lorsque HSUBG_RC_RR_ACCR=='PRFR' ne sont pas utilisables puisque les K1, K2 et K3
diff --git a/src/common/aux/mode_argslist_ll.F90 b/src/common/aux/mode_argslist_ll.F90
deleted file mode 100644
index f80bc15fb..000000000
--- a/src/common/aux/mode_argslist_ll.F90
+++ /dev/null
@@ -1,44 +0,0 @@
-MODULE MODE_ARGSLIST_ll
-USE MODD_ARGSLIST_ll, ONLY : LIST_ll
-CONTAINS
-
-!
- SUBROUTINE CLEANLIST_ll(TPLIST)
-IMPLICIT NONE
- TYPE(LIST_ll), POINTER :: TPLIST ! List of fields
- CALL ABORT
- END SUBROUTINE CLEANLIST_ll
-!
- SUBROUTINE ADD2DFIELD_ll(TPLIST, PFIELD, HNAME)
-IMPLICIT NONE
-
- TYPE(LIST_ll), POINTER :: TPLIST ! list of fields
- REAL, DIMENSION(:,:), TARGET :: PFIELD ! field to be added to the list
- ! of fields
- character(len=*), intent(in) :: HNAME ! Name of the field to be added
- !
- CALL ABORT
-END SUBROUTINE ADD2DFIELD_ll
-!
- SUBROUTINE ADD3DFIELD_ll(TPLIST, PFIELD, HNAME)
-IMPLICIT NONE
-
- TYPE(LIST_ll), POINTER :: TPLIST ! list of fields
- REAL, DIMENSION(:,:,:), TARGET :: PFIELD ! field to be added to the list
- ! of fields
- character(len=*), intent(in) :: HNAME ! Name of the field to be added
- !
- CALL ABORT
-END SUBROUTINE ADD3DFIELD_ll
-!
- SUBROUTINE ADD4DFIELD_ll(TPLIST, PFIELD, HNAME)
-IMPLICIT NONE
-
- TYPE(LIST_ll), POINTER :: TPLIST ! list of fields
- REAL, DIMENSION(:,:,:,:), TARGET :: PFIELD ! field to be added to the list
- ! of fields
- character(len=*), intent(in) :: HNAME ! Name of the field to be added
- !
- CALL ABORT
-END SUBROUTINE ADD4DFIELD_ll
-END MODULE MODE_ARGSLIST_ll
diff --git a/src/common/aux/mode_gather_ll.F90 b/src/common/aux/mode_gather_ll.F90
deleted file mode 100644
index 88c37bbd9..000000000
--- a/src/common/aux/mode_gather_ll.F90
+++ /dev/null
@@ -1,28 +0,0 @@
-MODULE MODE_GATHER_ll
-IMPLICIT NONE
-
-INTERFACE GATHERALL_FIELD_ll
- MODULE PROCEDURE &
- GATHERALL_X1, GATHERALL_X3
-END INTERFACE
-
-CONTAINS
-SUBROUTINE GATHERALL_X3(HDIR,PSEND,PRECV,KRESP)
-CHARACTER(LEN=*), INTENT(IN) :: HDIR
-REAL,DIMENSION(:,:,:), INTENT(IN) :: PSEND
-REAL,DIMENSION(:,:,:), INTENT(INOUT):: PRECV
-INTEGER, INTENT(INOUT):: KRESP
-
-CALL ABORT
-END SUBROUTINE GATHERALL_X3
-!
-SUBROUTINE GATHERALL_X1(HDIR,PSEND,PRECV,KRESP)
-CHARACTER(LEN=*), INTENT(IN) :: HDIR
-REAL,DIMENSION(:), INTENT(IN) :: PSEND
-REAL,DIMENSION(:), INTENT(INOUT):: PRECV
-INTEGER, INTENT(INOUT):: KRESP
-
-CALL ABORT
-END SUBROUTINE GATHERALL_X1
-!
-END MODULE MODE_GATHER_ll
diff --git a/src/common/aux/mode_ll.F90 b/src/common/aux/mode_ll.F90
index 27ab81760..7afba048e 100644
--- a/src/common/aux/mode_ll.F90
+++ b/src/common/aux/mode_ll.F90
@@ -1,5 +1,5 @@
MODULE MODE_ll
-USE MODE_ARGSLIST_ll
+USE MODD_ARGSLIST_ll, ONLY : LIST_ll
USE MODE_TOOLS
IMPLICIT NONE
CONTAINS
@@ -41,4 +41,44 @@ END FUNCTION LWEST_ll
LOGICAL FUNCTION LSOUTH_ll()
LSOUTH_ll=.FALSE.
END FUNCTION LSOUTH_ll
+!
+SUBROUTINE CLEANLIST_ll(TPLIST)
+IMPLICIT NONE
+ TYPE(LIST_ll), POINTER :: TPLIST ! List of fields
+ CALL ABORT
+ END SUBROUTINE CLEANLIST_ll
+!
+SUBROUTINE ADD2DFIELD_ll(TPLIST, PFIELD, HNAME)
+IMPLICIT NONE
+
+ TYPE(LIST_ll), POINTER :: TPLIST ! list of fields
+ REAL, DIMENSION(:,:), TARGET :: PFIELD ! field to be added to the list
+ ! of fields
+ character(len=*), intent(in) :: HNAME ! Name of the field to be added
+ !
+ CALL ABORT
+END SUBROUTINE ADD2DFIELD_ll
+!
+SUBROUTINE ADD3DFIELD_ll(TPLIST, PFIELD, HNAME)
+IMPLICIT NONE
+
+ TYPE(LIST_ll), POINTER :: TPLIST ! list of fields
+ REAL, DIMENSION(:,:,:), TARGET :: PFIELD ! field to be added to the list
+ ! of fields
+ character(len=*), intent(in) :: HNAME ! Name of the field to be added
+ !
+ CALL ABORT
+END SUBROUTINE ADD3DFIELD_ll
+!
+SUBROUTINE ADD4DFIELD_ll(TPLIST, PFIELD, HNAME)
+IMPLICIT NONE
+
+ TYPE(LIST_ll), POINTER :: TPLIST ! list of fields
+ REAL, DIMENSION(:,:,:,:), TARGET :: PFIELD ! field to be added to the list
+ ! of fields
+ character(len=*), intent(in) :: HNAME ! Name of the field to be added
+ !
+ CALL ABORT
+END SUBROUTINE ADD4DFIELD_ll
+
END MODULE MODE_ll
diff --git a/src/mesonh/filesToSuppress.txt b/src/mesonh/filesToSuppress.txt
index c6f6af4f5..6ed551e32 100644
--- a/src/mesonh/filesToSuppress.txt
+++ b/src/mesonh/filesToSuppress.txt
@@ -8,9 +8,7 @@ aux/modd_field.f90
aux/modd_argslist_ll.f90
aux/modd_parameters.f90
aux/modd_precision.f90
-aux/mode_gather_ll.f90
aux/mode_ll.f90
-aux/mode_argslist_ll.f90
aux/mode_mppdb.f90
aux/mode_sources_neg_correct.f90
aux/modi_shuman.f90
--
GitLab