Ignore:
Timestamp:
Jul 29, 2024, 12:37:08 PM (8 weeks ago)
Author:
abarral
Message:

Put cvthermo.h, cv30param.h, cv3param.h into modules

File:
1 moved

Legend:

Unmodified
Added
Removed

  • LMDZ6/branches/Amaury_dev/libf/phylmdiso/lmdz_cv30.F90

    r5140 r5141  
     1! $Id$
     2
     3MODULE lmdz_cv30
     4  !------------------------------------------------------------
     5  ! Parameters for convectL, iflag_con=30:
     6  ! (includes - microphysical parameters,
     7  !                     - parameters that control the rate of approach
     8  !               to quasi-equilibrium)
     9  !                     - noff & minorig (previously in input of convect1)
     10  !------------------------------------------------------------
     11
     12  IMPLICIT NONE; PRIVATE
     13  PUBLIC sigd, spfac, pbcrit, ptcrit, omtrain, dtovsh, dpbase, dttrig, dtcrit, &
     14          tau, beta, alpha, delta, betad, noff, minorig, nl, nlp, nlm, &
     15          cv30_param, cv30_prelim, cv30_feed, cv30_undilute1, cv30_trigger, &
     16          cv30_compress, cv30_undilute2, cv30_closure, cv30_mixing, cv30_unsat, &
     17          cv30_yield, cv30_tracer, cv30_uncompress, cv30_epmax_fn_cape
     18
     19  INTEGER noff, minorig, nl, nlp, nlm
     20  REAL sigd, spfac
     21  REAL pbcrit, ptcrit
     22  REAL omtrain
     23  REAL dtovsh, dpbase, dttrig
     24  REAL dtcrit, tau, beta, alpha
     25  REAL delta
     26  REAL betad
     27
     28  !$OMP THREADPRIVATE(sigd, spfac, pbcrit, ptcrit, omtrain, dtovsh, dpbase, dttrig, dtcrit, &
     29  !$OMP      tau, beta, alpha, delta, betad, noff, minorig, nl, nlp, nlm)
     30CONTAINS
     31
    132
    233! $Id$
    … …  
    3162  ! ***                 APPROACH TO QUASI-EQUILIBRIUM           ***
    3263  ! ***                     IT MUST BE LESS THAN 0              ***
    33 
    34   include "cv30param.h"
    35 
     64 
    3665  INTEGER nd
    3766  REAL delt ! timestep (seconds)
    … …  
    86115SUBROUTINE cv30_prelim(len, nd, ndp1, t, q, p, ph, lv, cpn, tv, gz, h, hm, &
    87116    th)
     117
     118  USE lmdz_cvthermo
    88119  IMPLICIT NONE
    89120
    … …  
    108139  REAL tvx, tvy ! convect3
    109140  REAL cpx(len, nd)
    110 
    111   include "cvthermo.h"
    112   include "cv30param.h"
    113141
    114142
    … …  
    184212  ! ================================================================
    185213
    186   include "cv30param.h"
     214 
    187215
    188216  ! inputs:
    … …  
    389417#endif
    390418#endif
     419USE lmdz_cvthermo
    391420
    392421  IMPLICIT NONE
    … …  
    405434  ! ----------------------------------------------------------------
    406435
    407   include "cvthermo.h"
    408   include "cv30param.h"
    409436
    410437  ! inputs:
    … …  
    851878  ! -------------------------------------------------------------------
    852879
    853   include "cv30param.h"
     880 
    854881
    855882  ! input:
    … …  
    961988  IMPLICIT NONE
    962989
    963   include "cv30param.h"
     990 
    964991
    965992  ! inputs:
    … …  
    11541181#endif
    11551182#endif
     1183USE lmdz_cvthermo
    11561184  IMPLICIT NONE
    11571185
    … …  
    11731201  ! - no inb1, ONLY inb in output
    11741202  ! ---------------------------------------------------------------------
    1175 
    1176   include "cvthermo.h"
    1177   include "cv30param.h"
    11781203
    11791204  ! inputs:
    … …  
    16181643SUBROUTINE cv30_closure(nloc, ncum, nd, icb, inb, pbase, p, ph, tv, buoy, &
    16191644    sig, w0, cape, m)
     1645  USE lmdz_cvthermo
     1646
    16201647  IMPLICIT NONE
    16211648
    … …  
    16251652  ! vectorization: S. Bony
    16261653  ! ===================================================================
    1627 
    1628   include "cvthermo.h"
    1629   include "cv30param.h"
    16301654
    16311655  ! input:
    … …  
    18541878#endif
    18551879#endif
     1880USE lmdz_cvthermo
     1881
    18561882  IMPLICIT NONE
    18571883
    … …  
    18611887  ! - vectorisation de la partie normalisation des flux (do 789...)
    18621888  ! ---------------------------------------------------------------------
    1863 
    1864   include "cvthermo.h"
    1865   include "cv30param.h"
    18661889
    18671890  ! inputs:
    … …  
    26702693#endif
    26712694USE lmdz_cvflag
     2695USE lmdz_cvthermo
    26722696
    26732697  IMPLICIT NONE
    2674 
    2675 
    2676   include "cvthermo.h"
    2677   include "cv30param.h"
    26782698
    26792699  ! inputs:
    … …  
    34023422#endif
    34033423USE lmdz_cvflag
     3424USE lmdz_cvthermo
    34043425
    34053426  IMPLICIT NONE
    3406 
    3407   include "cvthermo.h"
    3408   include "cv30param.h"
    3409 
    34103427  ! inputs:
    34113428  INTEGER ncum, nd, na, ntra, nloc
    … …  
    59725989  IMPLICIT NONE
    59735990
    5974   include "cv30param.h"
     5991 
    59755992
    59765993  ! inputs:
    … …  
    61146131  IMPLICIT NONE
    61156132
    6116   include "cv30param.h"
     6133 
    61176134
    61186135  ! inputs:
    … …  
    63386355        USE lmdz_abort_physic, ONLY: abort_physic
    63396356                USE lmdz_conema3
     6357        USE lmdz_cvthermo
    63406358
    63416359        IMPLICIT NONE
    … …  
    63456363        ! qui en depend
    63466364        ! Toutes les autres variables fn de ep sont calculees plus bas.
    6347 
    6348  include "cvthermo.h"
    6349  include "cv30param.h"
    63506365
    63516366! inputs:
    … …  
    64216436
    64226437
     6438
     6439
     6440
     6441
     6442END MODULE lmdz_cv30
     6443
     6444
Note: See TracChangeset for help on using the changeset viewer.