Changeset 5146 for LMDZ6/branches/Amaury_dev/libf/dyn3d_common

Timestamp:

Jul 30, 2024, 3:19:21 PM (3 months ago)

Author:

abarral

Message:

Revert removal of COMMON in lmdz_comgeom.f90, lmdz_comgeom2.f90.
This common block is shared and unsafely casts 1D to 2D, and can't as easily be replaced.

Location:

LMDZ6/branches/Amaury_dev/libf/dyn3d_common

Files:

• lmdz_comgeom.f90 (modified) (3 diffs)
• lmdz_comgeom2.f90 (modified) (3 diffs)

LMDZ6/branches/Amaury_dev/libf/dyn3d_common/lmdz_comgeom.f90

@@ -1 +1 @@
 ! Replaces comgeom.h
+
+! AB 07/24: NOTE: THIS USES A LEGACY COMMON BLOCK SHARED WITH lmdz_comgeom2.f90 !
+! This file defines a number of 1D arrays.
+! The COMMON block is used to transparently (but using unsafe procedures) cast those as 2D arrays, without duplication.
+! Therefore there's no trivial way to turn this into a module without COMMON.
+! In the future we'd still like to get rid of this COMMON block.
 
 MODULE lmdz_comgeom
@@ -14 +20 @@
   INCLUDE "dimensions.h"
   INCLUDE "paramet.h"
-  REAL cu(ip1jmp1), cv(ip1jm), unscu2(ip1jmp1), unscv2(ip1jm), &
+
+  COMMON/comgeom/                                                   &
+          cu(ip1jmp1), cv(ip1jm), unscu2(ip1jmp1), unscv2(ip1jm), &
           aire(ip1jmp1), airesurg(ip1jmp1), aireu(ip1jmp1), &
           airev(ip1jm), unsaire(ip1jmp1), apoln, apols, &
@@ -31 +39 @@
           aivscu2gam(ip1jm), aiuscv2gam(ip1jm), xprimu(iip1), xprimv(iip1)
 
+  REAL                                                            &
+          cu, cv, unscu2, unscv2, aire, airesurg, aireu, airev, unsaire, apoln, &
+          apols, unsairez, airuscv2, airvscu2, aireij1, aireij2, aireij3, aireij4, &
+          alpha1, alpha2, alpha3, alpha4, alpha1p2, alpha1p4, alpha2p3, alpha3p4, &
+          fext, constang, rlatu, rlatv, rlonu, rlonv, cuvscvgam1, cuvscvgam2, &
+          cvuscugam1, cvuscugam2, cvscuvgam, cuscvugam, unsapolnga1, unsapolnga2&
+          , unsapolsga1, unsapolsga2, unsair_gam1, unsair_gam2, unsairz_gam, &
+          aivscu2gam, aiuscv2gam, cuvsurcv, cvsurcuv, cvusurcu, cusurcvu, xprimu&
+          , xprimv
+
 END MODULE lmdz_comgeom
 

LMDZ6/branches/Amaury_dev/libf/dyn3d_common/lmdz_comgeom2.f90

@@ -1 +1 @@
 ! Replaces comgeom2.h
+
+! AB 07/24: NOTE: THIS USES A LEGACY COMMON BLOCK SHARED WITH lmdz_comgeom.f90 !
+! See lmdz_comgeom.f90 comment.
 
 MODULE lmdz_comgeom2
@@ -15 +18 @@
   INCLUDE "dimensions.h"
   INCLUDE "paramet.h"
-  REAL                                                   &
+
+  COMMON/comgeom/                                                   &
           cu(iip1, jjp1), cv(iip1, jjm), unscu2(iip1, jjp1), unscv2(iip1, jjm), &
           aire(iip1, jjp1), airesurg(iip1, jjp1), aireu(iip1, jjp1), &
@@ -34 +38 @@
           , xprimu(iip1), xprimv(iip1)
 
+  REAL                                                               &
+          cu, cv, unscu2, unscv2, aire, airesurg, aireu, airev, apoln, apols, unsaire &
+          , unsairez, airuscv2, airvscu2, aireij1, aireij2, aireij3, aireij4, &
+          alpha1, alpha2, alpha3, alpha4, alpha1p2, alpha1p4, alpha2p3, alpha3p4, &
+          fext, constang, rlatu, rlatv, rlonu, rlonv, cuvscvgam1, cuvscvgam2, &
+          cvuscugam1, cvuscugam2, cvscuvgam, cuscvugam, unsapolnga1, &
+          unsapolnga2, unsapolsga1, unsapolsga2, unsair_gam1, unsair_gam2, &
+          unsairz_gam, aivscu2gam, aiuscv2gam, cuvsurcv, cvsurcuv, cvusurcu, &
+          cusurcvu, xprimu, xprimv
+
 END MODULE lmdz_comgeom2