Changeset 1220 for LMDZ4/branches/LMDZ4-dev/libf/dyn3d

Timestamp:

Aug 5, 2009, 4:38:34 PM (15 years ago)

Author:

lguez

Message:

-- Replaced "integer*4" declarations by "integer", "real*8" by

"real(kind=8)" and "real*4" by "real". Note that these are the only
modifications in the files "radiation_AR4.F" and "sw_aeroAR4.F90".

-- Corrected the kind of arguments to "max" and "min".

-- Replaced "nH" edit descriptors, which is a deleted feature in

Fortran 95, by character strings.

-- "regr_lat_time_climoz" now allows the pressure coordinate in the

input file to be in descending order.

-- Replaced call to not standard function "float" by call to intrinsic

function "real".

-- Included file "radepsi.h" in "physiq" was not used. Removed it.

The following set of modifications is related to the management of time.

-- In "gcm", "leapfrog" and "sortvarc0", "day_ini" was defined as 1

plus number of days between the reference date "(annee_ref,
day_ref)" and the first day of the current simulation. Changed
definition: "(annee_ref, day_ini)" is the first day of the current
simulation. There is an accompanying modification for "day_end".

-- Corrected bug in call to "ioconf_startdate" in "gcm".

-- Added call to "ioconf_calendar" in "create_etat0_limit".

Location:

LMDZ4/branches/LMDZ4-dev/libf/dyn3d

Files:

• coefpoly.F (modified) (1 diff)
• create_etat0_limit.F (modified) (2 diffs)
• etat0_netcdf.F (modified) (1 diff)
• fxhyp.F (modified) (1 diff)
• fxyhyper.F (modified) (1 diff)
• fyhyp.F (modified) (2 diffs)
• gcm.F (modified) (3 diffs)
• grid_atob.F (modified) (3 diffs)
• heavyside.F (modified) (1 diff)
• inter_barx.F (modified) (1 diff)
• leapfrog.F (modified) (2 diffs)
• sortvarc.F (modified) (1 diff)
• sortvarc0.F (modified) (1 diff)

LMDZ4/branches/LMDZ4-dev/libf/dyn3d/coefpoly.F

@@ -19 +19 @@
 c  On en revient a resoudre un systeme de 4 equat.a 4 inconnues a0,a1,a2,a3
 
-      REAL*8 Xf1, Xf2,Xprim1,Xprim2, xtild1,xtild2, xi 
-      REAL*8 Xfout, Xprim
-      REAL*8 a1,a2,a3,a0, xtil1car, xtil2car,derr,x1x2car
+      REAL(KIND=8) Xf1, Xf2,Xprim1,Xprim2, xtild1,xtild2, xi 
+      REAL(KIND=8) Xfout, Xprim
+      REAL(KIND=8) a1,a2,a3,a0, xtil1car, xtil2car,derr,x1x2car
 
       xtil1car = xtild1 * xtild1

LMDZ4/branches/LMDZ4-dev/libf/dyn3d/create_etat0_limit.F

@@ -6 +6 @@
        USE comgeomphy
        USE infotrac
+#ifdef CPP_IOIPSL
+       use ioipsl, only: ioconf_calendar
+#endif
+       IMPLICIT NONE
 c
 c
@@ -44 +48 @@
       call InitComgeomphy
 
+#ifdef CPP_IOIPSL
+      call ioconf_calendar('360d')
+#endif
+
       WRITE(6,*) '  *********************  '
       WRITE(6,*) ' interbar = ',interbar

LMDZ4/branches/LMDZ4-dev/libf/dyn3d/etat0_netcdf.F

@@ -655 +655 @@
       itau_phy = 0
       iday = dayref +itau/day_step
-      time = FLOAT(itau-(iday-dayref)*day_step)/day_step
+      time = real(itau-(iday-dayref)*day_step)/day_step
 c     
       IF(time.GT.1)  THEN

LMDZ4/branches/LMDZ4-dev/libf/dyn3d/fxhyp.F

@@ -48 +48 @@
 c
        REAL   dzoom
-       REAL*8 xlon(iip1),xprimm(iip1),xuv
-       REAL*8 xtild(0:nmax2)
-       REAL*8 fhyp(0:nmax2),ffdx,beta,Xprimt(0:nmax2)
-       REAL*8 Xf(0:nmax2),xxpr(0:nmax2)
-       REAL*8 xvrai(iip1),xxprim(iip1) 
-       REAL*8 pi,depi,epsilon,xzoom,fa,fb
-       REAL*8 Xf1, Xfi , a0,a1,a2,a3,xi2
+       REAL(KIND=8) xlon(iip1),xprimm(iip1),xuv
+       REAL(KIND=8) xtild(0:nmax2)
+       REAL(KIND=8) fhyp(0:nmax2),ffdx,beta,Xprimt(0:nmax2)
+       REAL(KIND=8) Xf(0:nmax2),xxpr(0:nmax2)
+       REAL(KIND=8) xvrai(iip1),xxprim(iip1) 
+       REAL(KIND=8) pi,depi,epsilon,xzoom,fa,fb
+       REAL(KIND=8) Xf1, Xfi , a0,a1,a2,a3,xi2
        INTEGER i,it,ik,iter,ii,idif,ii1,ii2
