Changeset 5098 for LMDZ6/branches/Amaury_dev/libf/misc

Timestamp:

Jul 22, 2024, 6:53:44 PM (17 months ago)

Author:

abarral

Message:

Remove CRAY key (obsolete calls to functions that don't exist anymore, bugs in some implementations, irrelevant now)
Replace usage of CPP_XIOS key by using_xios logical
Remove always unused testcpu bits
Replace most uses of CPP_StratAer by the corresponding logical defined in lmdz_cppkeys_wrapper.F90 [this breaks iso compilation because phyiso doesn't define all aerosols - to be fixed later]
Replaces uses of include "yomcst.h" by the lmdz_yomcst.f90 module in .[fF]90 files

Location:

LMDZ6/branches/Amaury_dev/libf/misc

Files:

• lmdz_TO_MOVE_ssum_scopy.f90 (moved) (moved from LMDZ6/branches/Amaury_dev/libf/misc/cray.F) (1 diff)
• lmdz_cppkeys_wrapper.F90 (modified) (4 diffs)

LMDZ6/branches/Amaury_dev/libf/misc/lmdz_TO_MOVE_ssum_scopy.f90

@@ -1 @@
-!
-! $Header$
-!
-#ifdef CRAY
-      SUBROUTINE riencray
-      END
-#else
-      subroutine scopy(n,sx,incx,sy,incy)
-c
-      IMPLICIT NONE
-c
-      integer n,incx,incy,ix,iy,i
-      real sx((n-1)*incx+1),sy((n-1)*incy+1)
-c
-      iy=1
-      ix=1
-      DO i=1,n
-         sy(iy)=sx(ix)
-         ix=ix+incx
-         iy=iy+incy
-      END DO
-c
-      return
-      end
+! TO MOVE SOMEWHERE ELSE !! (Amaury - 07/2024)
+! Move with other vector/math functions
+! Those are old legacy CRAY replacement functions, that are now used in several parts of the code.
 
-      function ssum(n,sx,incx)
-c
-      IMPLICIT NONE
-c
-      integer n,incx,i,ix
-      real ssum,sx((n-1)*incx+1)
-c
-      ssum=0.
-      ix=1
-      do i=1,n
-         ssum=ssum+sx(ix)
-         ix=ix+incx
-      END DO
-c
-      return
-      end
-#endif
+subroutine scopy(n, sx, incx, sy, incy)
+
+  IMPLICIT NONE
+
+  integer n, incx, incy, ix, iy, i
+  real sx((n - 1) * incx + 1), sy((n - 1) * incy + 1)
+
+  iy = 1
+  ix = 1
+  DO i = 1, n
+    sy(iy) = sx(ix)
+    ix = ix + incx
+    iy = iy + incy
+  END DO
+
+end
+
+function ssum(n, sx, incx)
+
+  IMPLICIT NONE
+
+  integer n, incx, i, ix
+  real ssum, sx((n - 1) * incx + 1)
+
+  ssum = 0.
+  ix = 1
+  do i = 1, n
+    ssum = ssum + sx(ix)
+    ix = ix + incx
+  END DO
+
+end
+

LMDZ6/branches/Amaury_dev/libf/misc/lmdz_cppkeys_wrapper.F90

@@ -2 +2 @@
 ! This file is part of an effort to replace most uses of preprocessor CPP keys by fortran variables,
 ! to improve readability, compilation coverage, and linting.
-! CPP keys used here should ONLY be used here,
+! CPP keys used here should ONLY be used here (unless specified explicitely),
 ! and imported through USE ..., ONLY: ... elsewhere
 ! CPP keys supported (key -> fortran variables associated):
@@ -8 +8 @@
 !      CPP_PHYS  -> CPPKEY_PHYS
 !      INCA      -> CPPKEY_INCA
+!      CPP_StratAer-> CPPKEY_STRATAER
 ! ---------------------------------------------
 
@@ -14 +15 @@
   USE netcdf, ONLY: nf90_float, nf90_double
   IMPLICIT NONE; PRIVATE
-  PUBLIC nf90_format, CPPKEY_PHYS, CPPKEY_INCA
+  PUBLIC nf90_format, CPPKEY_PHYS, CPPKEY_INCA, CPPKEY_STRATAER
 
 #ifdef NC_DOUBLE
@@ -34 +35 @@
 #endif
 
+#ifdef CPP_StratAer
+  LOGICAL, PARAMETER :: CPPKEY_STRATAER = .TRUE.
+#else
+  LOGICAL, PARAMETER :: CPPKEY_STRATAER = .FALSE.
+#endif
+
 END MODULE lmdz_cppkeys_wrapper