Changeset 5324 for LMDZ6/trunk/libf


Ignore:
Timestamp:
Nov 12, 2024, 4:31:36 PM (5 weeks ago)
Author:
abarral
Message:

[WIP] Remove uses of DEBUGIO cpp key (deprecated)

Location:
LMDZ6/trunk/libf
Files:
13 edited

Legend:

Unmodified
Added
Removed

  • LMDZ6/trunk/libf/dyn3d/advtrac.f90

    r5323 r5324  
    1515   USE control_mod,  ONLY: iapp_tracvl, day_step
    1616   USE comconst_mod, ONLY: dtvr
    17    USE lmdz_cppkeys_wrapper, ONLY: CPPKEY_DEBUGIO
    1817   USE strings_mod, ONLY: int2str
    1918   USE dimensions_mod, ONLY: iim, jjm, llm, ndm
    … …  
    200199   !---------------------------------------------------------------------------
    201200   CALL massbar(massem,massebx,masseby)
    202 
    203 IF (CPPKEY_DEBUGIO) THEN
    204    CALL WriteField_u('massem',massem)
    205    CALL WriteField_u('wg',wg)
    206    CALL WriteField_u('pbarug',pbarug)
    207    CALL WriteField_v('pbarvg',pbarvg)
    208    CALL WriteField_u('p_tmp',p)
    209    CALL WriteField_u('pk_tmp',pk)
    210    CALL WriteField_u('teta_tmp',teta)
    211    DO iq=1,nqtot
    212       CALL WriteField_u('q_adv'//trim(int2str(iq)),q(:,:,iq))
    213    END DO
    214 END IF
    215201
    216202   IF(isoCheck) WRITE(*,*) 'advtrac 227'

  • LMDZ6/trunk/libf/dyn3dmem/advect_new_loc.f90

    r5285 r5324  
    1010  USE comconst_mod, ONLY: daysec
    1111  USE logic_mod, ONLY: conser
    12   USE lmdz_cppkeys_wrapper, ONLY: CPPKEY_DEBUGIO
    1312  USE dimensions_mod, ONLY: iim, jjm, llm, ndm
    1413  USE paramet_mod_h
    … …  
    249248  if (pole_nord) ijb=ijb+iip1
    250249  if (pole_sud)  ije=ije-iip1
    251 IF (CPPKEY_DEBUGIO) THEN
    252    CALL WriteField_u('du_bis',du)
    253 END IF
    254250!$OMP DO SCHEDULE(STATIC,OMP_CHUNK)
    255251  DO l=1,llm
    … …  
    263259  ENDDO
    264260!$OMP END DO NOWAIT
    265 IF (CPPKEY_DEBUGIO) THEN
    266   CALL WriteField_u('du1',du1)
    267   CALL WriteField_u('du2',du2)
    268   CALL WriteField_u('du_bis',du)
    269 END IF
    270261  ijb=ij_begin
    271262  ije=ij_end

  • LMDZ6/trunk/libf/dyn3dmem/advtrac_loc.f90

    r5285 r5324  
    2121   USE times
    2222   USE advtrac_mod, ONLY: finmasse
    23    USE lmdz_cppkeys_wrapper, ONLY: CPPKEY_DEBUGIO
    2423   USE strings_mod, ONLY: int2str
    2524   USE dimensions_mod, ONLY: iim, jjm, llm, ndm
    … …  
    109108!ym   ----> Reverifier lors de la parallelisation des autres schemas
    110109
    111 IF (CPPKEY_DEBUGIO) THEN
    112    CALL WriteField_u('massem',massem)
    113    CALL WriteField_u('wg',wg)
    114    CALL WriteField_u('pbarug',pbarug)
    115    CALL WriteField_v('pbarvg',pbarvg)
    116    CALL WriteField_u('p_tmp',p)
    117    CALL WriteField_u('pk_tmp',pk)
    118    CALL WriteField_u('teta_tmp',teta)
    119    DO iq=1,nqtot
    120       CALL WriteField_u('q_adv'//trim(int2str(iq)),q(:,:,iq))
    121    END DO
    122 END IF
    123 
    124110!         
    125111!  CALL Register_Hallo_v(pbarvg,llm,1,1,1,1,TestRequest)
    … …  
    131117!  WRITE(*,*) 'advtrac 157: appel de vlspltgen_loc'
    132118   CALL vlspltgen_loc(q, 2., massem, wg, pbarug, pbarvg, dtvr, p, pk, teta )
    133 
    134 IF (CPPKEY_DEBUGIO) THEN
    135    DO iq = 1, nqtot
    136       CALL WriteField_u('q_adv'//trim(int2str(iq)),q(:,:,iq))
    137    END DO
    138 END IF
    139119         
    140120   GOTO 1234     

  • LMDZ6/trunk/libf/dyn3dmem/caladvtrac_loc.f90

    r5285 r5324  
    1616  USE Vampir
    1717  USE write_field_loc
    18   USE lmdz_cppkeys_wrapper, ONLY: CPPKEY_DEBUGIO
    1918  USE dimensions_mod, ONLY: iim, jjm, llm, ndm
    2019USE paramet_mod_h
    … …  
    133132!$OMP ENDDO NOWAIT
    134133
    135 IF (CPPKEY_DEBUGIO) THEN
    136      CALL WriteField_u('pbarug1',pbarug)
    137      CALL WriteField_v('pbarvg1',pbarvg)
    138      CALL WriteField_u('wg1',wg)
    139 END IF
    140 
    141134!$OMP BARRIER
    142135
    … …  
    179172   ! CALL WriteField_u('',)
    180173
    181 
    182 IF (CPPKEY_DEBUGIO) THEN
    183      CALL WriteField_u('pbarug1',pbarug_adv)
    184      CALL WriteField_v('pbarvg1',pbarvg_adv)
    185      CALL WriteField_u('wg1',wg_adv)
    186 END IF
    187174  ! !write(*,*) 'caladvtrac 185'
    188175  CALL advtrac_loc( pbarug_adv,pbarvg_adv,wg_adv, &

  • LMDZ6/trunk/libf/dyn3dmem/caldyn_loc.f90

    r5285 r5324  
    88        vorpot, ecin, bern, massebxy, convm
    99  USE comvert_mod, ONLY: ap, bp
    10   USE lmdz_cppkeys_wrapper, ONLY: CPPKEY_DEBUGIO
    1110  USE dimensions_mod, ONLY: iim, jjm, llm, ndm
    1211USE paramet_mod_h
    … …  
    8685  CALL convmas2_loc  (   convm                      )
    8786!$OMP BARRIER
    88 IF (CPPKEY_DEBUGIO) THEN
    89   call WriteField_u('ucont',ucont)
    90   call WriteField_v('vcont',vcont)
    91   call WriteField_u('p',p)
    92   call WriteField_u('masse',masse)
    93   call WriteField_u('massebx',massebx)
    94   call WriteField_v('masseby',masseby)
    95   call WriteField_v('massebxy',massebxy)
    96   call WriteField_u('pbaru',pbaru)
    97   call WriteField_v('pbarv',pbarv)
    98   call WriteField_u('dteta',dteta)
    99   call WriteField_u('convm',convm)
    100 END IF
    10187
    10288!$OMP BARRIER
    … …  
    118104  CALL dudv1_loc   ( vorpot , pbaru , pbarv     , du     , dv  )
    119105
    120 IF (CPPKEY_DEBUGIO) THEN
    121   call WriteField_u('w',w)
    122   call WriteField_v('vorpot',vorpot)
    123   call WriteField_u('du',du)
    124   call WriteField_v('dv',dv)
    125 END IF
    126 
    127106  ! ! compute kinetic energy ecin()
    128107  CALL enercin_loc ( vcov   , ucov  , vcont   , ucont  , ecin  )
    … …  
    131110  ! ! compute and add du() and dv() contributions from Bernouilli and pressure
    132111  CALL dudv2_loc   ( teta   , pkf   , bern      , du     , dv  )
    133 
    134 IF (CPPKEY_DEBUGIO) THEN
    135   call WriteField_u('ecin',ecin)
    136   call WriteField_u('bern',bern)
    137   call WriteField_u('du',du)
    138   call WriteField_v('dv',dv)
    139   call WriteField_u('pkf',pkf)
    140 END IF
    141112
    142113  ijb=ij_begin-iip1

  • LMDZ6/trunk/libf/dyn3dmem/call_calfis_mod.f90

    r5285 r5324  
    9090  USE comvert_mod, ONLY: ap, bp, pressure_exner
    9191  USE temps_mod, ONLY: day_ini, day_ref, jd_ref, jh_ref, start_time
    92   USE lmdz_cppkeys_wrapper, ONLY: CPPKEY_PHYS, CPPKEY_DEBUGIO
     92  USE lmdz_cppkeys_wrapper, ONLY: CPPKEY_PHYS
    9393  USE strings_mod, ONLY: int2str
    9494  USE iniprint_mod_h
    … …  
    117117!$OMP THREADPRIVATE(Request_physic )
    118118    INTEGER :: ijb,ije,l,iq
    119    
    120    
    121 IF (CPPKEY_DEBUGIO) THEN
    122     CALL WriteField_u('ucovfi',ucov)
    123     CALL WriteField_v('vcovfi',vcov)
    124     CALL WriteField_u('tetafi',teta)
    125     CALL WriteField_u('pfi',p)
    126     CALL WriteField_u('pkfi',pk)
    127     DO iq=1,nqtot
    128       CALL WriteField_u('qfi'//trim(int2str(iq)),q(:,:,iq))
    129     ENDDO
    130 END IF
    131119
    132120!
    … …  
    169157    CALL VTb(VThallo)
    170158  !$OMP END MASTER
    171 
    172 IF (CPPKEY_DEBUGIO) THEN
    173     CALL WriteField_u('ucovfi',ucov)
    174     CALL WriteField_v('vcovfi',vcov)
    175     CALL WriteField_u('tetafi',teta)
    176     CALL WriteField_u('pfi',p)
    177     CALL WriteField_u('pkfi',pk)
    178 END IF
    179159   
    180160    CALL SetTag(Request_physic,800)
    … …  
    216196  !$OMP BARRIER
    217197    CALL WaitRequest(Request_Physic)
    218              
    219   !$OMP BARRIER
    220  
    221  
    222 IF (CPPKEY_DEBUGIO) THEN
    223     CALL WriteField_u('ucovfi',ucov)
    224     CALL WriteField_v('vcovfi',vcov)
    225     CALL WriteField_u('tetafi',teta)
    226     CALL WriteField_u('pfi',p)
    227     CALL WriteField_u('pkfi',pk)
    228     DO iq=1,nqtot
    229       CALL WriteField_u('qfi'//trim(int2str(iq)),q(:,:,iq))
    230     ENDDO
    231 END IF
    232198
    233199  !$OMP BARRIER
    … …  
    301267         
    302268    endif ! of if (.not. pole_nord)
    303        
    304        
    305 IF (CPPKEY_DEBUGIO) THEN
    306     CALL WriteField_u('dufi',dufi)
    307     CALL WriteField_v('dvfi',dvfi)
    308     CALL WriteField_u('dtetafi',dtetafi)
    309     CALL WriteField_u('dpfi',dpfi)
    310     DO iq=1,nqtot
    311       CALL WriteField_u('dqfi'//trim(int2str(iq)),dqfi(:,:,iq))
    312     ENDDO
    313 END IF
     269
    314270
    315271  !$OMP BARRIER
    … …  
    317273!      ajout des tendances physiques:
    318274!      ------------------------------
    319 IF (CPPKEY_DEBUGIO) THEN
    320     CALL WriteField_u('ucovfi',ucov)
    321     CALL WriteField_v('vcovfi',vcov)
    322     CALL WriteField_u('tetafi',teta)
    323     CALL WriteField_u('psfi',ps)
    324     DO iq=1,nqtot
    325       CALL WriteField_u('qfi'//trim(int2str(iq)),q(:,:,iq))
    326     ENDDO
    327 END IF
    328 
    329 IF (CPPKEY_DEBUGIO) THEN
    330     CALL WriteField_u('ucovfi',ucov)
    331     CALL WriteField_v('vcovfi',vcov)
    332     CALL WriteField_u('tetafi',teta)
    333     CALL WriteField_u('psfi',ps)
    334     DO iq=1,nqtot
    335       CALL WriteField_u('qfi'//trim(int2str(iq)),q(:,:,iq))
    336     ENDDO
    337 END IF
    338275
    339276    CALL addfi_loc( dtphys, leapf, forward   ,              &
    … …  
    352289!$OMP BARRIER
    353290
    354 IF (CPPKEY_DEBUGIO) THEN
    355     CALL WriteField_u('ucovfi',ucov)
    356     CALL WriteField_v('vcovfi',vcov)
    357     CALL WriteField_u('tetafi',teta)
    358     CALL WriteField_u('psfi',ps)
    359     DO iq=1,nqtot
    360       CALL WriteField_u('qfi'//trim(int2str(iq)),q(:,:,iq))
    361     ENDDO
    362 END IF
    363 
    364291    IF (ok_strato) THEN
    365292!      CALL top_bound_loc( vcov,ucov,teta,masse,dufi,dvfi,dtetafi)
    … …  
    397324!      CALL diagedyn(ztit,2,1,1,dtphys,ucov, vcov , ps, p ,pk , teta , q(:,:,1), q(:,:,2))
    398325      write(lunout,*)"call_calfis: diagedyn disabled in dyn3dmem !!"
    399     ENDIF
    400 
    401 IF (CPPKEY_DEBUGIO) THEN
    402     CALL WriteField_u('ucovfi',ucov_dyn)
    403     CALL WriteField_v('vcovfi',vcov_dyn)
    404     CALL WriteField_u('tetafi',teta_dyn)
    405     CALL WriteField_u('psfi',ps_dyn)
    406     DO iq=1,nqtot
    407       CALL WriteField_u('qfi'//trim(int2str(iq)),q_dyn(:,:,iq))
    408     ENDDO
    409 END IF
    410 
     326    ENDIF
    411327
    412328!-jld

  • LMDZ6/trunk/libf/dyn3dmem/call_dissip_mod.f90

    r5285 r5324  
    8989  USE vampir
    9090  USE write_field_loc
    91   USE lmdz_cppkeys_wrapper, ONLY: CPPKEY_DEBUGIO
    9291  USE comgeom_mod_h
    9392  IMPLICIT NONE
    … …  
    146145!        CALL FTRACE_REGION_BEGIN("dissip")
    147146    CALL dissip_loc(vcov,ucov,teta,p,dvdis,dudis,dtetadis)
    148 
    149 IF (CPPKEY_DEBUGIO) THEN
    150     CALL WriteField_u('dudis',dudis)
    151     CALL WriteField_v('dvdis',dvdis)
    152     CALL WriteField_u('dtetadis',dtetadis)
    153 END IF
    154147 
    155148!      CALL FTRACE_REGION_END("dissip")

  • LMDZ6/trunk/libf/dyn3dmem/dissip_loc.f90

    r5285 r5324  
    1111  USE dissip_mod, ONLY: dissip_allocate
    1212  USE comconst_mod, ONLY: dtdiss
    13   USE lmdz_cppkeys_wrapper, ONLY: CPPKEY_DEBUGIO
    1413  USE dimensions_mod, ONLY: iim, jjm, llm, ndm
    1514USE paramet_mod_h
    … …  
    119118  ENDIF
    120119
    121 IF (CPPKEY_DEBUGIO) THEN
    122   call WriteField_u('gdx',gdx)
    123   call WriteField_v('gdy',gdy)
    124 END IF
    125 
    126120  ijb=ij_begin
    127121  ije=ij_end
    … …  
    164158  ENDIF
    165159
    166 IF (CPPKEY_DEBUGIO) THEN
    167   call WriteField_u('grx',grx)
    168   call WriteField_v('gry',gry)
    169 END IF
    170 
    171 
    172160  ijb=ij_begin
    173161  ije=ij_end
    … …  
    218206  ENDIF
    219207
    220 IF (CPPKEY_DEBUGIO) THEN
    221   call WriteField_u('gdx',gdx)
    222 END IF
    223 
    224 
    225208  ijb=ij_begin
    226209  ije=ij_end

  • LMDZ6/trunk/libf/dyn3dmem/exner_hyb_loc_m.f90

    r5285 r5324  
    3838    USE comconst_mod, ONLY: cpp, kappa, r, jmp1
    3939    USE comvert_mod, ONLY: preff
    40     USE lmdz_cppkeys_wrapper, ONLY: CPPKEY_DEBUGIO
    4140    USE dimensions_mod, ONLY: iim, jjm, llm, ndm
    4241USE paramet_mod_h
    … …  
    187186       jjb=jj_begin
    188187       jje=jj_end
    189 IF (CPPKEY_DEBUGIO) THEN
    190        call WriteField_u('pkf',pkf)
    191 END IF
    192188       CALL filtreg_p ( pkf,jjb_u,jje_u,jjb,jje, jmp1, llm, &
    193189            2, 1, .TRUE., 1 )
    194 IF (CPPKEY_DEBUGIO) THEN
    195        call WriteField_u('pkf',pkf)
    196 END IF
    197190    end if
    198191

  • LMDZ6/trunk/libf/dyn3dmem/groupe_loc.f90

    r5285 r5324  
    55  USE groupe_mod
    66  USE comconst_mod, ONLY: ngroup
    7   USE lmdz_cppkeys_wrapper, ONLY: CPPKEY_DEBUGIO
    87  USE dimensions_mod, ONLY: iim, jjm, llm, ndm
    98USE paramet_mod_h
    … …  
    7473!$OMP END DO NOWAIT
    7574
    76 IF (CPPKEY_DEBUGIO) THEN
    77   CALL WriteField_v('pbarvm',reshape(pbarvm,(/ip1jm,llm/)))
    78 END IF
    7975  call groupeun_loc(jjm,llm,jjb_v,jje_v,jjb,jje,pbarvm)
    80 IF (CPPKEY_DEBUGIO) THEN
    81   CALL WriteField_v('pbarvm',reshape(pbarvm,(/ip1jm,llm/)))
    82 END IF
    8376  !   Champs 3D
    8477

  • LMDZ6/trunk/libf/dyn3dmem/leapfrog_loc.f90

    r5323 r5324  
    4040         xios_set_current_context, &
    4141         using_xios
    42    USE lmdz_cppkeys_wrapper, ONLY: CPPKEY_INCA, CPPKEY_REPROBUS, CPPKEY_DEBUGIO
     42   USE lmdz_cppkeys_wrapper, ONLY: CPPKEY_INCA, CPPKEY_REPROBUS
    4343   USE lmdz_reprobus_wrappers, ONLY: finalize_reprobus
    4444   USE strings_mod, ONLY: int2str
    … …  
    685685!$OMP END MASTER
    686686
    687 IF (CPPKEY_DEBUGIO) THEN
    688   call WriteField_u('du',du)
    689   call WriteField_v('dv',dv)
    690   call WriteField_u('dteta',dteta)
    691   call WriteField_u('dp',dp)
    692   call WriteField_u('w',w)
    693   call WriteField_u('pbaru',pbaru)
    694   call WriteField_v('pbarv',pbarv)
    695   call WriteField_u('p',p)
    696   call WriteField_u('masse',masse)
    697   call WriteField_u('pk',pk)
    698 END IF
    699687  !-----------------------------------------------------------------------
    700688  !   calcul des tendances advection des traceurs (dont l'humidite)
    … …  
    736724   call VTb(VTintegre)
    737725!$OMP END MASTER
    738 IF (CPPKEY_DEBUGIO) THEN
    739   if (true_itau>20) then
    740   call WriteField_u('ucovm1',ucovm1)
    741   call WriteField_v('vcovm1',vcovm1)
    742   call WriteField_u('tetam1',tetam1)
    743   call WriteField_u('psm1',psm1)
    744   call WriteField_u('ucov_int',ucov)
    745   call WriteField_v('vcov_int',vcov)
    746   call WriteField_u('teta_int',teta)
    747   call WriteField_u('ps_int',ps)
    748   endif
    749 END IF
    750726!$OMP BARRIER
    751727    ! CALL FTRACE_REGION_BEGIN("integrd")
    … …  
    764740    ! CALL FTRACE_REGION_END("integrd")
    765741!$OMP BARRIER
    766 IF (CPPKEY_DEBUGIO) THEN
    767   call WriteField_u('ucovm1',ucovm1)
    768   call WriteField_v('vcovm1',vcovm1)
    769   call WriteField_u('tetam1',tetam1)
    770   call WriteField_u('psm1',psm1)
    771   call WriteField_u('ucov_int',ucov)
    772   call WriteField_v('vcov_int',vcov)
    773   call WriteField_u('teta_int',teta)
    774   call WriteField_u('ps_int',ps)
    775 END IF
    776742
    777743  call check_isotopes(q,ijb_u,ije_u,'leapfrog 775')

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

    r5285 r5324  
    3333  USE comconst_mod, ONLY: cpp
    3434  USE logic_mod, ONLY: adv_qsat_liq
    35   USE lmdz_cppkeys_wrapper, ONLY: CPPKEY_DEBUGIO
    3635  USE dimensions_mod, ONLY: iim, jjm, llm, ndm
    3736USE paramet_mod_h

  • LMDZ6/trunk/libf/misc/lmdz_cppkeys_wrapper.F90

    r5249 r5324  
    2525  IMPLICIT NONE; PRIVATE
    2626  PUBLIC nf90_format, CPPKEY_PHYS, CPPKEY_INCA, CPPKEY_STRATAER, CPPKEY_DUST, &
    27           CPPKEY_DEBUGIO, CPPKEY_INLANDSIS, CPPKEY_OUTPUTPHYSSCM, CPPKEY_COSP, CPPKEY_COSP2, &
     27          CPPKEY_INLANDSIS, CPPKEY_OUTPUTPHYSSCM, CPPKEY_COSP, CPPKEY_COSP2, &
    2828          CPPKEY_COSPV2, CPPKEY_REPROBUS
    2929
    3030#ifdef NC_DOUBLE
    31   INTEGER, PARAMETER :: nf90_format = nf90_double
     31  INTEGER :: nf90_format = nf90_double
    3232#else
    33   INTEGER, PARAMETER :: nf90_format = nf90_float
     33  INTEGER :: nf90_format = nf90_float
    3434#endif
    3535
    3636#ifdef CPP_PHYS
    37   LOGICAL, PARAMETER :: CPPKEY_PHYS = .TRUE.
     37  LOGICAL :: CPPKEY_PHYS = .TRUE.
    3838#else
    39   LOGICAL, PARAMETER :: CPPKEY_PHYS = .FALSE.
     39  LOGICAL :: CPPKEY_PHYS = .FALSE.
    4040#endif
    4141
    4242#ifdef INCA
    43   LOGICAL, PARAMETER :: CPPKEY_INCA = .TRUE.
     43  LOGICAL :: CPPKEY_INCA = .TRUE.
    4444#else
    45   LOGICAL, PARAMETER :: CPPKEY_INCA = .FALSE.
     45  LOGICAL :: CPPKEY_INCA = .FALSE.
    4646#endif
    4747
    4848#ifdef REPROBUS
    49   LOGICAL, PARAMETER :: CPPKEY_REPROBUS = .TRUE.
     49  LOGICAL :: CPPKEY_REPROBUS = .TRUE.
    5050#else
    51   LOGICAL, PARAMETER :: CPPKEY_REPROBUS = .FALSE.
     51  LOGICAL :: CPPKEY_REPROBUS = .FALSE.
    5252#endif
    5353
    5454#ifdef CPP_StratAer
    55   LOGICAL, PARAMETER :: CPPKEY_STRATAER = .TRUE.
     55  LOGICAL :: CPPKEY_STRATAER = .TRUE.
    5656#else
    57   LOGICAL, PARAMETER :: CPPKEY_STRATAER = .FALSE.
     57  LOGICAL :: CPPKEY_STRATAER = .FALSE.
    5858#endif
    5959
    6060#ifdef CPP_DUST
    61   LOGICAL, PARAMETER :: CPPKEY_DUST = .TRUE.
     61  LOGICAL :: CPPKEY_DUST = .TRUE.
    6262#else
    63   LOGICAL, PARAMETER :: CPPKEY_DUST = .FALSE.
    64 #endif
    65 
    66 #ifdef DEBUG_IO
    67   LOGICAL, PARAMETER :: CPPKEY_DEBUGIO = .TRUE.
    68 #else
    69   LOGICAL, PARAMETER :: CPPKEY_DEBUGIO = .FALSE.
     63  LOGICAL :: CPPKEY_DUST = .FALSE.
    7064#endif
    7165
    7266#ifdef CPP_INLANDSIS
    73   LOGICAL, PARAMETER :: CPPKEY_INLANDSIS = .TRUE.
     67  LOGICAL :: CPPKEY_INLANDSIS = .TRUE.
    7468#else
    75   LOGICAL, PARAMETER :: CPPKEY_INLANDSIS = .FALSE.
     69  LOGICAL :: CPPKEY_INLANDSIS = .FALSE.
    7670#endif
    7771
    7872#ifdef OUTPUT_PHYS_SCM
    79   LOGICAL, PARAMETER :: CPPKEY_OUTPUTPHYSSCM = .TRUE.
     73  LOGICAL :: CPPKEY_OUTPUTPHYSSCM = .TRUE.
    8074#else
    81   LOGICAL, PARAMETER :: CPPKEY_OUTPUTPHYSSCM = .FALSE.
     75  LOGICAL :: CPPKEY_OUTPUTPHYSSCM = .FALSE.
    8276#endif
    8377
    8478#ifdef CPP_COSP
    85   LOGICAL, PARAMETER :: CPPKEY_COSP = .TRUE.
     79  LOGICAL :: CPPKEY_COSP = .TRUE.
    8680#else
    87   LOGICAL, PARAMETER :: CPPKEY_COSP = .FALSE.
     81  LOGICAL :: CPPKEY_COSP = .FALSE.
    8882#endif
    8983
    9084#ifdef CPP_COSP2
    91   LOGICAL, PARAMETER :: CPPKEY_COSP2 = .TRUE.
     85  LOGICAL :: CPPKEY_COSP2 = .TRUE.
    9286#else
    93   LOGICAL, PARAMETER :: CPPKEY_COSP2 = .FALSE.
     87  LOGICAL :: CPPKEY_COSP2 = .FALSE.
    9488#endif
    9589
    9690#ifdef CPP_COSPV2
    97   LOGICAL, PARAMETER :: CPPKEY_COSPV2 = .TRUE.
     91  LOGICAL :: CPPKEY_COSPV2 = .TRUE.
    9892#else
    99   LOGICAL, PARAMETER :: CPPKEY_COSPV2 = .FALSE.
     93  LOGICAL :: CPPKEY_COSPV2 = .FALSE.
    10094#endif
    10195
Note: See TracChangeset for help on using the changeset viewer.