Changeset 1490


Ignore:
Timestamp:
Feb 18, 2011, 11:29:11 AM (13 years ago)
Author:
Ehouarn Millour
Message:

Some minor cosmetic improvements (note that a "STOP" should only be followed by an integer; xlf actually considers having a string after a "stop" as a syntax error for a free form input file, and fails to compile).
EM

Location:
LMDZ5/branches/LMDZ5V2.0-dev/libf
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • LMDZ5/branches/LMDZ5V2.0-dev/libf/dyn3d/inidissip.F90

    r1489 r1490  
    1111  !   -------------
    1212
    13   USE control_mod
     13  USE control_mod, only : idissip,iperiod
    1414
    1515  IMPLICIT NONE
    … …  
    2020  include "comvert.h"
    2121  include "logic.h"
    22 
    23   LOGICAL lstardis
    24   INTEGER nitergdiv,nitergrot,niterh
    25   REAL    tetagdiv,tetagrot,tetatemp
     22  include "iniprint.h"
     23
     24  LOGICAL,INTENT(in) :: lstardis
     25  INTEGER,INTENT(in) :: nitergdiv,nitergrot,niterh
     26  REAL,INTENT(in) :: tetagdiv,tetagrot,tetatemp
     27
     28! Local variables:
    2629  REAL fact,zvert(llm),zz
    2730  REAL zh(ip1jmp1),zu(ip1jmp1),zv(ip1jm),deltap(ip1jmp1,llm)
    … …  
    3235  REAL tetamin
    3336  REAL pseudoz
     37  character (len=80) :: abort_message
    3438
    3539  REAL ran1
    … …  
    6670
    6771  IF ( zhmin .GE. zhmax  )     THEN
    68      PRINT*,'  Inidissip  zh min max  ',zhmin,zhmax
    69      STOP'probleme generateur alleatoire dans inidissip'
     72     write(lunout,*)'  Inidissip  zh min max  ',zhmin,zhmax
     73     abort_message='probleme generateur alleatoire dans inidissip'
     74     call abort_gcm('inidissip',abort_message,1)
    7075  ENDIF
    7176
    … …  
    95100  !   calcul des valeurs propres de gradiv (ii =1) et  nxgrarot(ii=2)
    96101  !   -----------------------------------------------------------------
    97   print*,'calcul des valeurs propres'
     102  write(lunout,*)'inidissip: calcul des valeurs propres'
    98103
    99104  DO    ii = 1, 2
    … …  
    168173  fact    = rad*24./REAL(jjm)
    169174  fact    = fact*fact
    170   PRINT*,'coef u ', fact/cdivu, 1./cdivu
    171   PRINT*,'coef r ', fact/crot , 1./crot
    172   PRINT*,'coef h ', fact/cdivh, 1./cdivh
     175  write(lunout,*)'inidissip: coef u ', fact/cdivu, 1./cdivu
     176  write(lunout,*)'inidissip: coef r ', fact/crot , 1./crot
     177  write(lunout,*)'inidissip: coef h ', fact/cdivh, 1./cdivh
    173178  !     ENDIF
    174179
    … …  
    196201
    197202
    198   PRINT*,'Constantes de temps de la diffusion horizontale'
     203  write(lunout,*)'inidissip: Constantes de temps de la diffusion horizontale'
    199204
    200205  tetamin =  1.e+6
    … …  
    210215  ENDDO
    211216
    212   PRINT *,' INIDI tetamin dtvr ',tetamin,dtvr,iperiod
     217  write(lunout,*)'inidissip: tetamin dtvr iperiod ',tetamin,dtvr,iperiod
    213218  idissip = INT( tetamin/( 2.*dtvr*iperiod) ) * iperiod
    214   PRINT *,' INIDI tetamin idissip ',tetamin,idissip
     219  write(lunout,*)'inidissip: tetamin idissip ',tetamin,idissip
    215220  idissip = MAX(iperiod,idissip)
    216221  dtdiss  = idissip * dtvr
    217   PRINT *,' INIDI idissip dtdiss ',idissip,dtdiss
     222  write(lunout,*)'inidissip: idissip dtdiss ',idissip,dtdiss
    218223
    219224  DO l = 1,llm
    220      PRINT*,zvert(l),dtdiss*tetaudiv(l),dtdiss*tetaurot(l), &
     225     write(lunout,*)zvert(l),dtdiss*tetaudiv(l),dtdiss*tetaurot(l), &
    221226          dtdiss*tetah(l)
    222227  ENDDO

  • LMDZ5/branches/LMDZ5V2.0-dev/libf/dyn3dpar/inidissip.F90

    r1489 r1490  
    1111  !   -------------
    1212
    13   USE control_mod
     13  USE control_mod, only : idissip,iperiod
    1414
    1515  IMPLICIT NONE
    … …  
    2020  include "comvert.h"
    2121  include "logic.h"
    22 
    23   LOGICAL lstardis
    24   INTEGER nitergdiv,nitergrot,niterh
    25   REAL    tetagdiv,tetagrot,tetatemp
     22  include "iniprint.h"
     23
     24  LOGICAL,INTENT(in) :: lstardis
     25  INTEGER,INTENT(in) :: nitergdiv,nitergrot,niterh
     26  REAL,INTENT(in) :: tetagdiv,tetagrot,tetatemp
     27
     28! Local variables:
    2629  REAL fact,zvert(llm),zz
    2730  REAL zh(ip1jmp1),zu(ip1jmp1),zv(ip1jm),deltap(ip1jmp1,llm)
    … …  
    3235  REAL tetamin
    3336  REAL pseudoz
     37  character (len=80) :: abort_message
    3438
    3539  REAL ran1
    … …  
    6670
    6771  IF ( zhmin .GE. zhmax  )     THEN
    68      PRINT*,'  Inidissip  zh min max  ',zhmin,zhmax
    69      STOP'probleme generateur alleatoire dans inidissip'
     72     write(lunout,*)'  Inidissip  zh min max  ',zhmin,zhmax
     73     abort_message='probleme generateur alleatoire dans inidissip'
     74     call abort_gcm('inidissip',abort_message,1)
    7075  ENDIF
    7176
    … …  
    95100  !   calcul des valeurs propres de gradiv (ii =1) et  nxgrarot(ii=2)
    96101  !   -----------------------------------------------------------------
    97   print*,'calcul des valeurs propres'
     102  write(lunout,*)'inidissip: calcul des valeurs propres'
    98103
    99104  DO    ii = 1, 2
    … …  
    168173  fact    = rad*24./REAL(jjm)
    169174  fact    = fact*fact
    170   PRINT*,'coef u ', fact/cdivu, 1./cdivu
    171   PRINT*,'coef r ', fact/crot , 1./crot
    172   PRINT*,'coef h ', fact/cdivh, 1./cdivh
     175  write(lunout,*)'inidissip: coef u ', fact/cdivu, 1./cdivu
     176  write(lunout,*)'inidissip: coef r ', fact/crot , 1./crot
     177  write(lunout,*)'inidissip: coef h ', fact/cdivh, 1./cdivh
    173178  !     ENDIF
    174179
    … …  
    196201
    197202
    198   PRINT*,'Constantes de temps de la diffusion horizontale'
     203  write(lunout,*)'inidissip: Constantes de temps de la diffusion horizontale'
    199204
    200205  tetamin =  1.e+6
    … …  
    210215  ENDDO
    211216
    212   PRINT *,' INIDI tetamin dtvr ',tetamin,dtvr,iperiod
     217  write(lunout,*)'inidissip: tetamin dtvr iperiod ',tetamin,dtvr,iperiod
    213218  idissip = INT( tetamin/( 2.*dtvr*iperiod) ) * iperiod
    214   PRINT *,' INIDI tetamin idissip ',tetamin,idissip
     219  write(lunout,*)'inidissip: tetamin idissip ',tetamin,idissip
    215220  idissip = MAX(iperiod,idissip)
    216221  dtdiss  = idissip * dtvr
    217   PRINT *,' INIDI idissip dtdiss ',idissip,dtdiss
     222  write(lunout,*)'inidissip: idissip dtdiss ',idissip,dtdiss
    218223
    219224  DO l = 1,llm
    220      PRINT*,zvert(l),dtdiss*tetaudiv(l),dtdiss*tetaurot(l), &
     225     write(lunout,*)zvert(l),dtdiss*tetaudiv(l),dtdiss*tetaurot(l), &
    221226          dtdiss*tetah(l)
    222227  ENDDO
Note: See TracChangeset for help on using the changeset viewer.