Changeset 5108 for LMDZ6/branches/Amaury_dev/libf/dyn3d_common/fxy.f90

Timestamp:

Jul 24, 2024, 10:58:59 AM (4 months ago)

Author:

abarral

Message:

Turn grid/*.h into lmdz_fxy.f90

File:

• LMDZ6/branches/Amaury_dev/libf/dyn3d_common/fxy.f90 (modified) (2 diffs)

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

@@ -1 @@
-
 ! $Id$
 
-SUBROUTINE fxy(rlatu,yprimu,rlatv,yprimv,rlatu1,yprimu1, &
-        rlatu2,yprimu2, &
-        rlonu,xprimu,rlonv,xprimv,rlonm025,xprimm025,rlonp025,xprimp025)
+SUBROUTINE fxy(rlatu, yprimu, rlatv, yprimv, rlatu1, yprimu1, &
+        rlatu2, yprimu2, &
+        rlonu, xprimu, rlonv, xprimv, rlonm025, xprimm025, rlonp025, xprimp025)
 
   USE comconst_mod, ONLY: pi
-  USE serre_mod, ONLY: pxo,pyo,alphax,alphay,transx,transy
+  USE serre_mod, ONLY: pxo, pyo, alphax, alphay, transx, transy
+  USE lmdz_fxy, ONLY: fxy_new
 
   IMPLICIT NONE
@@ -20 +20 @@
   include "paramet.h"
 
-   INTEGER :: i,j
+  INTEGER :: i, j
 
-   REAL :: rlatu(jjp1), yprimu(jjp1),rlatv(jjm), yprimv(jjm), &
-         rlatu1(jjm), yprimu1(jjm), rlatu2(jjm), yprimu2(jjm)
-   REAL :: rlonu(iip1),xprimu(iip1),rlonv(iip1),xprimv(iip1), &
-         rlonm025(iip1),xprimm025(iip1), rlonp025(iip1),xprimp025(iip1)
+  REAL :: rlatu(jjp1), yprimu(jjp1), rlatv(jjm), yprimv(jjm), &
+          rlatu1(jjm), yprimu1(jjm), rlatu2(jjm), yprimu2(jjm)
+  REAL :: rlonu(iip1), xprimu(iip1), rlonv(iip1), xprimv(iip1), &
+          rlonm025(iip1), xprimm025(iip1), rlonp025(iip1), xprimp025(iip1)
+  REAL :: ripx, fx, fxprim, fy, fyprim, ri, rj, bigy
 
-  INCLUDE "fxy_new.h"
-
+  CALL fxy_new(ripx, fx, fxprim, fy, fyprim, ri, rj, bigy)
 
   !    ......  calcul  des  latitudes  et de y'   .....
   !
-   DO j = 1, jjm + 1
-      rlatu(j) = fy    ( REAL( j )        )
-     yprimu(j) = fyprim( REAL( j )        )
-   ENDDO
+  DO j = 1, jjm + 1
+    rlatu(j) = fy    (REAL(j))
+    yprimu(j) = fyprim(REAL(j))
+  ENDDO
 
+  DO j = 1, jjm
 
-   DO j = 1, jjm
+    rlatv(j) = fy    (REAL(j) + 0.5)
+    rlatu1(j) = fy    (REAL(j) + 0.25)
+    rlatu2(j) = fy    (REAL(j) + 0.75)
 
-     rlatv(j)  = fy    ( REAL( j ) + 0.5  )
-     rlatu1(j) = fy    ( REAL( j ) + 0.25 )
-     rlatu2(j) = fy    ( REAL( j ) + 0.75 )
+    yprimv(j) = fyprim(REAL(j) + 0.5)
+    yprimu1(j) = fyprim(REAL(j) + 0.25)
+    yprimu2(j) = fyprim(REAL(j) + 0.75)
 
-    yprimv(j)  = fyprim( REAL( j ) + 0.5  )
-    yprimu1(j) = fyprim( REAL( j ) + 0.25 )
-    yprimu2(j) = fyprim( REAL( j ) + 0.75 )
-
-   ENDDO
+  ENDDO
 
   !
   ! .....  calcul   des  longitudes et de  x'   .....
   !
-   DO i = 1, iim + 1
-       rlonv(i)     = fx    (   REAL( i )          )
-       rlonu(i)     = fx    (   REAL( i ) + 0.5    )
-    rlonm025(i)     = fx    (   REAL( i ) - 0.25  )
-    rlonp025(i)     = fx    (   REAL( i ) + 0.25  )
+  DO i = 1, iim + 1
+    rlonv(i) = fx    (REAL(i))
+    rlonu(i) = fx    (REAL(i) + 0.5)
+    rlonm025(i) = fx    (REAL(i) - 0.25)
+    rlonp025(i) = fx    (REAL(i) + 0.25)
 
-     xprimv  (i)    = fxprim (  REAL( i )          )
-     xprimu  (i)    = fxprim (  REAL( i ) + 0.5    )
-    xprimm025(i)    = fxprim (  REAL( i ) - 0.25   )
-    xprimp025(i)    = fxprim (  REAL( i ) + 0.25   )
-   ENDDO
+    xprimv  (i) = fxprim (REAL(i))
+    xprimu  (i) = fxprim (REAL(i) + 0.5)
+    xprimm025(i) = fxprim (REAL(i) - 0.25)
+    xprimp025(i) = fxprim (REAL(i) + 0.25)
+  ENDDO
 
   !