Index: LMDZ4/trunk/libf/dyn3d/abort_gcm.F =================================================================== --- LMDZ4/trunk/libf/dyn3d/abort_gcm.F (revision 1106) +++ LMDZ4/trunk/libf/dyn3d/abort_gcm.F (revision 1107) @@ -19,7 +19,7 @@ C ierr = severity of situation ( = 0 normal ) - character*(*) modname + character(len=*) modname integer ierr - character*(*) message + character(len=*) message ! write(lunout,*) 'in abort_gcm' Index: LMDZ4/trunk/libf/dyn3d/comconst.h =================================================================== --- LMDZ4/trunk/libf/dyn3d/comconst.h (revision 1106) +++ LMDZ4/trunk/libf/dyn3d/comconst.h (revision 1107) @@ -2,10 +2,10 @@ ! $Header$ ! -c----------------------------------------------------------------------- -c INCLUDE comconst.h +!----------------------------------------------------------------------- +! INCLUDE comconst.h - COMMON/comconst/im,jm,lllm,imp1,jmp1,lllmm1,lllmp1,lcl, - * dtvr,daysec, - * pi,dtphys,dtdiss,rad,r,cpp,kappa,cotot,unsim,g,omeg + COMMON/comconst/im,jm,lllm,imp1,jmp1,lllmm1,lllmp1,lcl, & + & dtvr,daysec, & + & pi,dtphys,dtdiss,rad,r,cpp,kappa,cotot,unsim,g,omeg INTEGER im,jm,lllm,imp1,jmp1,lllmm1,lllmp1,lcl @@ -14,3 +14,3 @@ REAL cotot,unsim,g,omeg -c----------------------------------------------------------------------- +!----------------------------------------------------------------------- Index: LMDZ4/trunk/libf/dyn3d/comgeom2.h =================================================================== --- LMDZ4/trunk/libf/dyn3d/comgeom2.h (revision 1106) +++ LMDZ4/trunk/libf/dyn3d/comgeom2.h (revision 1107) @@ -2,33 +2,32 @@ ! $Header$ ! -*CDK comgeom2 - COMMON/comgeom/ - 1 cu(iip1,jjp1),cv(iip1,jjm),unscu2(iip1,jjp1),unscv2(iip1,jjm) , - 2 aire(iip1,jjp1),airesurg(iip1,jjp1),aireu(iip1,jjp1) , - 3 airev(iip1,jjm),unsaire(iip1,jjp1),apoln,apols , - 4 unsairez(iip1,jjm),airuscv2(iip1,jjm),airvscu2(iip1,jjm) , - 5 aireij1(iip1,jjp1),aireij2(iip1,jjp1),aireij3(iip1,jjp1) , - 6 aireij4(iip1,jjp1),alpha1(iip1,jjp1),alpha2(iip1,jjp1) , - 7 alpha3(iip1,jjp1),alpha4(iip1,jjp1),alpha1p2(iip1,jjp1) , - 8 alpha1p4(iip1,jjp1),alpha2p3(iip1,jjp1),alpha3p4(iip1,jjp1) , - 9 fext(iip1,jjm),constang(iip1,jjp1), rlatu(jjp1),rlatv(jjm), - 1 rlonu(iip1),rlonv(iip1),cuvsurcv(iip1,jjm),cvsurcuv(iip1,jjm) , - 1 cvusurcu(iip1,jjp1),cusurcvu(iip1,jjp1) , - 2 cuvscvgam1(iip1,jjm),cuvscvgam2(iip1,jjm),cvuscugam1(iip1,jjp1), - 3 cvuscugam2(iip1,jjp1),cvscuvgam(iip1,jjm),cuscvugam(iip1,jjp1) , - 4 unsapolnga1,unsapolnga2,unsapolsga1,unsapolsga2 , - 5 unsair_gam1(iip1,jjp1),unsair_gam2(iip1,jjp1) , - 6 unsairz_gam(iip1,jjm),aivscu2gam(iip1,jjm),aiuscv2gam(iip1,jjm) - 7 , xprimu(iip1),xprimv(iip1) +!CDK comgeom2 + COMMON/comgeom/ & + & cu(iip1,jjp1),cv(iip1,jjm),unscu2(iip1,jjp1),unscv2(iip1,jjm) , & + & aire(iip1,jjp1),airesurg(iip1,jjp1),aireu(iip1,jjp1) , & + & airev(iip1,jjm),unsaire(iip1,jjp1),apoln,apols , & + & unsairez(iip1,jjm),airuscv2(iip1,jjm),airvscu2(iip1,jjm) , & + & aireij1(iip1,jjp1),aireij2(iip1,jjp1),aireij3(iip1,jjp1) , & + & aireij4(iip1,jjp1),alpha1(iip1,jjp1),alpha2(iip1,jjp1) , & + & alpha3(iip1,jjp1),alpha4(iip1,jjp1),alpha1p2(iip1,jjp1) , & + & alpha1p4(iip1,jjp1),alpha2p3(iip1,jjp1),alpha3p4(iip1,jjp1) , & + & fext(iip1,jjm),constang(iip1,jjp1), rlatu(jjp1),rlatv(jjm), & + & rlonu(iip1),rlonv(iip1),cuvsurcv(iip1,jjm),cvsurcuv(iip1,jjm) , & + & cvusurcu(iip1,jjp1),cusurcvu(iip1,jjp1) , & + & cuvscvgam1(iip1,jjm),cuvscvgam2(iip1,jjm),cvuscugam1(iip1,jjp1), & + & cvuscugam2(iip1,jjp1),cvscuvgam(iip1,jjm),cuscvugam(iip1,jjp1) , & + & unsapolnga1,unsapolnga2,unsapolsga1,unsapolsga2 , & + & unsair_gam1(iip1,jjp1),unsair_gam2(iip1,jjp1) , & + & unsairz_gam(iip1,jjm),aivscu2gam(iip1,jjm),aiuscv2gam(iip1,jjm) & + & , xprimu(iip1),xprimv(iip1) -c - REAL - 1 cu,cv,unscu2,unscv2,aire,airesurg,aireu,airev,apoln,apols,unsaire - 2 ,unsairez,airuscv2,airvscu2,aireij1,aireij2,aireij3,aireij4 , - 3 alpha1,alpha2,alpha3,alpha4,alpha1p2,alpha1p4,alpha2p3,alpha3p4 , - 4 fext,constang,rlatu,rlatv,rlonu,rlonv,cuvscvgam1,cuvscvgam2 , - 5 cvuscugam1,cvuscugam2,cvscuvgam,cuscvugam,unsapolnga1 , - 6 unsapolnga2,unsapolsga1,unsapolsga2,unsair_gam1,unsair_gam2 , - 7 unsairz_gam,aivscu2gam,aiuscv2gam,cuvsurcv,cvsurcuv,cvusurcu , - 8 cusurcvu,xprimu,xprimv -c + + REAL & + & cu,cv,unscu2,unscv2,aire,airesurg,aireu,airev,apoln,apols,unsaire & + & ,unsairez,airuscv2,airvscu2,aireij1,aireij2,aireij3,aireij4 , & + & alpha1,alpha2,alpha3,alpha4,alpha1p2,alpha1p4,alpha2p3,alpha3p4 , & + & fext,constang,rlatu,rlatv,rlonu,rlonv,cuvscvgam1,cuvscvgam2 , & + & cvuscugam1,cvuscugam2,cvscuvgam,cuscvugam,unsapolnga1 , & + & unsapolnga2,unsapolsga1,unsapolsga2,unsair_gam1,unsair_gam2 , & + & unsairz_gam,aivscu2gam,aiuscv2gam,cuvsurcv,cvsurcuv,cvusurcu , & + & cusurcvu,xprimu,xprimv Index: LMDZ4/trunk/libf/dyn3dpar/comconst.h =================================================================== --- LMDZ4/trunk/libf/dyn3dpar/comconst.h (revision 1106) +++ LMDZ4/trunk/libf/dyn3dpar/comconst.h (revision 1107) @@ -2,10 +2,10 @@ ! $Header$ ! -c----------------------------------------------------------------------- -c INCLUDE comconst.h +!----------------------------------------------------------------------- +! INCLUDE comconst.h - COMMON/comconst/im,jm,lllm,imp1,jmp1,lllmm1,lllmp1,lcl, - * dtvr,daysec, - * pi,dtphys,dtdiss,rad,r,cpp,kappa,cotot,unsim,g,omeg + COMMON/comconst/im,jm,lllm,imp1,jmp1,lllmm1,lllmp1,lcl, & + & dtvr,daysec, & + & pi,dtphys,dtdiss,rad,r,cpp,kappa,cotot,unsim,g,omeg INTEGER im,jm,lllm,imp1,jmp1,lllmm1,lllmp1,lcl @@ -14,3 +14,3 @@ REAL cotot,unsim,g,omeg -c----------------------------------------------------------------------- +!----------------------------------------------------------------------- Index: LMDZ4/trunk/libf/dyn3dpar/comgeom2.h =================================================================== --- LMDZ4/trunk/libf/dyn3dpar/comgeom2.h (revision 1106) +++ LMDZ4/trunk/libf/dyn3dpar/comgeom2.h (revision 1107) @@ -2,33 +2,32 @@ ! $Header$ ! -*CDK comgeom2 - COMMON/comgeom/ - 1 cu(iip1,jjp1),cv(iip1,jjm),unscu2(iip1,jjp1),unscv2(iip1,jjm) , - 2 aire(iip1,jjp1),airesurg(iip1,jjp1),aireu(iip1,jjp1) , - 3 airev(iip1,jjm),unsaire(iip1,jjp1),apoln,apols , - 4 unsairez(iip1,jjm),airuscv2(iip1,jjm),airvscu2(iip1,jjm) , - 5 aireij1(iip1,jjp1),aireij2(iip1,jjp1),aireij3(iip1,jjp1) , - 6 aireij4(iip1,jjp1),alpha1(iip1,jjp1),alpha2(iip1,jjp1) , - 7 alpha3(iip1,jjp1),alpha4(iip1,jjp1),alpha1p2(iip1,jjp1) , - 8 alpha1p4(iip1,jjp1),alpha2p3(iip1,jjp1),alpha3p4(iip1,jjp1) , - 9 fext(iip1,jjm),constang(iip1,jjp1), rlatu(jjp1),rlatv(jjm), - 1 rlonu(iip1),rlonv(iip1),cuvsurcv(iip1,jjm),cvsurcuv(iip1,jjm) , - 1 cvusurcu(iip1,jjp1),cusurcvu(iip1,jjp1) , - 2 cuvscvgam1(iip1,jjm),cuvscvgam2(iip1,jjm),cvuscugam1(iip1,jjp1), - 3 cvuscugam2(iip1,jjp1),cvscuvgam(iip1,jjm),cuscvugam(iip1,jjp1) , - 4 unsapolnga1,unsapolnga2,unsapolsga1,unsapolsga2 , - 5 unsair_gam1(iip1,jjp1),unsair_gam2(iip1,jjp1) , - 6 unsairz_gam(iip1,jjm),aivscu2gam(iip1,jjm),aiuscv2gam(iip1,jjm) - 7 , xprimu(iip1),xprimv(iip1) +!CDK comgeom2 + COMMON/comgeom/ & + & cu(iip1,jjp1),cv(iip1,jjm),unscu2(iip1,jjp1),unscv2(iip1,jjm) , & + & aire(iip1,jjp1),airesurg(iip1,jjp1),aireu(iip1,jjp1) , & + & airev(iip1,jjm),unsaire(iip1,jjp1),apoln,apols , & + & unsairez(iip1,jjm),airuscv2(iip1,jjm),airvscu2(iip1,jjm) , & + & aireij1(iip1,jjp1),aireij2(iip1,jjp1),aireij3(iip1,jjp1) , & + & aireij4(iip1,jjp1),alpha1(iip1,jjp1),alpha2(iip1,jjp1) , & + & alpha3(iip1,jjp1),alpha4(iip1,jjp1),alpha1p2(iip1,jjp1) , & + & alpha1p4(iip1,jjp1),alpha2p3(iip1,jjp1),alpha3p4(iip1,jjp1) , & + & fext(iip1,jjm),constang(iip1,jjp1), rlatu(jjp1),rlatv(jjm), & + & rlonu(iip1),rlonv(iip1),cuvsurcv(iip1,jjm),cvsurcuv(iip1,jjm) , & + & cvusurcu(iip1,jjp1),cusurcvu(iip1,jjp1) , & + & cuvscvgam1(iip1,jjm),cuvscvgam2(iip1,jjm),cvuscugam1(iip1,jjp1), & + & cvuscugam2(iip1,jjp1),cvscuvgam(iip1,jjm),cuscvugam(iip1,jjp1) , & + & unsapolnga1,unsapolnga2,unsapolsga1,unsapolsga2 , & + & unsair_gam1(iip1,jjp1),unsair_gam2(iip1,jjp1) , & + & unsairz_gam(iip1,jjm),aivscu2gam(iip1,jjm),aiuscv2gam(iip1,jjm) & + & , xprimu(iip1),xprimv(iip1) -c - REAL - 1 cu,cv,unscu2,unscv2,aire,airesurg,aireu,airev,apoln,apols,unsaire - 2 ,unsairez,airuscv2,airvscu2,aireij1,aireij2,aireij3,aireij4 , - 3 alpha1,alpha2,alpha3,alpha4,alpha1p2,alpha1p4,alpha2p3,alpha3p4 , - 4 fext,constang,rlatu,rlatv,rlonu,rlonv,cuvscvgam1,cuvscvgam2 , - 5 cvuscugam1,cvuscugam2,cvscuvgam,cuscvugam,unsapolnga1 , - 6 unsapolnga2,unsapolsga1,unsapolsga2,unsair_gam1,unsair_gam2 , - 7 unsairz_gam,aivscu2gam,aiuscv2gam,cuvsurcv,cvsurcuv,cvusurcu , - 8 cusurcvu,xprimu,xprimv -c + + REAL & + & cu,cv,unscu2,unscv2,aire,airesurg,aireu,airev,apoln,apols,unsaire & + & ,unsairez,airuscv2,airvscu2,aireij1,aireij2,aireij3,aireij4 , & + & alpha1,alpha2,alpha3,alpha4,alpha1p2,alpha1p4,alpha2p3,alpha3p4 , & + & fext,constang,rlatu,rlatv,rlonu,rlonv,cuvscvgam1,cuvscvgam2 , & + & cvuscugam1,cvuscugam2,cvscuvgam,cuscvugam,unsapolnga1 , & + & unsapolnga2,unsapolsga1,unsapolsga2,unsair_gam1,unsair_gam2 , & + & unsairz_gam,aivscu2gam,aiuscv2gam,cuvsurcv,cvsurcuv,cvusurcu , & + & cusurcvu,xprimu,xprimv Index: LMDZ4/trunk/libf/phylmd/calcul_fluxs_mod.F90 =================================================================== --- LMDZ4/trunk/libf/phylmd/calcul_fluxs_mod.F90 (revision 1106) +++ LMDZ4/trunk/libf/phylmd/calcul_fluxs_mod.F90 (revision 1107) @@ -99,5 +99,4 @@ WRITE(*,*)' radsol (min, max)', & MINVAL(radsol(1:knon)), MAXVAL(radsol(1:knon)) - CALL flush(6) ENDIF Index: LMDZ4/trunk/libf/phylmd/oasis.F90 =================================================================== --- LMDZ4/trunk/libf/phylmd/oasis.F90 (revision 1106) +++ LMDZ4/trunk/libf/phylmd/oasis.F90 (revision 1107) @@ -284,5 +284,4 @@ WRITE (nuout,*) 'Fromcpl: Reading fields from CPL, ktime=',ktime WRITE (nuout,*) ' ' - CALL flush (nuout) istart=ii_begin Index: LMDZ4/trunk/libf/phylmd/radiation_AR4.F =================================================================== --- LMDZ4/trunk/libf/phylmd/radiation_AR4.F (revision 1106) +++ LMDZ4/trunk/libf/phylmd/radiation_AR4.F (revision 1107) @@ -2123,9 +2123,7 @@ 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,6 +2896,5 @@ 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,6 +2927,5 @@ 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))) Index: LMDZ4/trunk/libf/phylmd/screenp.F90 =================================================================== --- LMDZ4/trunk/libf/phylmd/screenp.F90 (revision 1106) +++ LMDZ4/trunk/libf/phylmd/screenp.F90 (revision 1107) @@ -64,11 +64,11 @@ 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)