-       REAL*8 xi,xo1,xmoy,xlon2,fxm,Xprimin
-       REAL*8 champmin,champmax,decalx
+       REAL(KIND=8) xi,xo1,xmoy,xlon2,fxm,Xprimin
+       REAL(KIND=8) champmin,champmax,decalx
        INTEGER is2
        SAVE is2
 
-       REAL*8 heavyside
+       REAL(KIND=8) heavyside
 
        pi       = 2. * ASIN(1.)

LMDZ4/branches/LMDZ4-dev/libf/dyn3d/fxyhyper.F

@@ -41 +41 @@
        REAL rlonu(iip1),xprimu(iip1),rlonv(iip1),xprimv(iip1),
      , rlonm025(iip1),xprimm025(iip1), rlonp025(iip1),xprimp025(iip1)
-       REAL*8  dxmin, dxmax , dymin, dymax
+       REAL(KIND=8)  dxmin, dxmax , dymin, dymax
 
 c   ....   var. locales   .....

LMDZ4/branches/LMDZ4-dev/libf/dyn3d/fyhyp.F

@@ -50 +50 @@
      
        REAL   dzoom
-       REAL*8 ylat(jjp1), yprim(jjp1)
-       REAL*8 yuv
-       REAL*8 yt(0:nmax2)
-       REAL*8 fhyp(0:nmax2),beta,Ytprim(0:nmax2),fxm(0:nmax2)
+       REAL(KIND=8) ylat(jjp1), yprim(jjp1)
+       REAL(KIND=8) yuv
+       REAL(KIND=8) yt(0:nmax2)
+       REAL(KIND=8) fhyp(0:nmax2),beta,Ytprim(0:nmax2),fxm(0:nmax2)
        SAVE Ytprim, yt,Yf
-       REAL*8 Yf(0:nmax2),yypr(0:nmax2)
-       REAL*8 yvrai(jjp1), yprimm(jjp1),ylatt(jjp1)
-       REAL*8 pi,depi,pis2,epsilon,y0,pisjm
-       REAL*8 yo1,yi,ylon2,ymoy,Yprimin,champmin,champmax
-       REAL*8 yfi,Yf1,ffdy
-       REAL*8 ypn,deply,y00
+       REAL(KIND=8) Yf(0:nmax2),yypr(0:nmax2)
+       REAL(KIND=8) yvrai(jjp1), yprimm(jjp1),ylatt(jjp1)
+       REAL(KIND=8) pi,depi,pis2,epsilon,y0,pisjm
+       REAL(KIND=8) yo1,yi,ylon2,ymoy,Yprimin,champmin,champmax
+       REAL(KIND=8) yfi,Yf1,ffdy
+       REAL(KIND=8) ypn,deply,y00
        SAVE y00, deply
 
@@ -66 +66 @@
        INTEGER jpn,jjpn
        SAVE jpn
-       REAL*8 a0,a1,a2,a3,yi2,heavyy0,heavyy0m
-       REAL*8 fa(0:nmax2),fb(0:nmax2)
+       REAL(KIND=8) a0,a1,a2,a3,yi2,heavyy0,heavyy0m
+       REAL(KIND=8) fa(0:nmax2),fb(0:nmax2)
        REAL y0min,y0max
 
-       REAL*8     heavyside
+       REAL(KIND=8)     heavyside
 
        pi       = 2. * ASIN(1.)

LMDZ4/branches/LMDZ4-dev/libf/dyn3d/gcm.F

@@ -313 +313 @@
           annee_ref = anneeref
           day_ref = dayref
-          day_ini = 1
+          day_ini = dayref
           itau_dyn = 0
           itau_phy = 0
@@ -331 +331 @@
 
 #ifdef CPP_IOIPSL
-      call ioconf_startdate(annee_ref,0,day_ref, 0.)
+      call ioconf_startdate(annee_ref,1,day_ref, 0.)
 #endif
 
