Changeset 5273 for LMDZ6/trunk


Ignore:
Timestamp:
Oct 25, 2024, 1:41:15 PM (2 months ago)
Author:
abarral
Message:

Turn dimsoil.h into a module

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

Legend:

Unmodified
Added
Removed

  • LMDZ6/trunk/libf/dynphy_lonlat/phylmd/etat0phys_netcdf.f90

    r5272 r5273  
    5656  USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, &
    5757          ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm
     58  USE dimsoil_mod_h, ONLY: nsoilmx
    5859  PRIVATE
    5960  PUBLIC :: etat0phys_netcdf
    … …  
    6162  include "iniprint.h"
    6263  include "comgeom2.h"
    63   include "dimsoil.h"
    6464  include "clesphys.h"
    6565  REAL, SAVE :: deg2rad

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

    r5268 r5273  
    9292  USE geometry_mod
    9393  USE ioipsl_getin_p_mod, ONLY: getin_p
    94 
     94  USE dimsoil_mod_h, ONLY: nsoilmx
    9595  IMPLICIT NONE
    96   INCLUDE 'dimsoil.h'
    9796  include "clesphys.h"
    9897

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

    r5272 r5273  
    1 !
    2 ! $Header$
    3 !
    4       INTEGER nsoilmx
    5       PARAMETER (nsoilmx=11)
     1MODULE dimsoil_mod_h
     2  IMPLICIT NONE; PRIVATE
     3  PUBLIC nsoilmx, nsnowmx, nsismx
    64
    7 ! For Inlandsis, Etienne Vignon:
     5  INTEGER nsoilmx
     6  PARAMETER (nsoilmx = 11)
    87
    9       INTEGER nsnowmx
    10       PARAMETER (nsnowmx=30)
    11      
    12       INTEGER nsismx
    13       PARAMETER (nsismx=41)
     8  ! For Inlandsis, Etienne Vignon:
     9  INTEGER nsnowmx
     10  PARAMETER (nsnowmx = 30)
    1411
    15 ! nsismx should be equal to nsoilmx+nsnowmx
     12  INTEGER nsismx
     13  PARAMETER (nsismx = 41)
     14  ! nsismx should be equal to nsoilmx+nsnowmx
     15END MODULE dimsoil_mod_h
    1616
    1717
    … …  
    1919
    2020
     21

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

    r5271 r5273  
    4848   USE lmdz_cppkeys_wrapper, ONLY: CPPKEY_OUTPUTPHYSSCM
    4949
    50       USE dimensions_mod, ONLY: iim, jjm, llm, ndm
     50   USE dimensions_mod, ONLY: iim, jjm, llm, ndm
     51   USE dimsoil_mod_h, ONLY: nsoilmx
    5152implicit none
    5253
    … …  
    5455!!      INCLUDE "control.h"
    5556      INCLUDE "clesphys.h"
    56       INCLUDE "dimsoil.h"
    5757!      INCLUDE "indicesol.h"
    5858

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

    r5271 r5273  
    4444   USE lmdz_cppkeys_wrapper, ONLY: CPPKEY_OUTPUTPHYSSCM
    4545
    46       USE dimensions_mod, ONLY: iim, jjm, llm, ndm
     46   USE dimensions_mod, ONLY: iim, jjm, llm, ndm
     47   USE dimsoil_mod_h, ONLY: nsoilmx
    4748implicit none
    4849
    … …  
    5051!!      INCLUDE "control.h"
    5152      INCLUDE "clesphys.h"
    52       INCLUDE "dimsoil.h"
    5353!      INCLUDE "indicesol.h"
    5454

  • LMDZ6/trunk/libf/phylmd/inlandsis/VAR_SV.f90

    r5268 r5273  
    11MODULE VAR_SV
    2 
    3 
    4 IMPLICIT NONE
    5 
    6 INCLUDE "dimsoil.h"
     2      USE dimsoil_mod_h, ONLY: nsoilmx, nsnowmx
     3IMPLICIT NONE; PRIVATE
     4      PUBLIC nsol, nsot, nsno, nb_wri, klonv, knonv
    75
    86! +

  • LMDZ6/trunk/libf/phylmd/inlandsis/surf_inlandsis_mod.f90

    r5270 r5273  
    11MODULE surf_inlandsis_mod
    22
    3     IMPLICIT NONE
     3    IMPLICIT NONE; PRIVATE
     4    PUBLIC surf_inlandsis, get_soil_levels, SISVAT_ini, sisvatetat0, sisvatredem
    45
    56CONTAINS
    … …  
    5152        USE VARphy
    5253        USE surface_data, only : iflag_tsurf_inlandsis, SnoMod, BloMod, ok_outfor
     54        USE dimsoil_mod_h, ONLY: nsoilmx, nsnowmx, nsismx
    5355
    5456        IMPLICIT NONE
    55 
    56         ! +--INTERFACE Variables
    57         ! +  ===================
    58         !    include  "dimsoil.h"
    5957
    6058        ! +--Global Variables
    … …  
    755753        USE mod_phys_lmdz_para
    756754        USE VAR_SV
    757 
    758 
    759         !    INCLUDE "dimsoil.h"
     755        USE dimsoil_mod_h, ONLY: nsoilmx, nsnowmx, nsismx
    760756
    761757        REAL, DIMENSION(nsoilmx), INTENT(OUT) :: dz2, dz1
    … …  
    10321028
    10331029    SUBROUTINE sisvatetat0 (fichnom, ikl2i)
    1034 
    10351030        USE dimphy
    10361031        USE mod_grid_phy_lmdz
    10371032        USE mod_phys_lmdz_para
    1038 
    10391033        USE iostart
    10401034        USE VAR_SV
    … …  
    10431037        USE VARtSV
    10441038        USE indice_sol_mod
    1045 
     1039        USE dimsoil_mod_h, ONLY: nsoilmx, nsnowmx, nsismx
    10461040        IMPLICIT none
    10471041        !======================================================================
    … …  
    10511045        !    include "indicesol.h"
    10521046
    1053         !    include "dimsoil.h"
     1047        !
    10541048        include "clesphys.h"
    10551049        include "compbl.h"
    … …  
    12821276        USE indice_sol_mod
    12831277        USE dimphy
     1278        USE dimsoil_mod_h, ONLY: nsoilmx, nsnowmx, nsismx
    12841279
    12851280        IMPLICIT none

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

    r5022 r5273  
    276276#endif
    277277#endif
     278    USE dimsoil_mod_h, ONLY: nsoilmx
    278279
    279280!   INCLUDE "indicesol.h"
    280     INCLUDE "dimsoil.h"
    281281    INCLUDE "YOMCST.h"
    282282    INCLUDE "clesphys.h"

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

    r5217 r5273  
    8585    USE print_control_mod, ONLY: lunout
    8686    USE ioipsl_getin_p_mod, ONLY : getin_p
     87    USE dimsoil_mod_h, ONLY: nsoilmx
    8788    IMPLICIT NONE
    88 
    89     INCLUDE "dimsoil.h"
    9089 
    9190! Input variables
    … …  
    204203    USE isotopes_verif_mod
    205204#endif
     205    USE dimsoil_mod_h, ONLY: nsoilmx
    206206    IMPLICIT NONE
    207 
    208     INCLUDE "dimsoil.h"
    209207 
    210208! Input variables
    … …  
    416414    USE wxios, ONLY: missing_val_xios => missing_val, using_xios
    417415    USE netcdf, only: missing_val_netcdf => nf90_fill_real
    418 
    419      
    420 
     416    USE dimsoil_mod_h, ONLY: nsoilmx
    421417
    422418    IMPLICIT NONE
    423 
    424     INCLUDE "dimsoil.h"
    425419    INCLUDE "YOMCST.h"
    426420    INCLUDE "YOETHF.h"
    … …  
    42234217#endif   
    42244218#endif
    4225 
    4226     INCLUDE "dimsoil.h"
     4219    USE dimsoil_mod_h, ONLY: nsoilmx
    42274220
    42284221! Ouput variables
    … …  
    42974290         dser, dt_ds
    42984291    use config_ocean_skin_m, only: activate_ocean_skin
    4299 
    4300     INCLUDE "dimsoil.h"
    43014292    INCLUDE "clesphys.h"
    43024293    INCLUDE "compbl.h"

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

    r5270 r5273  
    3737    USE mod_grid_phy_lmdz
    3838    USE ioipsl_getin_p_mod, ONLY : getin_p
    39     USE phys_cal_mod , ONLY: calend, year_len_phy => year_len
     39    USE phys_cal_mod , ONLY: calend, year_len_phy => year_len
     40    USE dimsoil_mod_h, ONLY: nsoilmx
    4041    IMPLICIT NONE
    4142
    4243    include "YOMCST.h"
    4344    include "clesphys.h"
    44     include "dimsoil.h"
    4545
    4646    INTEGER, INTENT (IN) :: nlon, year_len, iflag_phys

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

    r5268 r5273  
    4343  use netcdf, only: missing_val_netcdf => nf90_fill_real
    4444  use config_ocean_skin_m, only: activate_ocean_skin
     45  USE dimsoil_mod_h, ONLY: nsoilmx
     46
    4547
    4648  IMPLICIT none
    … …  
    4951  ! Objet: Lecture de l'etat initial pour la physique
    5052  !======================================================================
    51   include "dimsoil.h"
    5253  include "clesphys.h"
    5354  include "alpale.h"

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

    r5268 r5273  
    4343  USE time_phylmdz_mod, ONLY: annee_ref, day_end, itau_phy, pdtphys
    4444  use config_ocean_skin_m, only: activate_ocean_skin 
    45 
     45  USE dimsoil_mod_h, ONLY: nsoilmx
    4646  IMPLICIT none
    47 
    48   include "dimsoil.h"
    4947  include "clesphys.h"
    5048  include "alpale.h"

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

    r5267 r5273  
    412412
    413413    include "regdim.h"
    414     include "dimsoil.h"
    415414    include "clesphys.h"
    416415    include "alpale.h"

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

    r5268 r5273  
    99  USE indice_sol_mod
    1010  USE print_control_mod, ONLY: lunout
     11  USE dimsoil_mod_h, ONLY: nsoilmx
    1112
    1213  IMPLICIT NONE
    … …  
    6162!=======================================================================
    6263  INCLUDE "YOMCST.h"
    63   INCLUDE "dimsoil.h"
    6464  INCLUDE "comsoil.h"
    6565!-----------------------------------------------------------------------

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

    r5022 r5273  
    4444#endif
    4545#endif
     46    USE dimsoil_mod_h, ONLY: nsoilmx
    4647!****************************************************************************************
    4748! Bucket calculations for surface.
    4849!
    4950    INCLUDE "clesphys.h"
    50     INCLUDE "dimsoil.h"
    5151    INCLUDE "YOMCST.h"
    5252

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

    r5217 r5273  
    7474
    7575    USE print_control_mod, ONLY: lunout
    76 
    77     INCLUDE "dimsoil.h"
     76    USE dimsoil_mod_h, ONLY: nsoilmx
    7877    INCLUDE "YOMCST.h"
    7978    INCLUDE "clesphys.h"

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

    r5259 r5273  
    5656    USE indice_sol_mod
    5757    USE lmdz_cppkeys_wrapper, ONLY: CPPKEY_INLANDSIS
     58    USE dimsoil_mod_h, ONLY: nsoilmx
    5859
    5960!    INCLUDE "indicesol.h"
    60     INCLUDE "dimsoil.h"
    6161    INCLUDE "YOMCST.h"
    6262    INCLUDE "clesphys.h"

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

    r5022 r5273  
    3737  USE infotrac_phy, ONLY : ntiso,niso
    3838#endif
     39  USE dimsoil_mod_h, ONLY: nsoilmx
    3940
    4041!
    … …  
    4344! in here because it is the same calculation for the different modes of ocean.
    4445!
    45     INCLUDE "dimsoil.h"
    4646    INCLUDE "clesphys.h"
    4747

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

    r5272 r5273  
    1 link ../phylmd/dimsoil.h
     1link ../phylmd/dimsoil_mod_h.f90

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

    r5272 r5273  
    1587715877       implicit none   
    1587815878
    15879       ! equivalent de phyetat0 pour les isotopes 
    15880 
    15881 INCLUDE "dimsoil.h"
     15879      ! equivalent de phyetat0 pour les isotopes
    1588215880INCLUDE "clesphys.h"
    1588315881INCLUDE "compbl.h"
    … …  
    1605316051#endif
    1605416052        implicit none
    16055 
    16056 INCLUDE "dimsoil.h"
    1605716053INCLUDE "clesphys.h"
    1605816054!  INCLUDE "thermcell.h"
    … …  
    1643016426#endif
    1643116427   IMPLICIT NONE
    16432 
    16433 INCLUDE "dimsoil.h"
    1643416428INCLUDE "clesphys.h"
    1643516429INCLUDE "compbl.h"

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

    r5270 r5273  
    4545  USE infotrac_phy, ONLY: niso
    4646#endif
     47    USE dimsoil_mod_h, ONLY: nsoilmx
    4748
    4849    IMPLICIT NONE
    … …  
    5051    include "YOMCST.h"
    5152    include "clesphys.h"
    52     include "dimsoil.h"
    5353
    5454    INTEGER, INTENT (IN) :: nlon, year_len, iflag_phys

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

    r5204 r5273  
    5959#endif
    6060#endif
     61  USE dimsoil_mod_h, ONLY: nsoilmx
    6162
    6263  IMPLICIT none
    … …  
    6566  ! Objet: Lecture de l'etat initial pour la physique
    6667  !======================================================================
    67   include "dimsoil.h"
    6868  include "clesphys.h"
    6969  include "alpale.h"

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

    r5271 r5273  
    5151  USE ocean_slab_mod, ONLY : nslay, tslab, seaice, tice, fsic
    5252  USE time_phylmdz_mod, ONLY: annee_ref, day_end, itau_phy, pdtphys
    53   use config_ocean_skin_m, only: activate_ocean_skin 
     53  use config_ocean_skin_m, only: activate_ocean_skin
     54  USE dimsoil_mod_h, ONLY: nsoilmx
    5455
    5556  IMPLICIT none
    56 
    57   include "dimsoil.h"
    5857  include "clesphys.h"
    5958  include "alpale.h"
    … …  
    513512    use isotrac_mod, only: index_zone,index_iso,strtrac
    514513#endif
    515       !USE phyredem, ONLY: put_field_srf1
    516 
     514      USE dimsoil_mod_h, ONLY: nsoilmx
    517515        implicit none
    518516
    519517        ! equivalent isotopique de phyredem
    520 
    521 INCLUDE "dimsoil.h"
    522518INCLUDE "clesphys.h"
    523519INCLUDE "alpale.h"

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

    r5267 r5273  
    485485
    486486    include "regdim.h"
    487     include "dimsoil.h"
    488487    include "clesphys.h"
    489488    include "alpale.h"
Note: See TracChangeset for help on using the changeset viewer.