Changeset 1299 for LMDZ4/branches/LMDZ4V5.0-dev/libf/grid

Timestamp:

Jan 20, 2010, 3:27:21 PM (15 years ago)

Author:

Laurent Fairhead

Message:

Nettoyage general pour se rapprocher des normes et éviter des erreurs a la
compilation:

• tous les FLOAT() sont remplacés par des REAL()
• tous les STOP dans phylmd sont remplacés par des appels à abort_gcm
• le common control défini dans le fichier control.h est remplacé par le module control_mod pour éviter des messages sur l'alignement des variables dans les déclarations
• des $Header$ remplacés par des $Id$ pour svn

Quelques remplacements à faire ont pu m'échapper

---

General cleanup of the code to try and adhere to norms and to prevent some
compilation errors:

• all FLOAT() instructions have been replaced by REAL() instructions
• all STOP instructions in phylmd have been replaced by calls to abort_gcm
• the common block control defined in the control.h file has been replaced by the control_mod to prevent compilation warnings on the alignement of declared variables
• $Header$ replaced by $Id$ for svn

Some changes which should have been made might have escaped me

Location:

LMDZ4/branches/LMDZ4V5.0-dev/libf/grid

Files:

• fxy_new.h (modified) (1 diff)
• fxy_reg.h (modified) (1 diff)
• fxy_sin.h (modified) (1 diff)
• fxyprim.h (modified) (1 diff)

LMDZ4/branches/LMDZ4V5.0-dev/libf/grid/fxy_new.h

@@ -8 +8 @@
 c....stretching in x...
 c
-        ripx(  ri )= (ri-1.0) *2.*pi/FLOAT(iim) 
+        ripx(  ri )= (ri-1.0) *2.*pi/REAL(iim) 
         fx  (  ri )= ripx(ri) + transx  +
      *         alphax * SIN( ripx(ri)+transx-pxo ) - pi
-        fxprim(ri) = 2.*pi/FLOAT(iim)  *
+        fxprim(ri) = 2.*pi/REAL(iim)  *
      *        ( 1.+ alphax * COS( ripx(ri)+transx-pxo ) )
 
 c....stretching in y...
 c
-        bigy(rj)   = 2.* (FLOAT(jjp1)-rj ) *pi/jjm
+        bigy(rj)   = 2.* (REAL(jjp1)-rj ) *pi/jjm
         fy(rj)     =  ( bigy(rj) + transy  +
      *        alphay * SIN( bigy(rj)+transy-pyo ) ) /2.  - pi/2.

LMDZ4/branches/LMDZ4V5.0-dev/libf/grid/fxy_reg.h

@@ -13 +13 @@
 c
 c
-      fy    ( rj ) =    pi/FLOAT(jjm) * ( 0.5 * FLOAT(jjm) +  1. - rj  )
-      fyprim( rj ) =    pi/FLOAT(jjm)
+      fy    ( rj ) =    pi/REAL(jjm) * ( 0.5 * REAL(jjm) +  1. - rj  )
+      fyprim( rj ) =    pi/REAL(jjm)
 
-c     fy(rj)=ASIN(1.+2.*((1.-rj)/FLOAT(jjm)))
+c     fy(rj)=ASIN(1.+2.*((1.-rj)/REAL(jjm)))
 c     fyprim(rj)=1./SQRT((rj-1.)*(jjm+1.-rj))
 
-      fx    ( ri ) = 2.*pi/FLOAT(iim) * ( ri - 0.5*  FLOAT(iim) - 1. )
-c     fx    ( ri ) = 2.*pi/FLOAT(iim) * ( ri - 0.5* ( FLOAT(iim) + 1.) )
-      fxprim( ri ) = 2.*pi/FLOAT(iim)
+      fx    ( ri ) = 2.*pi/REAL(iim) * ( ri - 0.5*  REAL(iim) - 1. )
+c     fx    ( ri ) = 2.*pi/REAL(iim) * ( ri - 0.5* ( REAL(iim) + 1.) )
+      fxprim( ri ) = 2.*pi/REAL(iim)
 c
 c

LMDZ4/branches/LMDZ4V5.0-dev/libf/grid/fxy_sin.h

@@ -13 +13 @@
 c
 c
-      fy(rj)=ASIN(1.+2.*((1.-rj)/FLOAT(jjm)))
+      fy(rj)=ASIN(1.+2.*((1.-rj)/REAL(jjm)))
       fyprim(rj)=1./SQRT((rj-1.)*(jjm+1.-rj))
 
-      fx    ( ri ) = 2.*pi/FLOAT(iim) * ( ri - 0.5*  FLOAT(iim) - 1. )
-c     fx    ( ri ) = 2.*pi/FLOAT(iim) * ( ri - 0.5* ( FLOAT(iim) + 1.) )
-      fxprim( ri ) = 2.*pi/FLOAT(iim)
+      fx    ( ri ) = 2.*pi/REAL(iim) * ( ri - 0.5*  REAL(iim) - 1. )
+c     fx    ( ri ) = 2.*pi/REAL(iim) * ( ri - 0.5* ( REAL(iim) + 1.) )
+      fxprim( ri ) = 2.*pi/REAL(iim)
 c
 c

LMDZ4/branches/LMDZ4V5.0-dev/libf/grid/fxyprim.h

@@ -13 +13 @@
 c
 c
-      fy    ( rj ) =    pi/FLOAT(jjm) * ( 0.5 * FLOAT(jjm) +  1. - rj  )
-      fyprim( rj ) =    pi/FLOAT(jjm)
+      fy    ( rj ) =    pi/REAL(jjm) * ( 0.5 * REAL(jjm) +  1. - rj  )
+      fyprim( rj ) =    pi/REAL(jjm)
 
-c     fy(rj)=ASIN(1.+2.*((1.-rj)/FLOAT(jjm)))
+c     fy(rj)=ASIN(1.+2.*((1.-rj)/REAL(jjm)))
 c     fyprim(rj)=1./SQRT((rj-1.)*(jjm+1.-rj))
 
-      fx    ( ri ) = 2.*pi/FLOAT(iim) * ( ri - 0.5*  FLOAT(iim) - 1. )
-c     fx    ( ri ) = 2.*pi/FLOAT(iim) * ( ri - 0.5* ( FLOAT(iim) + 1.) )
-      fxprim( ri ) = 2.*pi/FLOAT(iim)
+      fx    ( ri ) = 2.*pi/REAL(iim) * ( ri - 0.5*  REAL(iim) - 1. )
+c     fx    ( ri ) = 2.*pi/REAL(iim) * ( ri - 0.5* ( REAL(iim) + 1.) )
+      fxprim( ri ) = 2.*pi/REAL(iim)
 c
 c