Changeset 4100 for LMDZ6/trunk


Ignore:
Timestamp:
Mar 15, 2022, 2:20:31 PM (2 years ago)
Author:
oboucher
Message:

Tidying up and adding ok_guide to output

Location:
LMDZ6/trunk/libf
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • LMDZ6/trunk/libf/dyn3d/conf_gcm.F90

    r4055 r4100  
    116116  CALL getin('calend', calend)
    117117! initialize year_len for aquaplanets and 1D
    118       if (calend == 'earth_360d') then
    119         year_len=360
    120       else if (calend == 'earth_365d') then
    121         year_len=365
    122       else if (calend == 'earth_366d') then
    123         year_len=366
    124       else
    125         year_len=1
    126       endif
     118  IF (calend == 'earth_360d') THEN
     119     year_len=360
     120  ELSE IF (calend == 'earth_365d') THEN
     121     year_len=365
     122  ELSE IF (calend == 'earth_366d') THEN
     123     year_len=366
     124  ELSE
     125     year_len=1
     126  ENDIF
    127127
    128128  !Config  Key  = dayref
    … …  
    315315  CALL getin('ngroup',ngroup)
    316316
    317 
    318317  ! top_bound sponge: only active if ok_strato=.true. and iflag_top_bound!=0
    319318  !                   iflag_top_bound=0 for no sponge
    … …  
    322321  iflag_top_bound=1
    323322  CALL getin('iflag_top_bound',iflag_top_bound)
    324   if (iflag_top_bound < 0 .or. iflag_top_bound > 2) &
     323  IF (iflag_top_bound < 0 .or. iflag_top_bound > 2) &
    325324       call abort_gcm("conf_gcm", 'iflag_top_bound must be 0, 1 or 2', 1)
    326325
    … …  
    396395  !     .........   (  modif  le 17/04/96 )   .........
    397396
    398   test_etatinit: IF (.not. etatinit) then
     397  test_etatinit: IF (.not. etatinit) THEN
    399398     !Config  Key  = clon
    400399     !Config  Desc = centre du zoom, longitude
    … …  
    677676     write(lunout,*)' ok_dyn_ins = ', ok_dyn_ins
    678677     write(lunout,*)' ok_dyn_ave = ', ok_dyn_ave
    679   else
     678  ELSE
    680679     !Config  Key  = clon
    681680     !Config  Desc = centre du zoom, longitude
    … …  
    877876
    878877     write(lunout,*)' #########################################'
    879      write(lunout,*)' Configuration des parametres de cel0' &
    880           //'_limit: '
     878     write(lunout,*)' Configuration des parametres de cel0_limit: '
    881879     write(lunout,*)' planet_type = ', planet_type
    882880     write(lunout,*)' calend = ', calend
    … …  
    922920     write(lunout,*)' ok_limit = ', ok_limit
    923921     write(lunout,*)' ok_etat0 = ', ok_etat0
     922     write(lunout,*)' ok_guide = ', ok_guide
    924923     write(lunout,*)' read_orop = ', read_orop
    925   end IF test_etatinit
     924  ENDIF test_etatinit
    926925
    927926END SUBROUTINE conf_gcm

  • LMDZ6/trunk/libf/dyn3dmem/conf_gcm.F90

    r4055 r4100  
    66  USE control_mod
    77#ifdef CPP_IOIPSL
    8   use IOIPSL
     8  USE IOIPSL
    99#else
    1010  ! if not using IOIPSL, we still need to use (a local version of) getin
    11   use ioipsl_getincom
     11  USE ioipsl_getincom
    1212#endif
    13   use misc_mod
    14   use mod_filtre_fft, ONLY : use_filtre_fft
    15   use mod_filtre_fft_loc, ONLY : use_filtre_fft_loc=>use_filtre_fft
    16   use mod_hallo, ONLY : use_mpi_alloc
    17   USE infotrac, ONLY : type_trac
    18   use assert_m, only: assert
     13  USE misc_mod
     14  USE mod_filtre_fft, ONLY: use_filtre_fft
     15  USE mod_filtre_fft_loc, ONLY: use_filtre_fft_loc=>use_filtre_fft
     16  USE mod_hallo, ONLY: use_mpi_alloc
     17  USE infotrac, ONLY: type_trac
     18  USE assert_m, ONLY: assert
    1919  USE comconst_mod, ONLY: dissip_deltaz, dissip_factz, dissip_zref, &
    2020                          iflag_top_bound, mode_top_bound, tau_top_bound, &
    … …  
    5555  LOGICAL  fxyhypbb, ysinuss
    5656  INTEGER i
    57   character(len=*),parameter :: modname="conf_gcm"
    58   character (len=80) :: abort_message
     57  CHARACTER(len=*), PARAMETER :: modname="conf_gcm"
     58  CHARACTER(len=80) :: abort_message
    5959#ifdef CPP_OMP
    60   integer,external :: OMP_GET_NUM_THREADS
     60  INTEGER, EXTERNAL :: OMP_GET_NUM_THREADS
    6161#endif
    6262
    … …  
    102102
    103103  adjust=.false.
    104   call getin('adjust',adjust)
     104  CALL getin('adjust',adjust)
    105105
    106106#ifdef CPP_OMP
    107107  ! adjust=y not implemented in case of OpenMP threads...
    108108  !$OMP PARALLEL
    109   if ((OMP_GET_NUM_THREADS()>1).and.adjust) then
     109  IF ((OMP_GET_NUM_THREADS()>1).and.adjust) then
    110110     write(lunout,*)'conf_gcm: Error, adjust should be set to n' &
    111111          ,' when running with OpenMP threads'
    112112     abort_message = 'Wrong value for adjust'
    113      call abort_gcm(modname,abort_message,1)
    114   endif
     113     CALL abort_gcm(modname,abort_message,1)
     114  ENDIF
    115115  !$OMP END PARALLEL         
    116116#endif
    117117
    118118  itaumax=0
    119   call getin('itaumax',itaumax);
    120   if (itaumax<=0) itaumax=HUGE(itaumax)
     119  CALL getin('itaumax',itaumax);
     120  IF (itaumax<=0) itaumax=HUGE(itaumax)
    121121
    122122  !Config  Key  = prt_level
    … …  
    146146! initialize year_len for aquaplanets and 1D
    147147  CALL getin('calend', calend)
    148      if (calend == 'earth_360d') then
    149         year_len=360
    150       else if (calend == 'earth_365d') then
    151         year_len=365
    152       else if (calend == 'earth_366d') then
    153         year_len=366
    154       else
    155         year_len=1
    156       endif
    157  
     148  IF (calend == 'earth_360d') THEN
     149    year_len=360
     150  ELSE IF (calend == 'earth_365d') THEN
     151    year_len=365
     152  ELSE IF (calend == 'earth_366d') THEN
     153    year_len=366
     154  ELSE
     155    year_len=1
     156  ENDIF
    158157
    159158  !Config  Key  = dayref
    … …  
    345344  ngroup=3
    346345  CALL getin('ngroup',ngroup)
    347   if (mod(iim, 2**ngroup) /= 0) &
     346  IF (mod(iim, 2**ngroup) /= 0) &
    348347       call abort_gcm("conf_gcm", 'iim must be multiple of 2**ngroup', 1)
    349   if (2**ngroup > jjm + 1) &
     348  IF (2**ngroup > jjm + 1) &
    350349       call abort_gcm("conf_gcm", '2**ngroup must be <= jjm + 1', 1)
    351350
    … …  
    357356  iflag_top_bound=1
    358357  CALL getin('iflag_top_bound',iflag_top_bound)
    359   if (iflag_top_bound < 0 .or. iflag_top_bound > 2) &
     358  IF (iflag_top_bound < 0 .or. iflag_top_bound > 2) &
    360359       call abort_gcm("conf_gcm", 'iflag_top_bound must be 0, 1 or 2', 1)
    361360
    … …  
    394393  CALL getin('ok_guide',ok_guide)
    395394
    396   if (ok_guide .and. adjust) call abort_gcm("conf_gcm", &
     395  IF (ok_guide .and. adjust) call abort_gcm("conf_gcm", &
    397396       "adjust does not work with ok_guide", 1)
    398397
    … …  
    634633        WRITE(lunout,*)  &
    635634             'only the file phystoke.nc will still be created '
    636      END IF
     635     ENDIF
    637636
    638637     !Config  Key  = type_trac
    … …  
    756755
    757756     IF( grossismx.LT.1. )  THEN
    758         write(lunout,*) &
    759              'conf_gcm: ***  ATTENTION !! grossismx < 1 .   *** '
     757        write(lunout,*) 'conf_gcm: ***ATTENTION !! grossismx < 1 . *** '
    760758        STOP
    761759     ELSE
    … …  
    770768     ENDIF
    771769
    772      write(lunout,*)'conf_gcm: alphax alphay ',alphax,alphay
     770     write(lunout,*) 'conf_gcm: alphax alphay ',alphax,alphay
    773771
    774772     !    alphax et alphay sont les anciennes formulat. des grossissements
    … …  
    837835        WRITE(lunout,*)  &
    838836             'only the file phystoke.nc will still be created '
    839      END IF
     837     ENDIF
    840838
    841839     !Config  Key  = type_trac
    … …  
    955953
    956954     write(lunout,*)' #########################################'
    957      write(lunout,*)' Configuration des parametres de cel0' &
    958           //'_limit: '
     955     write(lunout,*)' Configuration des parametres de cel0_limit: '
    959956     write(lunout,*)' planet_type = ', planet_type
    960957     write(lunout,*)' calend = ', calend
    … …  
    1002999     write(lunout,*)' ok_limit = ', ok_limit
    10031000     write(lunout,*)' ok_etat0 = ', ok_etat0
     1001     write(lunout,*)' ok_guide = ', ok_guide
    10041002     write(lunout,*)' read_orop = ', read_orop
    1005   end IF test_etatinit
     1003  ENDIF test_etatinit
    10061004
    10071005END SUBROUTINE conf_gcm
Note: See TracChangeset for help on using the changeset viewer.