Changeset 1107 for LMDZ4/trunk/libf/phylmd

Timestamp:

Feb 24, 2009, 4:07:48 PM (16 years ago)

Author:

lguez

Message:

"comconst.h" and "comgeom2.h" are now both fixed and free form.
Removed calls to procedure "flush".
Corrected kinds of constants which appeared as arguments to "min" or
"max" (all arguments are now of the same type and kind).

Location:

LMDZ4/trunk/libf/phylmd

Files:

• calcul_fluxs_mod.F90 (modified) (1 diff)
• oasis.F90 (modified) (1 diff)
• radiation_AR4.F (modified) (3 diffs)
• screenp.F90 (modified) (1 diff)

LMDZ4/trunk/libf/phylmd/calcul_fluxs_mod.F90

@@ -99 +99 @@
        WRITE(*,*)' radsol (min, max)', &
             MINVAL(radsol(1:knon)), MAXVAL(radsol(1:knon))
-       CALL flush(6)
     ENDIF
   

LMDZ4/trunk/libf/phylmd/oasis.F90

@@ -284 +284 @@
     WRITE (nuout,*) 'Fromcpl: Reading fields from CPL, ktime=',ktime
     WRITE (nuout,*) ' '
-    CALL flush (nuout)
     
     istart=ii_begin

LMDZ4/trunk/libf/phylmd/radiation_AR4.F

@@ -2123 +2123 @@
       ZALPHA = 3.*ZWCP*ZRM2*(1.+ZGP*ZWM)/ZX2
       ZBETA = 3.*ZWCP* PRMUZ(JL) *(1.+3.*ZGP*ZRM2*ZWM)/ZX2
-CMAF      ZARG=MIN(ZTOP/PRMUZ(JL),200.)
-      ZARG=MIN(ZTOP/PRMUZ(JL),2.0d+2)
+      ZARG=MIN(ZTOP/PRMUZ(JL),200._8)
       ZEXMU0=EXP(-ZARG)
-CMAF      ZARG2=MIN(ZRK*ZTOP,200.)
-      ZARG2=MIN(ZRK*ZTOP,2.0d+2)
+      ZARG2=MIN(ZRK*ZTOP,200._8)
       ZEXKP=EXP(ZARG2)
       ZEXKM = 1./ZEXKP
@@ -2898 +2896 @@
       ZTX2=ZTX*ZTX
       ZZABLY = ZABLY(JL,6,JAE1)+ZABLY(JL,6,JAE2)+ZABLY(JL,6,JAE3)
-CMAF      ZUP=MIN( MAX( 0.5*R10E*LOG( ZZABLY ) + 5., 0.), 6.0)
-      ZUP=MIN( MAX( 0.5*R10E*LOG( ZZABLY ) + 5., 0.d+0), 6.d+0)
+      ZUP=MIN( MAX( 0.5*R10E*LOG( ZZABLY ) + 5., 0._8), 6._8)
       ZCAH1=AT(1,1)+ZUP*(AT(1,2)+ZUP*(AT(1,3)))
       ZCBH1=BT(1,1)+ZUP*(BT(1,2)+ZUP*(BT(1,3)))
@@ -2930 +2927 @@
       ZZABLY = ZABLY(JL,9,JAE1)+ZABLY(JL,9,JAE2)+ZABLY(JL,9,JAE3)
       ZALUP = R10E * LOG ( ZZABLY )
-CMAF      ZUP   = MAX( 0.0 , 5.0 + 0.5 * ZALUP )
-      ZUP   = MAX( 0.d+0 , 5.0 + 0.5 * ZALUP )
+      ZUP   = MAX( 0._8, 5.0 + 0.5 * ZALUP )
       ZPSC2(JL) = (ZTAVI(JL)/TREF) ** ZUP
       ZCAC8=AT(8,1)+ZUP*(AT(8,2)+ZUP*(AT(8,3)))

LMDZ4/trunk/libf/phylmd/screenp.F90

@@ -64 +64 @@
             delu(i) = (ustar(i)/RKAR)* &
                       (log(zref/(rugos(i))+1.) + &
-                      min(5.0, 5.0 *(zref - rugos(i))/lmon(i)))
+                      min(5.d0, 5.0 *(zref - rugos(i))/lmon(i)))
             delte(i) = (testar(i)/RKAR)* &
                        (log(zref/(rugos(i))+1.) + &
-                       min(5.0, 5.0 * (zref - rugos(i))/lmon(i)))
+                       min(5.d0, 5.0 * (zref - rugos(i))/lmon(i)))
             delq(i) = (qstar(i)/RKAR)* &
                       (log(zref/(rugos(i))+1.) + &
-                      min(5.0, 5.0 * (zref - rugos(i))/lmon(i)))
+                      min(5.d0, 5.0 * (zref - rugos(i))/lmon(i)))
           ELSE
             delu(i)  = 0.1 * speed(i)