Changeset 5304 for LMDZ6


Ignore:
Timestamp:
Oct 30, 2024, 7:07:56 PM (4 weeks ago)
Author:
abarral
Message:

Turn YOMCST2.h.h into module

Location:
LMDZ6/trunk/libf
Files:
12 edited
2 moved

Legend:

Unmodified
Added
Removed

  • LMDZ6/trunk/libf/phylmd/concvl.f90

    r5285 r5304  
    3636  USE print_control_mod, ONLY: prt_level, lunout
    3737  USE yomcst_mod_h
     38  USE yomcst2_mod_h
    3839  USE conema3_mod_h
    3940  USE yoethf_mod_h
    … …  
    226227  INTEGER, SAVE            :: itap, igout
    227228!$OMP THREADPRIVATE(itap, igout)
    228   include "YOMCST2.h"
    229229  include "FCTTRE.h"
    230230

  • LMDZ6/trunk/libf/phylmd/conf_phys_m.f90

    r5298 r5304  
    2424       alp_offset)
    2525
    26     USE compbl_mod_h
     26USE yomcst2_mod_h
     27        USE compbl_mod_h
    2728    USE alpale_mod
    2829    USE conema3_mod_h
    … …  
    4546    INCLUDE "nuage.h"
    4647
    47     INCLUDE "YOMCST2.h"
    4848
    4949    INCLUDE "YOEGWD.h"

  • LMDZ6/trunk/libf/phylmd/cv3_buoy.f90

    r5299 r5304  
    1010  ! **************************************************************
    1111
    12 USE cv3param_mod_h
     12USE yomcst2_mod_h
     13  USE cv3param_mod_h
    1314    USE cvthermo_mod_h
    1415  IMPLICIT NONE
    1516
    16   include "YOMCST2.h"
    1717
    1818  ! input:

  • LMDZ6/trunk/libf/phylmd/cv3_inicp.f90

    r5268 r5304  
    33  ! **************************************************************
    44  ! *
    5   ! CV3_INIP Lecture des choix de lois de probabilité de mélange*
    6   ! et calcul de leurs coefficients normalisés.        *
     5  ! CV3_INIP Lecture des choix de lois de probabilit� de m�lange*
     6  ! et calcul de leurs coefficients normalis�s.        *
    77  ! *
    88  ! written by   : Jean-Yves Grandpeix, 06/06/2006, 19.39.27    *
    99  ! modified by :                                               *
    1010  ! **************************************************************
     11  USE yomcst2_mod_h
    1112  IMPLICIT NONE
    12   include "YOMCST2.h"
    13 
    1413  INTEGER iflag_clos
    1514  CHARACTER (LEN=20) :: modname = 'cv3_inicp'

  • LMDZ6/trunk/libf/phylmd/cv3_inip.f90

    r5268 r5304  
    1010!
    1111!----------------------------------------------
    12 !  INPUT (from Common YOMCST2 in "YOMCST2.h") :
     12!  INPUT (from YOMCST2 ) :
    1313! iflag_mix
    14 ! gammas   
     14! gammas
    1515! alphas
    1616! betas
    … …  
    1919!
    2020!----------------------------------------------
    21 !  INPUT/OUTPUT (from and to Common YOMCST2 in "YOMCST2.h") :
     21!  INPUT/OUTPUT (from and to YOMCST2 ) :
    2222! qqa1
    2323! qqa2
    2424!
    2525!----------------------------------------------
    26 !  OUTPUT (to Common YOMCST2 in "YOMCST2.h") :
     26!  OUTPUT (to YOMCST2 ) :
    2727! Qcoef1max
    2828! Qcoef2max
    … …  
    3030!----------------------------------------------
    3131
    32   USE print_control_mod, ONLY: prt_level, lunout
     32USE yomcst2_mod_h
     33    USE print_control_mod, ONLY: prt_level, lunout
    3334  IMPLICIT NONE
    3435
    35   include "YOMCST2.h"
    3636
    3737!----------------------------------------------

  • LMDZ6/trunk/libf/phylmd/cv3_routines.f90

    r5299 r5304  
    11331133  USE conema3_mod_h
    11341134  USE cv3param_mod_h
     1135  USE yomcst2_mod_h
    11351136  IMPLICIT NONE
    11361137
    … …  
    11521153!   - no inb1, only inb in output
    11531154! ---------------------------------------------------------------------
    1154 
    1155   include "YOMCST2.h"
    11561155
    11571156!inputs:

  • LMDZ6/trunk/libf/phylmd/cv3p1_closure.f90

    r5299 r5304  
    1919  ! **************************************************************
    2020
    21 USE cv3param_mod_h
     21USE yomcst2_mod_h
     22  USE cv3param_mod_h
    2223  USE conema3_mod_h
    2324    USE cvthermo_mod_h
    … …  
    2627IMPLICIT NONE
    2728
    28   include "YOMCST2.h"
    2929
    3030

  • LMDZ6/trunk/libf/phylmd/cv3p2_closure.f90

    r5299 r5304  
    1818  ! **************************************************************
    1919
    20 USE cv3param_mod_h
     20USE yomcst2_mod_h
     21  USE cv3param_mod_h
    2122  USE conema3_mod_h
    2223    USE cvthermo_mod_h
    … …  
    2627IMPLICIT NONE
    2728
    28   include "YOMCST2.h"
    2929
    3030

  • LMDZ6/trunk/libf/phylmd/cv3p_mixing.f90

    r5299 r5304  
    1313! **************************************************************
    1414
    15 USE cv3param_mod_h
     15USE yomcst2_mod_h
     16  USE cv3param_mod_h
    1617    USE cvthermo_mod_h
    1718  USE cvflag_mod_h
    … …  
    2223  IMPLICIT NONE
    2324
    24   include "YOMCST2.h"
    2525
    2626!inputs:

  • LMDZ6/trunk/libf/phylmd/yomcst2_mod_h.f90

    r5303 r5304  
     1MODULE yomcst2_mod_h
     2  IMPLICIT NONE; PRIVATE
     3  PUBLIC gammas, alphas, betas, Fmax, scut, qqa1, qqa2, qqa3, Qcoef1max, &
     4          Qcoef2max, Supcrit1, Supcrit2, choice, iflag_mix, coef_clos_ls, iflag_mix_adiab
    15
    2       INTEGER choice, iflag_mix, iflag_mix_adiab
    3       REAL  gammas, alphas, betas, Fmax, qqa1, qqa2, qqa3, scut
    4       REAL  Qcoef1max,Qcoef2max,Supcrit1,Supcrit2
    5       REAL coef_clos_ls
    6 !
    7       COMMON/YOMCST2/gammas,    alphas, betas, Fmax, scut,              &
    8      &               qqa1, qqa2, qqa3,                                  &
    9      &               Qcoef1max,Qcoef2max,                               &
    10      &               Supcrit1, Supcrit2,                                &
    11      &               choice,iflag_mix,coef_clos_ls,iflag_mix_adiab
    12 !$OMP THREADPRIVATE(/YOMCST2/)
    13 !    --------------------------------------------------------------------
     6  INTEGER choice, iflag_mix, iflag_mix_adiab
     7  REAL  gammas, alphas, betas, Fmax, qqa1, qqa2, qqa3, scut
     8  REAL  Qcoef1max, Qcoef2max, Supcrit1, Supcrit2
     9  REAL coef_clos_ls
    1410
     11  !$OMP THREADPRIVATE(gammas, alphas, betas, Fmax, scut, qqa1, qqa2, qqa3, Qcoef1max, &
     12  !$OMP     Qcoef2max, Supcrit1, Supcrit2, choice, iflag_mix, coef_clos_ls, iflag_mix_adiab)
     13END MODULE yomcst2_mod_h

  • LMDZ6/trunk/libf/phylmdiso/concvl.F90

    r5285 r5304  
    6767  USE conema3_mod_h
    6868  USE yoethf_mod_h
     69  USE yomcst2_mod_h
    6970  IMPLICIT NONE
    7071! ======================================================================
    … …  
    298299  INTEGER, SAVE            :: itap, igout
    299300!$OMP THREADPRIVATE(itap, igout)
    300   include "YOMCST2.h"
    301301  include "FCTTRE.h"
    302302

  • LMDZ6/trunk/libf/phylmdiso/cv3_routines.F90

    r5299 r5304  
    14781478  USE cvflag_mod_h
    14791479  USE conema3_mod_h
    1480 USE cv3param_mod_h
     1480  USE cv3param_mod_h
     1481  USE yomcst2_mod_h
    14811482  IMPLICIT NONE
    14821483
    … …  
    14981499!   - no inb1, only inb in output
    14991500! ---------------------------------------------------------------------
    1500  include "YOMCST2.h"
    15011501
    15021502!inputs:

  • LMDZ6/trunk/libf/phylmdiso/cv3p_mixing.F90

    r5299 r5304  
    3939#endif
    4040#endif
    41 USE cv3param_mod_h
     41USE yomcst2_mod_h
     42  USE cv3param_mod_h
    4243    USE cvthermo_mod_h
    4344  USE cvflag_mod_h
    4445  IMPLICIT NONE
    4546
    46   include "YOMCST2.h"
    4747
    4848!inputs:

  • LMDZ6/trunk/libf/phylmdiso/yomcst2_mod_h.f90

    r5303 r5304  
    1 link ../phylmd/YOMCST2.h
     1link ../phylmd/yomcst2_mod_h.f90
Note: See TracChangeset for help on using the changeset viewer.