Changeset 5297 for LMDZ6/trunk/libf/filtrez

Timestamp:

Oct 30, 2024, 2:17:34 PM (5 weeks ago)

Author:

abarral

Message:

Turn gradsdef.h coefils.h into a module

Location:

LMDZ6/trunk/libf/filtrez

Files:

• coefils_mod_h.f90 (moved) (moved from LMDZ6/trunk/libf/filtrez/coefils.h) (1 diff)
• filtreg.F90 (modified) (2 diffs)
• filtreg_mod.F90 (modified) (2 diffs)
• inifgn.F90 (modified) (2 diffs)

LMDZ6/trunk/libf/filtrez/coefils_mod_h.f90

@@ -1 @@
-!
-! $Id $
-!
-      COMMON/coefils/jfiltnu,jfiltsu,jfiltnv,jfiltsv,sddu(iim),sddv(iim)&
-     & ,unsddu(iim),unsddv(iim),coefilu(iim,jjm),coefilv(iim,jjm),      &
-     & modfrstu(jjm),modfrstv(jjm),eignfnu(iim,iim),eignfnv(iim,iim)    &
-     & ,coefilu2(iim,jjm),coefilv2(iim,jjm)
-!c
-      INTEGER jfiltnu ! index of the last lat line filtered in NH (U grid)
-      INTEGER jfiltsu ! index of the first lat line filtered in SH (U grid)
-      INTEGER jfiltnv ! index of the last lat line filtered in NH (V grid)
-      INTEGER jfiltsv ! index of the first lat line filtered in SH (V grid)
-      INTEGER modfrstu ! number of retained (ie: unfiltered) modes on U grid
-      INTEGER modfrstv ! number of retained (ie: unfiltered) modes on V grid
-      REAL    sddu,sddv,unsddu,unsddv,coefilu,coefilv,eignfnu,eignfnv
-      REAL    coefilu2,coefilv2
+! replacement for coefils.h
+MODULE coefils_mod_h
+  USE dimensions_mod, ONLY: iim, jjm, llm, ndm
+  IMPLICIT NONE; PRIVATE
+
+  PUBLIC jfiltnu, jfiltsu, jfiltnv, jfiltsv, sddu, sddv, unsddu, unsddv, coefilu, coefilv, &
+          modfrstu, modfrstv, eignfnu, eignfnv, coefilu2, coefilv2
+
+  INTEGER :: jfiltnu ! index of the last lat line filtered in NH (U grid)
+  INTEGER :: jfiltsu ! index of the first lat line filtered in SH (U grid)
+  INTEGER :: jfiltnv ! index of the last lat line filtered in NH (V grid)
+  INTEGER :: jfiltsv ! index of the first lat line filtered in SH (V grid)
+  INTEGER, DIMENSION(jjm) :: modfrstu ! number of retained (ie: unfiltered) modes on U grid
+  INTEGER, DIMENSION(jjm) :: modfrstv ! number of retained (ie: unfiltered) modes on V grid
+  REAL, DIMENSION(iim) :: sddu, sddv, unsddu, unsddv
+  REAL, DIMENSION(iim, jjm) :: coefilu, coefilv, coefilu2, coefilv2
+  REAL, DIMENSION(iim, iim) :: eignfnu, eignfnv
+END MODULE coefils_mod_h

LMDZ6/trunk/libf/filtrez/filtreg.F90

@@ -8 +8 @@
 
   USE dimensions_mod, ONLY: iim, jjm, llm, ndm
-USE paramet_mod_h
+  USE paramet_mod_h
+  USE coefils_mod_h
 IMPLICIT NONE
   !=======================================================================
@@ -47 +48 @@
   !            ifiltre =-2     filtre inverse
   !
-  !
-
-
-  INCLUDE "coefils.h"
 
   INTEGER :: nlat,nbniv,ifiltre,iter

LMDZ6/trunk/libf/filtrez/filtreg_mod.F90

@@ -15 +15 @@
 #endif
   USE comgeom_mod_h
-    USE serre_mod, ONLY: alphax
+  USE serre_mod, ONLY: alphax
   USE logic_mod, ONLY: fxyhypb, ysinus
   USE comconst_mod, ONLY: maxlatfilter
 
-    !    ... H. Upadhyaya, O.Sharma   ...
-    !
-    USE dimensions_mod, ONLY: iim, jjm, llm, ndm
-USE paramet_mod_h
+  !    ... H. Upadhyaya, O.Sharma   ...
+  !
+  USE dimensions_mod, ONLY: iim, jjm, llm, ndm
+  USE paramet_mod_h
+  USE coefils_mod_h
 IMPLICIT NONE
     !
@@ -28 +29 @@
 
     !     Correction  le 28/10/97    P. Le Van .
-    !  -------------------------------------------------------------------
-
-
-    !  -------------------------------------------------------------------
-    include "coefils.h"
+
 
     REAL  dlonu(iim),dlatu(jjm)

LMDZ6/trunk/libf/filtrez/inifgn.F90

@@ -8 +8 @@
   USE comgeom_mod_h
   USE dimensions_mod, ONLY: iim, jjm, llm, ndm
-USE paramet_mod_h
+  USE paramet_mod_h
+  USE coefils_mod_h
 IMPLICIT NONE
-  !
 
-
-
-  !
   REAL :: vec(iim,iim),vec1(iim,iim)
   REAL :: dlonu(iim),dlonv(iim)
@@ -20 +17 @@
   REAL :: pi
   INTEGER :: i,j,k,imm1,nrot
-  !
-  include "coefils.h"
-  !
   EXTERNAL SSUM, acc,eigen,jacobi
   REAL :: SSUM