Changeset 5301


Ignore:
Timestamp:
Oct 30, 2024, 2:54:51 PM (2 months ago)
Author:
abarral
Message:

Turn tsoilnudge.h fcg_gcssold.h flux_arp.h into module

Location:
LMDZ6/trunk/libf
Files:
9 edited
6 moved

Legend:

Unmodified
Added
Removed

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

    r5268 r5301  
    55     vbeta,vcal,vdif)
    66
    7   USE dimphy
     7USE flux_arp_mod_h
     8    USE dimphy
    89  USE indice_sol_mod
    910
    1011  IMPLICIT none
    1112
    12   INCLUDE "flux_arp.h"
    1313
    1414!======================================================================

  • LMDZ6/trunk/libf/phylmd/dyn1d/1DUTILS.h

    r5285 r5301  
    1111
    1212      USE print_control_mod, ONLY: lunout
     13      USE tsoilnudge_mod_h
     14      USE fcg_gcssold_mod_h
     15      USE flux_arp_mod_h
    1316      IMPLICIT NONE
    1417!-----------------------------------------------------------------------
    … …  
    1922
    2023#include "compar1d.h"
    21 #include "flux_arp.h"
    22 #include "tsoilnudge.h"
    23 #include "fcg_gcssold.h"
    2424#include "fcg_racmo.h"
    2525!

  • LMDZ6/trunk/libf/phylmd/dyn1d/old_lmdz1d.f90

    r5296 r5301  
    55      SUBROUTINE old_lmdz1d
    66
    7 USE compbl_mod_h
     7USE flux_arp_mod_h
     8      USE compbl_mod_h
    89         USE clesphys_mod_h
    910      USE ioipsl, only: ju2ymds, ymds2ju, ioconf_calendar,getin
    … …  
    5253   USE dimensions_mod, ONLY: iim, jjm, llm, ndm
    5354   USE dimsoil_mod_h, ONLY: nsoilmx
    54 USE yomcst_mod_h
     55  USE yomcst_mod_h
     56  USE tsoilnudge_mod_h
     57  USE fcg_gcssold_mod_h
    5558implicit none
    5659
    57 
    58 !!      INCLUDE "control.h"
    59 !      INCLUDE "indicesol.h"
    60 
    6160      INCLUDE "compar1d.h"
    62       INCLUDE "flux_arp.h"
    6361      INCLUDE "date_cas.h"
    64       INCLUDE "tsoilnudge.h"
    65       INCLUDE "fcg_gcssold.h"
    6662!!!      INCLUDE "fbforcing.h"
    6763

  • LMDZ6/trunk/libf/phylmd/dyn1d/scm.f90

    r5296 r5301  
    11SUBROUTINE scm
    22
    3 USE compbl_mod_h
     3USE flux_arp_mod_h
     4      USE compbl_mod_h
    45         USE clesphys_mod_h
    56      USE ioipsl, only: ju2ymds, ymds2ju, ioconf_calendar,getin
    … …  
    4849   USE dimensions_mod, ONLY: iim, jjm, llm, ndm
    4950   USE dimsoil_mod_h, ONLY: nsoilmx
    50 USE yomcst_mod_h
     51  USE yomcst_mod_h
     52  USE tsoilnudge_mod_h
     53  USE fcg_gcssold_mod_h
    5154implicit none
    52 
    53 
    54 !!      INCLUDE "control.h"
    55 !      INCLUDE "indicesol.h"
    56 
    5755      INCLUDE "compar1d.h"
    58       INCLUDE "flux_arp.h"
    5956      INCLUDE "date_cas.h"
    60       INCLUDE "tsoilnudge.h"
    61       INCLUDE "fcg_gcssold.h"
    6257
    6358!=====================================================================

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

    r5300 r5301  
    1 !
    2 ! $Id: fcg_gcssold.h 2010-08-10 17:02:56Z lahellec $
    3 !
    4       logical :: imp_fcg_gcssold,ts_fcg_gcssold,Tp_fcg_gcssold
    5       logical :: Tp_ini_gcssold
    6       logical :: xTurb_fcg_gcssold
     1! Replaces fcg_gcssold.h
    72
    8       common /fcg_gcssold/imp_fcg_gcssold,ts_fcg_gcssold,Tp_fcg_gcssold,        &
    9      & Tp_ini_gcssold,                                                          &
    10      & xTurb_fcg_gcssold
     3MODULE fcg_gcssold_mod_h
     4  IMPLICIT NONE; PRIVATE
     5  PUBLIC imp_fcg_gcssold, ts_fcg_gcssold, Tp_fcg_gcssold, Tp_ini_gcssold, xTurb_fcg_gcssold
    116
    12 !$OMP THREADPRIVATE(/fcg_gcssold/)
     7  LOGICAL :: imp_fcg_gcssold, ts_fcg_gcssold, Tp_fcg_gcssold
     8  LOGICAL :: Tp_ini_gcssold
     9  LOGICAL :: xTurb_fcg_gcssold
    1310
    14 
    15 
    16 
    17 
    18 
    19 
    20 
    21 
    22 
    23 
    24 
    25 
    26 
    27 
    28 
    29 
    30 
    31 
    32 
    33 
    34 
    35 
    36 
    37 
    38 
    39 
    40 
    41 
    42 
    43 
    44 
    45 
    46 
     11  !$OMP THREADPRIVATE(imp_fcg_gcssold, ts_fcg_gcssold, Tp_fcg_gcssold, Tp_ini_gcssold, xTurb_fcg_gcssold)
     12END MODULE fcg_gcssold_mod_h

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

    r5300 r5301  
    1 !
    2 ! $Id: flux_arp.h 2010-08-04 17:02:56Z lahellec $
     1! Replaces flux_arh.h
    32! Modif EV, 10/2020
    4 !
    5       logical :: ok_flux_surf
    6       logical :: ok_prescr_ust !for prescribed ustar
    7       logical :: ok_prescr_beta
    8       logical :: ok_forc_tsurf
    93
     4MODULE flux_arp_mod_h
     5  IMPLICIT NONE; PRIVATE
     6  PUBLIC fsens, flat, betaevap, ust, tg, ok_flux_surf, ok_prescr_ust, ok_prescr_beta, ok_forc_tsurf
    107
    11       real :: fsens
    12       real :: flat
    13       real :: betaevap
    14       real :: ust
    15       real :: tg
     8  LOGICAL :: ok_flux_surf
     9  LOGICAL :: ok_prescr_ust !for prescribed ustar
     10  LOGICAL :: ok_prescr_beta
     11  LOGICAL :: ok_forc_tsurf
    1612
    17       common /flux_arp/fsens,flat,ust,tg,ok_flux_surf,ok_prescr_ust,ok_prescr_beta,betaevap,ok_forc_tsurf
     13  REAL :: fsens
     14  REAL :: flat
     15  REAL :: betaevap
     16  REAL :: ust
     17  REAL :: tg
    1818
    19 !$OMP THREADPRIVATE(/flux_arp/)
     19  !$OMP THREADPRIVATE(fsens,flat,betaevap,ust,tg,ok_flux_surf,ok_prescr_ust,ok_prescr_beta,ok_forc_tsurf)
     20END MODULE flux_arp_mod_h
    2021
    2122

  • LMDZ6/trunk/libf/phylmd/ocean_forced_mod.F90

    r5285 r5301  
    5050#endif
    5151#endif
    52     USE clesphys_mod_h
     52USE flux_arp_mod_h
     53        USE clesphys_mod_h
    5354    USE yomcst_mod_h
    54     INCLUDE "flux_arp.h"
    5555
    5656! Input arguments
    … …  
    275275#endif
    276276#endif
    277     USE clesphys_mod_h
     277USE flux_arp_mod_h
     278        USE clesphys_mod_h
    278279    USE yomcst_mod_h
    279280USE dimsoil_mod_h, ONLY: nsoilmx
    … …  
    281282!   INCLUDE "indicesol.h"
    282283
    283     INCLUDE "flux_arp.h"
    284284
    285285! Input arguments

  • LMDZ6/trunk/libf/phylmd/pbl_surface_mod.F90

    r5296 r5301  
    407407#endif
    408408#endif
    409 USE compbl_mod_h
     409USE flux_arp_mod_h
     410    USE compbl_mod_h
    410411    USE yoethf_mod_h
    411412        USE clesphys_mod_h
    … …  
    423424
    424425    INCLUDE "FCTTRE.h"
    425     INCLUDE "flux_arp.h"
    426426!FC
    427427    INCLUDE "dimpft.h"

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

    r5268 r5301  
    33!Case-specific radiative setup
    44!
    5       use dimphy
     5USE flux_arp_mod_h
     6            use dimphy
    67      IMPLICIT none
    7       INCLUDE "flux_arp.h"     
    88!
    99! Arguments :

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

    r5285 r5301  
    2020                         pref, delu, delte, delq, s_pblh, prain, tsol, pat1)
    2121      USE yomcst_mod_h
     22      USE flux_arp_mod_h
    2223IMPLICIT NONE
    2324!-----------------------------------------------------------------------
    … …  
    7374      REAL, dimension(klon), intent(out) :: pref, delu, delte, delq
    7475!-----------------------------------------------------------------------
    75 
    76       include "flux_arp.h"
    7776!
    7877! Variables locales 
    … …  
    124123                         pref, delm, delh, zri1, s_pblh, prain, tsol, pat1)
    125124      USE yomcst_mod_h
     125      USE flux_arp_mod_h
    126126IMPLICIT NONE
    127127!-----------------------------------------------------------------------
    … …  
    178178      REAL, dimension(klon) :: cdram, cdrah
    179179!-----------------------------------------------------------------------
    180 
    181       include "flux_arp.h"
    182 !
     180      !
    183181! Variables locales 
    184182      INTEGER :: i

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

    r5285 r5301  
    2222                           t_2m, q_2m, t_10m, q_10m, u_10m, ustar, s_pblh, prain, tsol)
    2323        USE yoethf_mod_h
     24        USE flux_arp_mod_h
    2425      IMPLICIT NONE
    2526!-------------------------------------------------------------------------
    … …  
    7374      REAL, DIMENSION(klon), INTENT(IN) :: tsol
    7475!-------------------------------------------------------------------------
    75       include "flux_arp.h"
    7676!
    7777! Quelques constantes et options:
    … …  
    321321      USE ioipsl_getin_p_mod, ONLY : getin_p
    322322      USE yoethf_mod_h
     323      USE flux_arp_mod_h
    323324      IMPLICIT NONE
    324325!-------------------------------------------------------------------------
    … …  
    381382      REAL, DIMENSION(klon) :: tsol
    382383!-------------------------------------------------------------------------
    383       include "flux_arp.h"
    384384!
    385385! Quelques constantes et options:

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

    r5300 r5301  
    1       logical nudge_tsoil
    2       integer isoil_nudge
    3       real Tsoil_nudge, tau_soil_nudge
     1MODULE tsoilnudge_mod_h
     2  IMPLICIT NONE; PRIVATE
     3  PUBLIC nudge_tsoil, isoil_nudge, Tsoil_nudge, tau_soil_nudge
    44
    5       common /tsoilnudge/ nudge_tsoil, isoil_nudge, Tsoil_nudge,        &
    6      &                   tau_soil_nudge
    7 
     5  LOGICAL nudge_tsoil
     6  INTEGER isoil_nudge
     7  REAL Tsoil_nudge, tau_soil_nudge
     8END MODULE tsoilnudge_mod_h

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

    r5300 r5301  
    1 link ../phylmd/fcg_gcssold.h
     1link ../phylmd/fcg_gcssold_mod_h.f90

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

    r5300 r5301  
    1 link ../phylmd/flux_arp.h
     1link ../phylmd/flux_arp_mod_h.f90

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

    r5300 r5301  
    1 link ../phylmd/tsoilnudge.h
     1link ../phylmd/tsoilnudge_mod_h.f90
Note: See TracChangeset for help on using the changeset viewer.