Ignore:
Timestamp:
Jul 22, 2024, 9:29:09 PM (13 months ago)
Author:
abarral
Message:

Replace most uses of CPP_DUST by the corresponding logical defined in lmdz_cppkeys_wrapper.F90
Convert several files from .F to .f90 to allow Dust to compile w/o rrtm/ecrad
Create lmdz_yoerad.f90
(lint) Remove "!" on otherwise empty line

Location:
LMDZ6/branches/Amaury_dev/libf/misc
Files:
20 edited

Legend:

Unmodified
Added
Removed

  • LMDZ6/branches/Amaury_dev/libf/misc/description.h

    r2239 r5099  
    1 !
     1
    22! $Header$
    3 !
     3
    44      character (len=120) :: descript
    55      common /titre/descript

  • LMDZ6/branches/Amaury_dev/libf/misc/formcoord.F

    r5082 r5099  
    1 !
     1
    22! $Header$
    3 !
     3
    44      subroutine formcoord(unit,n,x,a,rev,text)
    55      implicit none

  • LMDZ6/branches/Amaury_dev/libf/misc/iniprint.h

    r5093 r5099  
    1 !
     1
    22! $Header$
    3 !
    4 !
     3
     4
    55! gestion des impressions de sorties et de débogage
    66! lunout:    unité du fichier dans lequel se font les sorties
    77!                           (par defaut 6, la sortie standard)
    88! prt_level: niveau d'impression souhaité (0 = minimum)
    9 !
     9
    1010      INTEGER lunout, prt_level
    1111      COMMON /comprint/ lunout, prt_level

  • LMDZ6/branches/Amaury_dev/libf/misc/ioipsl_errioipsl.F90

    r5087 r5099  
    1 !
     1
    22! $Id$
    3 !
     3
    44! Module/Routines extracted from IOIPSL v2_1_8
    5 !
     5
    66MODULE ioipsl_errioipsl
    77!-

  • LMDZ6/branches/Amaury_dev/libf/misc/ioipsl_getincom.F90

    r5087 r5099  
    1 !
     1
    22! $Id$
    3 !
     3
    44! Module/Routines extracted from IOIPSL v2_1_8
    5 !
     5
    66MODULE ioipsl_getincom
    77!-

  • LMDZ6/branches/Amaury_dev/libf/misc/ioipsl_stringop.F90

    r5087 r5099  
    1 !
     1
    22! $Id$
    3 !
     3
    44! Module/Routines extracted from IOIPSL v2_1_8
    5 !
     5
    66MODULE ioipsl_stringop
    77!-

  • LMDZ6/branches/Amaury_dev/libf/misc/ismax.F

    r5086 r5099  
    1 !
     1
    22! $Header$
    3 !
     3
    44      function ismax(n,sx,incx)
    55c

  • LMDZ6/branches/Amaury_dev/libf/misc/ismin.F

    r5082 r5099  
    1 !
     1
    22! $Header$
    3 !
     3
    44      FUNCTION ismin(n,sx,incx)
    55c

  • LMDZ6/branches/Amaury_dev/libf/misc/juldate.F

    r5082 r5099  
    1 !
     1
    22! $Id$
    3 !
     3
    44        subroutine juldate(ian,imoi,ijou,oh,om,os,tjd,tjdsec)
    55c       Sous-routine de changement de date:

  • LMDZ6/branches/Amaury_dev/libf/misc/lmdz_cppkeys_wrapper.F90

    r5098 r5099  
    99!      INCA      -> CPPKEY_INCA
    1010!      CPP_StratAer-> CPPKEY_STRATAER
     11!      CPP_DUST  -> CPPKEY_DUST
    1112! ---------------------------------------------
    1213
    … …  
    1516  USE netcdf, ONLY: nf90_float, nf90_double
    1617  IMPLICIT NONE; PRIVATE
    17   PUBLIC nf90_format, CPPKEY_PHYS, CPPKEY_INCA, CPPKEY_STRATAER
     18  PUBLIC nf90_format, CPPKEY_PHYS, CPPKEY_INCA, CPPKEY_STRATAER, CPPKEY_DUST
    1819
    1920#ifdef NC_DOUBLE
    … …  
    4142#endif
    4243
     44#ifdef CPP_DUST
     45  LOGICAL, PARAMETER :: CPPKEY_DUST = .TRUE.
     46#else
     47  LOGICAL, PARAMETER :: CPPKEY_DUST = .FALSE.
     48#endif
     49
    4350END MODULE lmdz_cppkeys_wrapper

  • LMDZ6/branches/Amaury_dev/libf/misc/minmax.F

    r2239 r5099  
    1 !
     1
    22! $Header$
    3 !
     3
    44       SUBROUTINE minmax(imax, xi, zmin, zmax )
    55c

  • LMDZ6/branches/Amaury_dev/libf/misc/minmax2.F

    r2239 r5099  
    1 !
     1
    22! $Header$
    3 !
     3
    44       SUBROUTINE minmax2(imax, jmax, lmax, xi, zmin, zmax )
    55c

  • LMDZ6/branches/Amaury_dev/libf/misc/pres2lev_mod.F90

    r1983 r5099  
    11! $Id: pres2lev.F 1179 2009-06-11 14:18:47Z jghattas $
    2 !
     2
    33MODULE pres2lev_mod
    44
    … …  
    77!******************************************************
    88SUBROUTINE pres2lev(varo,varn,lmo,lmn,po,pn,ni,nj,ok_invertp)
    9 !
     9
    1010! interpolation lineaire pour passer
    1111! a une nouvelle discretisation verticale pour
    … …  
    2020!   Declarations:
    2121! ==============
    22 !
     22
    2323!  ARGUMENTS
    2424!  """""""""

  • LMDZ6/branches/Amaury_dev/libf/misc/q_sat.F

    r5082 r5099  
    1 !
     1
    22! $Header$
    3 !
    4 !
    5 !
     3
     4
    65
    76      subroutine q_sat(np,temp,pres,qsat)
    8 !
     7
    98      IMPLICIT none
    109!======================================================================
    … …  
    1615! kelvin---input-R: temperature en Kelvin
    1716! millibar--input-R: pression en mb
    18 !
     17
    1918! q_sat----output-R: vapeur d'eau saturante en kg/kg
    2019!======================================================================
    21 !
     20
    2221      integer np
    2322      REAL temp(np),pres(np),qsat(np)
    24 !
     23
    2524      REAL r2es
    2625      PARAMETER (r2es=611.14 *18.0153/28.9644)
    27 !
     26
    2827      REAL r3les, r3ies, r3es
    2928      PARAMETER (R3LES=17.269)
    3029      PARAMETER (R3IES=21.875)
    31 !
     30
    3231      REAL r4les, r4ies, r4es
    3332      PARAMETER (R4LES=35.86)
    3433      PARAMETER (R4IES=7.66)
    35 !
     34
    3635      REAL rtt
    3736      PARAMETER (rtt=273.16)
    38 !
     37
    3938      REAL retv
    4039      PARAMETER (retv=28.9644/18.0153 - 1.0)
    … …  
    4241      real zqsat
    4342      integer ip
    44 !
     43
    4544!     ------------------------------------------------------------------
    46 !
    47 !
     45
    4846
    4947      do ip=1,np
    … …  
    5149!      write(*,*)'kelvin,millibar=',kelvin,millibar
    5250!       write(*,*)'temp,pres=',temp(ip),pres(ip)
    53 !
     51
    5452         IF (temp(ip) <= rtt) THEN
    5553            r3es = r3ies
    … …  
    5957            r4es = r4les
    6058         ENDIF
    61 !
     59
    6260         zqsat=r2es/pres(ip)*EXP(r3es*(temp(ip)-rtt)/(temp(ip)-r4es))
    6361         zqsat=MIN(0.5,ZQSAT)
    6462         zqsat=zqsat/(1.-retv *zqsat)
    65 !
     63
    6664         qsat(ip)= zqsat
    6765!      write(*,*)'qsat=',qsat(ip)
    6866
    6967      enddo
    70 !
     68
    7169      RETURN
    7270      END

  • LMDZ6/branches/Amaury_dev/libf/misc/ran1.F

    r5086 r5099  
    1 !
     1
    22! $Id$
    3 !
     3
    44      FUNCTION RAN1(IDUM)
    55      IMPLICIT NONE

  • LMDZ6/branches/Amaury_dev/libf/misc/regr_conserv_m.F90

    r3069 r5099  
    4040
    4141!-------------------------------------------------------------------------------
    42 !
     42
    4343SUBROUTINE regr1_conserv(ix, vs, xs, xt, vt, slope)
    44 !
     44
    4545!-------------------------------------------------------------------------------
    4646! Arguments:
    … …  
    9393
    9494END SUBROUTINE regr1_conserv
    95 !
    96 !-------------------------------------------------------------------------------
    97 
    98 
    99 !-------------------------------------------------------------------------------
    100 !
     95
     96!-------------------------------------------------------------------------------
     97
     98
     99!-------------------------------------------------------------------------------
     100
    101101SUBROUTINE regr2_conserv(ix, vs, xs, xt, vt, slope)
    102 !
     102
    103103!-------------------------------------------------------------------------------
    104104! Arguments:
    … …  
    153153
    154154END SUBROUTINE regr2_conserv
    155 !
    156 !-------------------------------------------------------------------------------
    157 
    158 
    159 !-------------------------------------------------------------------------------
    160 !
     155
     156!-------------------------------------------------------------------------------
     157
     158
     159!-------------------------------------------------------------------------------
     160
    161161SUBROUTINE regr3_conserv(ix, vs, xs, xt, vt, slope)
    162 !
     162
    163163!-------------------------------------------------------------------------------
    164164! Arguments:
    … …  
    215215
    216216END SUBROUTINE regr3_conserv
    217 !
    218 !-------------------------------------------------------------------------------
    219 
    220 
    221 !-------------------------------------------------------------------------------
    222 !
     217
     218!-------------------------------------------------------------------------------
     219
     220
     221!-------------------------------------------------------------------------------
     222
    223223SUBROUTINE regr4_conserv(ix, vs, xs, xt, vt, slope)
    224 !
     224
    225225!-------------------------------------------------------------------------------
    226226! Arguments:
    … …  
    279279
    280280END SUBROUTINE regr4_conserv
    281 !
    282 !-------------------------------------------------------------------------------
    283 
    284 
    285 !-------------------------------------------------------------------------------
    286 !
     281
     282!-------------------------------------------------------------------------------
     283
     284
     285!-------------------------------------------------------------------------------
     286
    287287SUBROUTINE regr5_conserv(ix, vs, xs, xt, vt, slope)
    288 !
     288
    289289!-------------------------------------------------------------------------------
    290290! Arguments:
    … …  
    345345
    346346END SUBROUTINE regr5_conserv
    347 !
    348 !-------------------------------------------------------------------------------
    349 
    350 
    351 !-------------------------------------------------------------------------------
    352 !
     347
     348!-------------------------------------------------------------------------------
     349
     350
     351!-------------------------------------------------------------------------------
     352
    353353SUBROUTINE check_size(ix,svs,svt,xs,xt,ns,nt)
    354 !
     354
    355355!-------------------------------------------------------------------------------
    356356! Arguments:
    … …  
    382382
    383383END SUBROUTINE check_size
    384 !
     384
    385385!-------------------------------------------------------------------------------
    386386

  • LMDZ6/branches/Amaury_dev/libf/misc/regr_lint_m.F90

    r2788 r5099  
    3333
    3434!-------------------------------------------------------------------------------
    35 !
     35
    3636SUBROUTINE regr1_lint(ix, vs, xs, xt, vt)
    37 !
     37
    3838!-------------------------------------------------------------------------------
    3939! Arguments:
    … …  
    5757
    5858END SUBROUTINE regr1_lint
    59 !
    60 !-------------------------------------------------------------------------------
    61 
    62 
    63 !-------------------------------------------------------------------------------
    64 !
     59
     60!-------------------------------------------------------------------------------
     61
     62
     63!-------------------------------------------------------------------------------
     64
    6565SUBROUTINE regr2_lint(ix, vs, xs, xt, vt)
    66 !
     66
    6767!-------------------------------------------------------------------------------
    6868! Arguments:
    … …  
    8787
    8888END SUBROUTINE regr2_lint
    89 !
    90 !-------------------------------------------------------------------------------
    91 
    92 
    93 !-------------------------------------------------------------------------------
    94 !
     89
     90!-------------------------------------------------------------------------------
     91
     92
     93!-------------------------------------------------------------------------------
     94
    9595SUBROUTINE regr3_lint(ix, vs, xs, xt, vt)
    96 !
     96
    9797!-------------------------------------------------------------------------------
    9898! Arguments:
    … …  
    118118
    119119END SUBROUTINE regr3_lint
    120 !
    121 !-------------------------------------------------------------------------------
    122 
    123 
    124 !-------------------------------------------------------------------------------
    125 !
     120
     121!-------------------------------------------------------------------------------
     122
     123
     124!-------------------------------------------------------------------------------
     125
    126126SUBROUTINE regr4_lint(ix, vs, xs, xt, vt)
    127 !
     127
    128128!-------------------------------------------------------------------------------
    129129! Arguments:
    … …  
    150150
    151151END SUBROUTINE regr4_lint
    152 !
    153 !-------------------------------------------------------------------------------
    154 
    155 
    156 !-------------------------------------------------------------------------------
    157 !
     152
     153!-------------------------------------------------------------------------------
     154
     155
     156!-------------------------------------------------------------------------------
     157
    158158SUBROUTINE regr5_lint(ix, vs, xs, xt, vt)
    159 !
     159
    160160!-------------------------------------------------------------------------------
    161161! Arguments:
    … …  
    183183
    184184END SUBROUTINE regr5_lint
    185 !
    186 !-------------------------------------------------------------------------------
    187 
    188 
    189 !-------------------------------------------------------------------------------
    190 !
     185
     186!-------------------------------------------------------------------------------
     187
     188
     189!-------------------------------------------------------------------------------
     190
    191191SUBROUTINE check_size(ix,svs,svt,nxs,nxt,ns,nt)
    192 !
     192
    193193!-------------------------------------------------------------------------------
    194194! Arguments:
    … …  
    211211
    212212END SUBROUTINE check_size
    213 !
     213
    214214!-------------------------------------------------------------------------------
    215215
    216216END MODULE regr_lint_m
    217 !
    218 !-------------------------------------------------------------------------------
    219 
     217
     218!-------------------------------------------------------------------------------
     219

  • LMDZ6/branches/Amaury_dev/libf/misc/slopes_m.F90

    r2788 r5099  
    2929
    3030!-------------------------------------------------------------------------------
    31 !
     31
    3232PURE FUNCTION slopes1(ix, f, x)
    33 !
     33
    3434!-------------------------------------------------------------------------------
    3535! Arguments:
    … …  
    6464
    6565END FUNCTION slopes1
    66 !
    67 !-------------------------------------------------------------------------------
    68 
    69 
    70 !-------------------------------------------------------------------------------
    71 !
     66
     67!-------------------------------------------------------------------------------
     68
     69
     70!-------------------------------------------------------------------------------
     71
    7272PURE FUNCTION slopes2(ix, f, x)
    73 !
     73
    7474!-------------------------------------------------------------------------------
    7575! Arguments:
    … …  
    113113
    114114END FUNCTION slopes2
    115 !
    116 !-------------------------------------------------------------------------------
    117 
    118 
    119 !-------------------------------------------------------------------------------
    120 !
     115
     116!-------------------------------------------------------------------------------
     117
     118
     119!-------------------------------------------------------------------------------
     120
    121121PURE FUNCTION slopes3(ix, f, x)
    122 !
     122
    123123!-------------------------------------------------------------------------------
    124124! Arguments:
    … …  
    165165
    166166END FUNCTION slopes3
    167 !
    168 !-------------------------------------------------------------------------------
    169 
    170 
    171 !-------------------------------------------------------------------------------
    172 !
     167
     168!-------------------------------------------------------------------------------
     169
     170
     171!-------------------------------------------------------------------------------
     172
    173173PURE FUNCTION slopes4(ix, f, x)
    174 !
     174
    175175!-------------------------------------------------------------------------------
    176176! Arguments:
    … …  
    220220
    221221END FUNCTION slopes4
    222 !
    223 !-------------------------------------------------------------------------------
    224 
    225 
    226 !-------------------------------------------------------------------------------
    227 !
     222
     223!-------------------------------------------------------------------------------
     224
     225
     226!-------------------------------------------------------------------------------
     227
    228228PURE FUNCTION slopes5(ix, f, x)
    229 !
     229
    230230!-------------------------------------------------------------------------------
    231231! Arguments:
    … …  
    278278
    279279END FUNCTION slopes5
    280 !
     280
    281281!-------------------------------------------------------------------------------
    282282

  • LMDZ6/branches/Amaury_dev/libf/misc/sort.F

    r5082 r5099  
    1 !
     1
    22! $Header$
    3 !
     3
    44C
    55C

  • LMDZ6/branches/Amaury_dev/libf/misc/wxios.F90

    r5088 r5099  
    759759!        CALL xios_update_calendar(ito)
    760760!    END SUBROUTINE wxios_update_calendar
    761 !   
     761
    762762!    SUBROUTINE wxios_write_2D(fieldname, fdata)
    763763!        CHARACTER(len=*), INTENT(IN) :: fieldname
    764764!        REAL, DIMENSION(:,:), INTENT(IN) :: fdata
    765 !
     765
    766766!        CALL xios_send_field(fieldname, fdata)
    767767!    END SUBROUTINE wxios_write_2D
    … …  
    770770!        CHARACTER(len=*), INTENT(IN) :: fieldname
    771771!        REAL, DIMENSION(:,:,:), INTENT(IN) :: fdata
    772 !       
     772
    773773!        CALL xios_send_field(fieldname, fdata)
    774774!    END SUBROUTINE wxios_write_3D
Note: See TracChangeset for help on using the changeset viewer.