@@ -413 +413 @@
       WRITE(lunout,300)day_ini,day_end
  300  FORMAT('1'/,15x,'run du jour',i7,2x,'au jour',i7//)
-      call ju2ymds(jD_ref+day_ini-1,an, mois, jour, heure)
+      call ju2ymds(jD_ref + day_ini - day_ref, an, mois, jour, heure)
       write (lunout,301)jour, mois, an
-      call ju2ymds(jD_ref+day_end-1,an, mois, jour, heure)
+      call ju2ymds(jD_ref + day_end - day_ref, an, mois, jour, heure)
       write (lunout,302)jour, mois, an
  301  FORMAT('1'/,15x,'run du ', i2,'/',i2,'/',i4)

LMDZ4/branches/LMDZ4-dev/libf/dyn3d/grid_atob.F

@@ -700 +700 @@
       PARAMETER (imtmp=360,jmtmp=180)
       REAL xtmp(imtmp), ytmp(jmtmp)
-      REAL*8 cham1tmp(imtmp,jmtmp), cham2tmp(imtmp,jmtmp)
+      REAL(KIND=8) cham1tmp(imtmp,jmtmp), cham2tmp(imtmp,jmtmp)
       REAL zzzz
 c
@@ -859 +859 @@
               number(ii,jj) = number(ii,jj) + 1.0
               rugs(ii,jj) = rugs(ii,jj)
-     .                       + LOG(MAX(0.001,cham2tmp(i,j)))
+     .                       + LOG(MAX(0.001_8,cham2tmp(i,j)))
           ENDIF
           ENDDO
@@ -892 +892 @@
          i_proche = ij_proche - (j_proche-1)*imtmp
          PRINT*, "solution:", ij_proche, i_proche, j_proche
-         rugs(i,j) = LOG(MAX(0.001,cham2tmp(i_proche,j_proche)))
+         rugs(i,j) = LOG(MAX(0.001_8,cham2tmp(i_proche,j_proche)))
          ENDIF
       ENDDO

LMDZ4/branches/LMDZ4-dev/libf/dyn3d/heavyside.F

@@ -10 +10 @@
        IMPLICIT NONE
 
-       REAL*8 heavyside , a
+       REAL(KIND=8) heavyside , a
 
        IF ( a.LE.0. )  THEN

LMDZ4/branches/LMDZ4-dev/libf/dyn3d/inter_barx.F

@@ -212 +212 @@
      
 
-3      FORMAT(1x,70(1h-))
+3      FORMAT(1x,70("-"))
 2      FORMAT(1x,8f8.2)
 

LMDZ4/branches/LMDZ4-dev/libf/dyn3d/leapfrog.F

@@ -219 +219 @@
    1  CONTINUE
 
-      jD_cur = jD_ref + (day_ini - 1) + int (itau * dtvr / daysec) 
+      jD_cur = jD_ref + day_ini - day_ref + int (itau * dtvr / daysec) 
       jH_cur = jH_ref +                                                 &
      &          (itau * dtvr / daysec - int(itau * dtvr / daysec)) 
@@ -356 +356 @@
 !           rdaym_ini  = itau * dtvr / daysec
 !           rdayvrai   = rdaym_ini  + day_ini
-           jD_cur = jD_ref + (day_ini - 1) + int (itau * dtvr / daysec) 
+           jD_cur = jD_ref + day_ini - day_ref
+     $        + int (itau * dtvr / daysec) 
            jH_cur = jH_ref +                                            &
      &              (itau * dtvr / daysec - int(itau * dtvr / daysec)) 

LMDZ4/branches/LMDZ4-dev/libf/dyn3d/sortvarc.F

@@ -157 +157 @@
       RETURN
 
-3500   FORMAT('0'10(1h*),4x,'pas'i7,5x,'jour'f9.0,'heure'f5.1,4x 
-     *   ,'date',f14.4,4x,10(1h*))
+3500   FORMAT(10("*"),4x,'pas',i7,5x,'jour',f9.0,'heure',f5.1,4x 
+     *   ,'date',f14.4,4x,10("*"))
 4000   FORMAT(10x,'masse',4x,'rmsdpdt',7x,'energie',2x,'enstrophie'
      * ,2x,'entropie',3x,'rmsv',4x,'mt.ang',/,'GLOB  '

LMDZ4/branches/LMDZ4-dev/libf/dyn3d/sortvarc0.F

@@ -130 +130 @@
       ang0   = SSUM(     llm,  angl, 1 )
 
-      rday = FLOAT(INT ( day_ini + time ))
+      rday = FLOAT(INT (time ))
 c
       PRINT 3500, itau, rday, heure, time
       PRINT *, ptot0,etot0,ztot0,stot0,ang0
 
-3500   FORMAT('0',10(1h*),4x,'pas',i7,5x,'jour',f5.0,'heure',f5.1,4x 
-     *   ,'date',f10.5,4x,10(1h*))
+3500   FORMAT(10("*"),4x,'pas',i7,5x,'jour',f5.0,'heure',f5.1,4x 
+     *   ,'date',f10.5,4x,10("*"))
       RETURN
       END