Ignore:
Timestamp:
Jul 24, 2024, 11:19:08 AM (7 months ago)
Author:
abarral
Message:

Rename modules properly (mod_* -> lmdz_*) in phy_common

Location:
LMDZ6/branches/Amaury_dev/libf/phylmd
Files:
90 edited

Legend:

Unmodified
Added
Removed

  • LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/condsurfc_new.f90

    r5105 r5110  
    33        lmt_omff, lmt_omnff, lmt_ombbl, lmt_ombbh, &
    44        lmt_omnat, lmt_omba)
    5   USE mod_grid_phy_lmdz
    6   USE mod_phys_lmdz_para
     5  USE lmdz_grid_phy
     6  USE lmdz_phys_para
    77  USE dimphy
    88  USE netcdf, ONLY: nf90_get_var, nf90_close, nf90_noerr, nf90_inq_varid, nf90_open, nf90_nowrite

  • LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/condsurfs_new.f90

    r5105 r5110  
    66        lmt_dmsbio, lmt_h2sbio, lmt_dms, &
    77        lmt_dmsconc)
    8   USE mod_grid_phy_lmdz
    9   USE mod_phys_lmdz_para
     8  USE lmdz_grid_phy
     9  USE lmdz_phys_para
    1010  USE dimphy
    1111  USE netcdf, ONLY: nf90_get_var, nf90_inq_varid, nf90_close, nf90_noerr, nf90_open, nf90_nowrite

  • LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/dustemission_mod.F90

    r5105 r5110  
    173173  USE infotrac
    174174  USE write_field_phy
    175   USE mod_grid_phy_lmdz
    176   USE mod_phys_lmdz_para
     175  USE lmdz_grid_phy
     176  USE lmdz_phys_para
    177177  USE indice_sol_mod
    178178
    … …  
    280280  USE infotrac
    281281  USE write_field_phy
    282   USE mod_grid_phy_lmdz
    283   USE mod_phys_lmdz_para
     282  USE lmdz_grid_phy
     283  USE lmdz_phys_para
    284284  USE indice_sol_mod
    285285
    … …  
    521521  USE infotrac
    522522  USE write_field_phy
    523   USE mod_grid_phy_lmdz
    524   USE mod_phys_lmdz_para
     523  USE lmdz_grid_phy
     524  USE lmdz_phys_para
    525525  USE indice_sol_mod
    526526

  • LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/lsc_scav_orig.F90

    r5103 r5110  
    66  USE ioipsl
    77  USE dimphy
    8   USE mod_grid_phy_lmdz
    9   USE mod_phys_lmdz_para
     8  USE lmdz_grid_phy
     9  USE lmdz_phys_para
    1010  USE traclmdz_mod
    1111  USE infotrac,ONLY: nbtr

  • LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/lsc_scav_spl.F90

    r5103 r5110  
    88  USE ioipsl
    99  USE dimphy
    10   USE mod_grid_phy_lmdz
    11   USE mod_phys_lmdz_para
     10  USE lmdz_grid_phy
     11  USE lmdz_phys_para
    1212  USE traclmdz_mod
    1313  USE infotrac,ONLY: nbtr

  • LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/phytracr_spl_mod.F90

    r5106 r5110  
    783783    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
    784784
    785     USE mod_grid_phy_lmdz
    786     USE mod_phys_lmdz_para
     785    USE lmdz_grid_phy
     786    USE lmdz_phys_para
    787787    USE IOIPSL
    788788    USE dimphy
    … …  
    791791    USE write_field_phy
    792792
    793     USE mod_phys_lmdz_transfert_para
     793    USE lmdz_phys_transfert_para
    794794    USE lmdz_thermcell_dq, ONLY: thermcell_dq
    795795    USE phys_cal_mod, ONLY: jD_1jan, year_len, mth_len, days_elapsed, jh_1jan, year_cur, &
    … …  
    42124212  SUBROUTINE readregionsdims2_spl(nbreg, fileregions)
    42134213
    4214     USE mod_grid_phy_lmdz
    4215     USE mod_phys_lmdz_para
     4214    USE lmdz_grid_phy
     4215    USE lmdz_phys_para
    42164216
    42174217    IMPLICIT NONE
    … …  
    42344234          nbreg_dust, fileregionsdimsdust, &
    42354235          nbreg_bb, fileregionsdimsbb)
    4236     USE mod_grid_phy_lmdz
    4237     USE mod_phys_lmdz_para
     4236    USE lmdz_grid_phy
     4237    USE lmdz_phys_para
    42384238
    42394239    IMPLICIT NONE
    … …  
    42704270  SUBROUTINE readregions_spl(iregion, filenameregion)
    42714271    USE dimphy
    4272     USE mod_grid_phy_lmdz
    4273     USE mod_phys_lmdz_para
     4272    USE lmdz_grid_phy
     4273    USE lmdz_phys_para
    42744274
    42754275    IMPLICIT NONE
    … …  
    42954295  SUBROUTINE readscaleparams_spl(scale_param, nbreg, &
    42964296          filescaleparams)
    4297     USE mod_grid_phy_lmdz
    4298     USE mod_phys_lmdz_para
     4297    USE lmdz_grid_phy
     4298    USE lmdz_phys_para
    42994299    IMPLICIT NONE
    43004300
    … …  
    43324332    !                                        filescaleparams,paramname,&
    43334333    !                                        julien,jH_phys, pdtphys,debutphy)
    4334     USE mod_grid_phy_lmdz
    4335     USE mod_phys_lmdz_para
     4334    USE lmdz_grid_phy
     4335    USE lmdz_phys_para
    43364336    IMPLICIT NONE
    43374337
    … …  
    44334433          scale_param)
    44344434
    4435     USE mod_grid_phy_lmdz
    4436     USE mod_phys_lmdz_para
     4435    USE lmdz_grid_phy
     4436    USE lmdz_phys_para
    44374437    USE netcdf, ONLY: nf90_open, nf90_close, nf90_inq_varid, nf90_nowrite, nf90_noerr, nf90_get_var
    44384438    IMPLICIT NONE

  • LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/read_dust.f90

    r5105 r5110  
    11SUBROUTINE read_dust(debutphy, step, nbjour, dust_ec)
    22  USE dimphy
    3   USE mod_grid_phy_lmdz
    4   USE mod_phys_lmdz_para
     3  USE lmdz_grid_phy
     4  USE lmdz_phys_para
    55  USE netcdf, ONLY: nf90_get_var, nf90_nowrite, nf90_open, nf90_inq_varid
    66  IMPLICIT NONE

  • LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/read_newemissions.f90

    r5104 r5110  
    2020  USE dimphy
    2121  USE indice_sol_mod
    22   USE mod_grid_phy_lmdz
    23   USE mod_phys_lmdz_para
     22  USE lmdz_grid_phy
     23  USE lmdz_phys_para
    2424
    2525  IMPLICIT NONE

  • LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/read_surface.F90

    r5105 r5110  
    66       USE ioipsl
    77       USE dimphy
    8        USE mod_grid_phy_lmdz
    9        USE mod_phys_lmdz_para
     8       USE lmdz_grid_phy
     9       USE lmdz_phys_para
    1010       USE iophy
    1111       USE netcdf, ONLY:nf90_inq_varid,nf90_noerr,nf90_get_var,nf90_nowrite,nf90_inq_varid,nf90_open

  • LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/read_vent.f90

    r5105 r5110  
    11SUBROUTINE read_vent(debutphy, step, nbjour, u10m_ec, v10m_ec)
    22  USE dimphy
    3   USE mod_grid_phy_lmdz
    4   USE mod_phys_lmdz_para
     3  USE lmdz_grid_phy
     4  USE lmdz_phys_para
    55  USE netcdf, ONLY: nf90_get_var, nf90_open, nf90_inq_varid, nf90_nowrite
    66  IMPLICIT NONE

  • LMDZ6/branches/Amaury_dev/libf/phylmd/StratAer/interp_sulf_input.F90

    r5105 r5110  
    88  USE netcdf, ONLY: nf90_get_var, nf90_noerr, nf90_nowrite
    99
    10   USE mod_grid_phy_lmdz
    11   USE mod_phys_lmdz_mpi_data, ONLY:  is_mpi_root
    12   USE mod_phys_lmdz_omp_data, ONLY:  is_omp_root
     10  USE lmdz_grid_phy
     11  USE lmdz_phys_mpi_data, ONLY:  is_mpi_root
     12  USE lmdz_phys_omp_data, ONLY:  is_omp_root
    1313  USE phys_local_var_mod, ONLY: budg_3D_backgr_ocs, budg_3D_backgr_so2
    1414  USE phys_local_var_mod, ONLY: OCS_lifetime, SO2_lifetime, H2SO4_lifetime, O3_clim
    15   USE mod_phys_lmdz_para
     15  USE lmdz_phys_para
    1616  USE dimphy
    1717  USE phys_cal_mod

  • LMDZ6/branches/Amaury_dev/libf/phylmd/StratAer/miecalc_aer.F90

    r5101 r5110  
    2121  USE dimphy
    2222  USE lmdz_yomcst  , ONLY: RG, RPI
    23   USE mod_phys_lmdz_para, only: gather, scatter, bcast
    24   USE mod_grid_phy_lmdz, ONLY: klon_glo
    25   USE mod_phys_lmdz_mpi_data, ONLY:  is_mpi_root
     23  USE lmdz_phys_para, only: gather, scatter, bcast
     24  USE lmdz_grid_phy, ONLY: klon_glo
     25  USE lmdz_phys_mpi_data, ONLY:  is_mpi_root
    2626  USE print_control_mod, ONLY: prt_level, lunout
    2727

  • LMDZ6/branches/Amaury_dev/libf/phylmd/StratAer/stratH2O_methox.F90

    r5105 r5110  
    1010  USE netcdf, ONLY: nf90_get_var, nf90_noerr, nf90_nowrite
    1111
    12   USE mod_grid_phy_lmdz
    13   USE mod_phys_lmdz_mpi_data, ONLY:  is_mpi_root
    14   USE mod_phys_lmdz_omp_data, ONLY:  is_omp_root
     12  USE lmdz_grid_phy
     13  USE lmdz_phys_mpi_data, ONLY:  is_mpi_root
     14  USE lmdz_phys_omp_data, ONLY:  is_omp_root
    1515
    16   USE mod_phys_lmdz_para
     16  USE lmdz_phys_para
    1717  USE dimphy
    1818  USE phys_cal_mod, ONLY: mth_cur

  • LMDZ6/branches/Amaury_dev/libf/phylmd/StratAer/strataer_emiss_mod.F90

    r5101 r5110  
    99    USE ioipsl_getin_p_mod, ONLY: getin_p
    1010    USE print_control_mod, ONLY: lunout
    11     USE mod_phys_lmdz_para, ONLY: is_master
     11    USE lmdz_phys_para, ONLY: is_master
    1212
    1313    ! Local variables
    … …  
    216216    USE regular_lonlat_mod, ONLY: lon_reg, lat_reg
    217217    USE dimphy, ONLY: klon
    218     USE mod_grid_phy_lmdz, ONLY: nbp_lat, nbp_lon
     218    USE lmdz_grid_phy, ONLY: nbp_lat, nbp_lon
    219219    USE print_control_mod, ONLY: lunout
    220220    USE strataer_local_var_mod

  • LMDZ6/branches/Amaury_dev/libf/phylmd/StratAer/strataer_local_var_mod.F90

    r5098 r5110  
    157157    USE ioipsl_getin_p_mod, ONLY: getin_p
    158158    USE print_control_mod, ONLY: lunout
    159     USE mod_phys_lmdz_para, ONLY: is_master
     159    USE lmdz_phys_para, ONLY: is_master
    160160    USE infotrac_phy, ONLY: id_OCS_strat, id_SO2_strat, id_H2SO4_strat, nbtr_sulgas, nbtr_bin
    161161    USE phys_local_var_mod, ONLY: mdw

  • LMDZ6/branches/Amaury_dev/libf/phylmd/StratAer/strataer_nuc_mod.F90

    r5101 r5110  
    1212    USE ioipsl_getin_p_mod, ONLY: getin_p
    1313    USE print_control_mod, ONLY: lunout
    14     USE mod_phys_lmdz_para, ONLY: is_master
     14    USE lmdz_phys_para, ONLY: is_master
    1515    USE strataer_local_var_mod, ONLY: ALPH2SO4,flag_nuc_rate_box,nuclat_min,nuclat_max, &
    1616         nucpres_min,nucpres_max

  • LMDZ6/branches/Amaury_dev/libf/phylmd/StratAer/stratemit.F90

    r5101 r5110  
    1414  USE aerophys
    1515  USE infotrac_phy
    16   USE mod_phys_lmdz_mpi_data, ONLY:  is_mpi_root
    17   USE mod_grid_phy_lmdz, ONLY: nbp_lon
     16  USE lmdz_phys_mpi_data, ONLY:  is_mpi_root
     17  USE lmdz_grid_phy, ONLY: nbp_lon
    1818 
    1919  IMPLICIT NONE

  • LMDZ6/branches/Amaury_dev/libf/phylmd/StratAer/traccoag_mod.F90

    r5101 r5110  
    1818    USE aerophys
    1919    USE geometry_mod, ONLY: cell_area, boundslat
    20     USE mod_grid_phy_lmdz
    21     USE mod_phys_lmdz_mpi_data, ONLY:  is_mpi_root
    22     USE mod_phys_lmdz_para, only: gather, scatter
     20    USE lmdz_grid_phy
     21    USE lmdz_phys_mpi_data, ONLY:  is_mpi_root
     22    USE lmdz_phys_para, only: gather, scatter
    2323    USE phys_cal_mod, ONLY: year_len, year_cur, mth_cur, day_cur, hour
    2424    USE sulfate_aer_mod

  • LMDZ6/branches/Amaury_dev/libf/phylmd/aaam_bud.F90

    r5105 r5110  
    66
    77  USE dimphy
    8   USE mod_grid_phy_lmdz, ONLY: nbp_lon, nbp_lat, klon_glo
     8  USE lmdz_grid_phy, ONLY: nbp_lon, nbp_lat, klon_glo
    99  IMPLICIT NONE
    1010  ! ======================================================================

  • LMDZ6/branches/Amaury_dev/libf/phylmd/add_phys_tend_mod.F90

    r5106 r5110  
    3333  USE phys_local_var_mod
    3434  USE phys_state_var_mod
    35   USE mod_grid_phy_lmdz, ONLY: nbp_lev
     35  USE lmdz_grid_phy, ONLY: nbp_lev
    3636  IMPLICIT NONE
    3737  REAL,SAVE,ALLOCATABLE :: hthturb_gcssold(:)

  • LMDZ6/branches/Amaury_dev/libf/phylmd/atm2geo.F90

    r5106 r5110  
    44SUBROUTINE atm2geo( im, jm, pte, ptn, plon, plat, pxx, pyy, pzz )
    55  USE dimphy
    6   USE mod_phys_lmdz_para
    7   USE mod_grid_phy_lmdz, only: grid_type, unstructured, regular_lonlat
     6  USE lmdz_phys_para
     7  USE lmdz_grid_phy, only: grid_type, unstructured, regular_lonlat
    88  IMPLICIT NONE
    99  INCLUDE 'YOMCST.h'

  • LMDZ6/branches/Amaury_dev/libf/phylmd/carbon_cycle_mod.F90

    r5103 r5110  
    277277    USE phys_cal_mod, ONLY: mth_cur
    278278    USE mod_synchro_omp
    279     USE mod_phys_lmdz_para, ONLY: is_mpi_root, is_omp_root
    280     USE mod_phys_lmdz_transfert_para
    281     USE mod_phys_lmdz_omp_transfert
     279    USE lmdz_phys_para, ONLY: is_mpi_root, is_omp_root
     280    USE lmdz_phys_transfert_para
     281    USE lmdz_phys_omp_transfert
    282282    USE dimphy, ONLY: klon
    283283

  • LMDZ6/branches/Amaury_dev/libf/phylmd/cfmip_point_locations.F90

    r5105 r5110  
    3333  USE dimphy
    3434  USE iophy
    35   USE mod_grid_phy_lmdz, ONLY: nbp_lon, nbp_lat, klon_glo
     35  USE lmdz_grid_phy, ONLY: nbp_lon, nbp_lat, klon_glo
    3636
    3737  IMPLICIT none

  • LMDZ6/branches/Amaury_dev/libf/phylmd/condsurf.F90

    r5105 r5110  
    33SUBROUTINE condsurf(jour, jourvrai, lmt_bils)
    44  USE dimphy
    5   USE mod_grid_phy_lmdz
    6   USE mod_phys_lmdz_para
     5  USE lmdz_grid_phy
     6  USE lmdz_phys_para
    77  USE indice_sol_mod
    88  USE time_phylmdz_mod, ONLY: annee_ref

  • LMDZ6/branches/Amaury_dev/libf/phylmd/conf_phys_m.F90

    r5105 r5110  
    3030    USE carbon_cycle_mod, ONLY: read_fco2_land_cor, var_fco2_land_cor
    3131    USE chemistry_cycle_mod, ONLY: dms_cycle_cpl, n2o_cycle_cpl
    32     USE mod_grid_phy_lmdz, ONLY: klon_glo
     32    USE lmdz_grid_phy, ONLY: klon_glo
    3333    USE print_control_mod, ONLY: lunout
    3434    use config_ocean_skin_m, ONLY: config_ocean_skin

  • LMDZ6/branches/Amaury_dev/libf/phylmd/cpl_mod.F90

    r5103 r5110  
    1616!*************************************************************************************
    1717  USE dimphy, ONLY: klon
    18   USE mod_phys_lmdz_para
     18  USE lmdz_phys_para
    1919  USE ioipsl
    2020  USE iophy
    … …  
    136136    USE surface_data
    137137    USE indice_sol_mod
    138     USE mod_grid_phy_lmdz, ONLY: nbp_lon, nbp_lat, grid1dTo2d_glo, klon_glo, grid_type, unstructured, regular_lonlat
     138    USE lmdz_grid_phy, ONLY: nbp_lon, nbp_lat, grid1dTo2d_glo, klon_glo, grid_type, unstructured, regular_lonlat
    139139    USE time_phylmdz_mod, ONLY: annee_ref, day_ini, itau_phy, itaufin_phy
    140140    USE print_control_mod, ONLY: lunout
    … …  
    411411    USE indice_sol_mod
    412412    USE time_phylmdz_mod, ONLY: start_time, itau_phy
    413     USE mod_grid_phy_lmdz, ONLY: nbp_lon, nbp_lat
     413    USE lmdz_grid_phy, ONLY: nbp_lon, nbp_lat
    414414    use config_ocean_skin_m, only: activate_ocean_skin
    415415
    … …  
    661661    USE carbon_cycle_mod, ONLY: carbon_cycle_cpl, co2_send
    662662    USE indice_sol_mod
    663     USE mod_grid_phy_lmdz, ONLY: nbp_lon, nbp_lat
     663    USE lmdz_grid_phy, ONLY: nbp_lon, nbp_lat
    664664    use config_ocean_skin_m, only: activate_ocean_skin
    665665
    … …  
    921921    USE carbon_cycle_mod, ONLY: carbon_cycle_cpl
    922922    USE indice_sol_mod
    923     USE mod_grid_phy_lmdz, ONLY: nbp_lon, nbp_lat
     923    USE lmdz_grid_phy, ONLY: nbp_lon, nbp_lat
    924924
    925925! Input arguments
    … …  
    11171117! (it is done in cpl_send_seaice_fields).
    11181118
    1119     USE mod_grid_phy_lmdz, ONLY: nbp_lon, nbp_lat
     1119    USE lmdz_grid_phy, ONLY: nbp_lon, nbp_lat
    11201120
    11211121! Input arguments
    … …  
    11731173! will be done in cpl_send_seaice_fields.
    11741174
    1175     USE mod_grid_phy_lmdz, ONLY: nbp_lon, nbp_lat
     1175    USE lmdz_grid_phy, ONLY: nbp_lon, nbp_lat
    11761176
    11771177! Input varibales
    … …  
    12291229    USE carbon_cycle_mod, ONLY: carbon_cycle_cpl
    12301230    USE indice_sol_mod
    1231     USE mod_grid_phy_lmdz, ONLY: nbp_lon, nbp_lat
     1231    USE lmdz_grid_phy, ONLY: nbp_lon, nbp_lat
    12321232    USE time_phylmdz_mod, ONLY: start_time, itau_phy
    12331233    USE config_ocean_skin_m, only: activate_ocean_skin
    … …  
    15411541
    15421542  SUBROUTINE cpl2gath(champ_in, champ_out, knon, knindex)
    1543   USE mod_phys_lmdz_para
     1543  USE lmdz_phys_para
    15441544! Cette routine transforme un champs de la grille 2D recu du coupleur sur la grille
    15451545! 'gathered' (la grille physiq comprime).
    … …  
    15541554!   champ_out    champ sur la grille 'gatherd'
    15551555
    1556     USE mod_grid_phy_lmdz, ONLY: nbp_lon, nbp_lat
     1556    USE lmdz_grid_phy, ONLY: nbp_lon, nbp_lat
    15571557
    15581558! Input
    … …  
    15891589
    15901590  SUBROUTINE gath2cpl(champ_in, champ_out, knon, knindex)
    1591   USE mod_phys_lmdz_para
     1591  USE lmdz_phys_para
    15921592! Cette routine ecrit un champ 'gathered' sur la grille 2D pour le passer
    15931593! au coupleur.
    … …  
    16011601!   champ_out    champ sur la grille 2D
    16021602
    1603     USE mod_grid_phy_lmdz, ONLY: nbp_lon, nbp_lat
     1603    USE lmdz_grid_phy, ONLY: nbp_lon, nbp_lat
    16041604   
    16051605! Input arguments

  • LMDZ6/branches/Amaury_dev/libf/phylmd/create_etat0_limit_unstruct_mod.F90

    r5101 r5110  
    1212  USE lmdz_xios, ONLY: xios_set_axis_attr, xios_set_fieldgroup_attr, &
    1313                  xios_set_filegroup_attr, xios_set_file_attr
    14   USE mod_phys_lmdz_para, ONLY: is_omp_master
    15   USE mod_grid_phy_lmdz, ONLY: grid_type, unstructured
     14  USE lmdz_phys_para, ONLY: is_omp_master
     15  USE lmdz_grid_phy, ONLY: grid_type, unstructured
    1616  USE ioipsl, ONLY: ioget_year_len
    1717  USE ioipsl_getin_p_mod, ONLY: getin_p
    … …  
    5151 
    5252  SUBROUTINE create_etat0_limit_unstruct
    53   USE mod_grid_phy_lmdz, ONLY: grid_type, unstructured
     53  USE lmdz_grid_phy, ONLY: grid_type, unstructured
    5454  USE create_etat0_unstruct_mod, ONLY: create_etat0_unstruct
    5555  USE create_limit_unstruct_mod, ONLY: create_limit_unstruct
    5656  USE phyaqua_mod, ONLY: iniaqua
    5757  USE phys_cal_mod, only: year_len
    58   USE mod_phys_lmdz_para, ONLY: is_omp_master
     58  USE lmdz_phys_para, ONLY: is_omp_master
    5959  USE ioipsl_getin_p_mod, ONLY: getin_p
    6060  USE dimphy, ONLY: klon

  • LMDZ6/branches/Amaury_dev/libf/phylmd/create_etat0_unstruct_mod.F90

    r5100 r5110  
    2424  USE lmdz_xios
    2525  USE netcdf, ONLY: nf90_nowrite,nf90_close,nf90_noerr,nf90_open
    26   USE mod_phys_lmdz_para
     26  USE lmdz_phys_para
    2727  IMPLICIT NONE
    2828  INTEGER :: file_id, iret
    … …  
    8888  USE indice_sol_mod
    8989  USE surface_data,      ONLY: landice_opt
    90   USE mod_phys_lmdz_para
     90  USE lmdz_phys_para
    9191  USE print_control_mod, ONLY: lunout
    9292  USE geometry_mod

  • LMDZ6/branches/Amaury_dev/libf/phylmd/create_limit_unstruct_mod.F90

    r5101 r5110  
    1515  USE indice_sol_mod
    1616  USE phys_state_var_mod
    17   USE mod_phys_lmdz_para
     17  USE lmdz_phys_para
    1818  IMPLICIT NONE
    1919    INCLUDE "iniprint.h"
    … …  
    184184  USE ioipsl,             ONLY: ioget_year_len
    185185  USE time_phylmdz_mod, ONLY: annee_ref
    186   USE mod_phys_lmdz_para
     186  USE lmdz_phys_para
    187187  IMPLICIT NONE
    188188   INCLUDE "iniprint.h"

  • LMDZ6/branches/Amaury_dev/libf/phylmd/cv3_routines.F90

    r5105 r5110  
    88
    99  USE ioipsl_getin_p_mod, ONLY: getin_p
    10   use mod_phys_lmdz_para
     10  use lmdz_phys_para
    1111  IMPLICIT NONE
    1212
    … …  
    309309                    cpnk, hnk, nk, icb, icbmax, iflag, gznk, plcl)
    310310
    311   USE mod_phys_lmdz_transfert_para, ONLY: bcast
     311  USE lmdz_phys_transfert_para, ONLY: bcast
    312312  USE add_phys_tend_mod, ONLY: fl_cor_ebil
    313313  USE print_control_mod, ONLY: prt_level

  • LMDZ6/branches/Amaury_dev/libf/phylmd/dyn1d/lmdz_1dutils.f90

    r5106 r5110  
    704704          &                          ucov, vcov, temp, q, omega2)
    705705    USE dimphy
    706     USE mod_grid_phy_lmdz
    707     USE mod_phys_lmdz_para
     706    USE lmdz_grid_phy
     707    USE lmdz_phys_para
    708708    USE iophy
    709709    USE phys_state_var_mod
    … …  
    839839          &                          ucov, vcov, temp, q, omega2)
    840840    USE dimphy
    841     USE mod_grid_phy_lmdz
    842     USE mod_phys_lmdz_para
     841    USE lmdz_grid_phy
     842    USE lmdz_phys_para
    843843    USE phys_state_var_mod
    844844    USE iostart

  • LMDZ6/branches/Amaury_dev/libf/phylmd/geo2atm.F90

    r5099 r5110  
    44SUBROUTINE geo2atm(im, jm, px, py, pz, plon, plat, pu, pv, pr)
    55  USE dimphy
    6   USE mod_phys_lmdz_para
    7   USE mod_grid_phy_lmdz, only: grid_type, unstructured, regular_lonlat
     6  USE lmdz_phys_para
     7  USE lmdz_grid_phy, only: grid_type, unstructured, regular_lonlat
    88  IMPLICIT NONE
    99  INCLUDE 'YOMCST.h'

  • LMDZ6/branches/Amaury_dev/libf/phylmd/global_mean.F90

    r5103 r5110  
    66
    77  USE dimphy
    8   USE mod_phys_lmdz_para, only: is_sequential
    9   USE mod_phys_lmdz_transfert_para, only: reduce_sum
    10   use mod_phys_lmdz_mpi_data, only: is_mpi_root
     8  USE lmdz_phys_para, only: is_sequential
     9  USE lmdz_phys_transfert_para, only: reduce_sum
     10  use lmdz_phys_mpi_data, only: is_mpi_root
    1111  USE ioipsl
    1212  implicit none

  • LMDZ6/branches/Amaury_dev/libf/phylmd/ice_sursat_mod.F90

    r5105 r5110  
    8989
    9090  USE dimphy
    91   USE mod_grid_phy_lmdz,  ONLY: klon_glo
     91  USE lmdz_grid_phy,  ONLY: klon_glo
    9292  USE geometry_mod, ONLY: cell_area
    9393  USE phys_cal_mod, ONLY: mth_cur
    94   USE mod_phys_lmdz_mpi_data, ONLY: is_mpi_root
    95   USE mod_phys_lmdz_omp_data, ONLY: is_omp_root
    96   USE mod_phys_lmdz_para, ONLY: scatter, bcast
     94  USE lmdz_phys_mpi_data, ONLY: is_mpi_root
     95  USE lmdz_phys_omp_data, ONLY: is_omp_root
     96  USE lmdz_phys_para, ONLY: scatter, bcast
    9797  USE print_control_mod, ONLY: lunout
    9898  USE netcdf, ONLY: nf90_get_var, nf90_inq_varid, nf90_inquire_dimension, nf90_inq_dimid, &

  • LMDZ6/branches/Amaury_dev/libf/phylmd/initphysto.F90

    r5099 r5110  
    55 
    66  USE dimphy
    7   USE mod_phys_lmdz_para
     7  USE lmdz_phys_para
    88  USE IOIPSL
    99  USE iophy
    1010  USE indice_sol_mod
    11   USE mod_grid_phy_lmdz, ONLY: nbp_lon, nbp_lat, nbp_lev
     11  USE lmdz_grid_phy, ONLY: nbp_lon, nbp_lat, nbp_lev
    1212  USE time_phylmdz_mod, ONLY: day_ref, annee_ref
    1313 

  • LMDZ6/branches/Amaury_dev/libf/phylmd/inlandsis/surf_inlandsis_mod.F90

    r5106 r5110  
    751751        ! of SISVAT, therefore it's needed here.
    752752
    753         USE mod_phys_lmdz_mpi_data, ONLY: is_mpi_root
    754         USE mod_phys_lmdz_para
     753        USE lmdz_phys_mpi_data, ONLY: is_mpi_root
     754        USE lmdz_phys_para
    755755        USE VAR_SV
    756756
    … …  
    10321032
    10331033        USE dimphy
    1034         USE mod_grid_phy_lmdz
    1035         USE mod_phys_lmdz_para
     1034        USE lmdz_grid_phy
     1035        USE lmdz_phys_para
    10361036
    10371037        USE iostart
    … …  
    12681268        ! Objet: Ecriture de l'etat de redemarrage pour SISVAT
    12691269        !======================================================================
    1270         USE mod_grid_phy_lmdz
    1271         USE mod_phys_lmdz_para
     1270        USE lmdz_grid_phy
     1271        USE lmdz_phys_para
    12721272        USE iostart
    12731273        USE VAR_SV

  • LMDZ6/branches/Amaury_dev/libf/phylmd/interfoce_lim.F90

    r5099 r5110  
    77     lmt_sst_p, pctsrf_new_p)
    88 
    9   USE mod_grid_phy_lmdz
    10   USE mod_phys_lmdz_para
     9  USE lmdz_grid_phy
     10  USE lmdz_phys_para
    1111  USE indice_sol_mod
    1212  USE netcdf, ONLY: nf90_get_var,nf90_close,nf90_noerr,nf90_inq_varid,nf90_open,nf90_nowrite

  • LMDZ6/branches/Amaury_dev/libf/phylmd/iophy.F90

    r5106 r5110  
    3737
    3838    USE dimphy, ONLY: klon
    39     USE mod_phys_lmdz_para, ONLY: gather, bcast, &
     39    USE lmdz_phys_para, ONLY: gather, bcast, &
    4040                                  jj_nb, jj_begin, jj_end, ii_begin, ii_end, &
    4141                                  mpi_size, mpi_rank, klon_mpi, &
    4242                                is_sequential, is_south_pole_dyn
    43   USE mod_grid_phy_lmdz, ONLY: nbp_lon, nbp_lat, klon_glo, grid_type, unstructured
     43  USE lmdz_grid_phy, ONLY: nbp_lon, nbp_lat, klon_glo, grid_type, unstructured
    4444  USE print_control_mod, ONLY: prt_level,lunout
    4545    USE ioipsl, ONLY: flio_dom_set
    … …  
    161161  SUBROUTINE init_iophy(lat,lon)
    162162
    163     USE mod_phys_lmdz_para, ONLY: jj_begin, jj_end, ii_begin, ii_end, jj_nb, &
     163    USE lmdz_phys_para, ONLY: jj_begin, jj_end, ii_begin, ii_end, jj_nb, &
    164164                                  mpi_size, mpi_rank
    165165    USE ioipsl, ONLY: flio_dom_set
    166     USE mod_grid_phy_lmdz, ONLY: nbp_lon, nbp_lat
     166    USE lmdz_grid_phy, ONLY: nbp_lon, nbp_lat
    167167
    168168    IMPLICIT NONE
    … …  
    207207 SUBROUTINE histbeg_phyxios(name,itau0,zjulian,dtime,ffreq,lev,nhori,nid_day)
    208208!  USE dimphy
    209   USE mod_phys_lmdz_para, ONLY: is_sequential, is_using_mpi, is_mpi_root, &
     209  USE lmdz_phys_para, ONLY: is_sequential, is_using_mpi, is_mpi_root, &
    210210                                jj_begin, jj_end, jj_nb
    211   USE mod_grid_phy_lmdz, ONLY: nbp_lon, nbp_lat
     211  USE lmdz_grid_phy, ONLY: nbp_lon, nbp_lat
    212212  USE ioipsl, ONLY: histbeg
    213213  USE wxios, ONLY: wxios_add_file, using_xios
    … …  
    248248  SUBROUTINE histbeg_phy(name,itau0,zjulian,dtime,nhori,nid_day)
    249249
    250   USE mod_phys_lmdz_para, ONLY: jj_begin, jj_end, jj_nb, is_sequential
    251   USE mod_grid_phy_lmdz, ONLY: nbp_lon, nbp_lat
     250  USE lmdz_phys_para, ONLY: jj_begin, jj_end, jj_nb, is_sequential
     251  USE lmdz_grid_phy, ONLY: nbp_lon, nbp_lat
    252252  USE ioipsl, ONLY: histbeg
    253253
    … …  
    280280             nname,itau0,zjulian,dtime,nnhori,nnid_day)
    281281  USE dimphy, ONLY: klon
    282   USE mod_phys_lmdz_para, ONLY: gather, bcast, &
     282  USE lmdz_phys_para, ONLY: gather, bcast, &
    283283                                is_sequential, klon_mpi_begin, klon_mpi_end, &
    284284                                mpi_rank
    285   USE mod_grid_phy_lmdz, ONLY: klon_glo, nbp_lon, nbp_lat, grid1dTo2d_glo
     285  USE lmdz_grid_phy, ONLY: klon_glo, nbp_lon, nbp_lat, grid1dTo2d_glo
    286286  USE ioipsl, ONLY: histbeg
    287287
    … …  
    455455
    456456    USE ioipsl, ONLY: histdef
    457     USE mod_phys_lmdz_para, ONLY: jj_nb, is_master
     457    USE lmdz_phys_para, ONLY: jj_nb, is_master
    458458    USE phys_output_var_mod, ONLY: type_ecri, zoutm, zdtime_moy, lev_files, &
    459459                                   nid_files, nhorim, swaero_diag, dryaod_diag, nfiles, &
    460460                                   ok_4xCO2atm
    461     USE mod_grid_phy_lmdz, ONLY: nbp_lon, nbp_lat
     461    USE lmdz_grid_phy, ONLY: nbp_lon, nbp_lat
    462462    USE aero_mod, ONLY: naero_tot, name_aero_tau
    463463    USE print_control_mod, ONLY: prt_level,lunout
    … …  
    532532    USE ioipsl, ONLY: histdef
    533533    USE dimphy, ONLY: klev
    534     USE mod_phys_lmdz_para, ONLY: jj_nb, is_master
     534    USE lmdz_phys_para, ONLY: jj_nb, is_master
    535535    USE phys_output_var_mod, ONLY: type_ecri, zoutm, lev_files, nid_files, &
    536536                                   nhorim, zdtime_moy, levmin, levmax, &
    537537                                   nvertm, nfiles
    538     USE mod_grid_phy_lmdz, ONLY: nbp_lon, nbp_lat
     538    USE lmdz_grid_phy, ONLY: nbp_lon, nbp_lat
    539539    USE print_control_mod, ONLY: prt_level,lunout
    540540    IMPLICIT NONE
    … …  
    582582
    583583    USE ioipsl, ONLY: histdef
    584     USE mod_phys_lmdz_para, ONLY: jj_nb, is_master
     584    USE lmdz_phys_para, ONLY: jj_nb, is_master
    585585    USE phys_output_var_mod, ONLY: ctrl_out, type_ecri_files, zoutm, zdtime_moy, &
    586586                                   clef_stations, phys_out_filenames, lev_files, &
    … …  
    588588                                   ok_4xCO2atm
    589589    USE print_control_mod, ONLY: prt_level,lunout
    590     USE mod_grid_phy_lmdz, ONLY: nbp_lon, nbp_lat
     590    USE lmdz_grid_phy, ONLY: nbp_lon, nbp_lat
    591591    USE aero_mod, ONLY: naero_tot, name_aero_tau
    592592    USE wxios, ONLY: wxios_add_field_to_file, using_xios
    … …  
    698698    USE ioipsl, ONLY: histdef
    699699    USE dimphy, ONLY: klev
    700     USE mod_phys_lmdz_para, ONLY: jj_nb, is_master
     700    USE lmdz_phys_para, ONLY: jj_nb, is_master
    701701    USE phys_output_var_mod, ONLY: ctrl_out, type_ecri_files, zoutm, zdtime_moy, &
    702702                                   clef_stations, phys_out_filenames, lev_files, &
    … …  
    704704                                   levmax, nvertm
    705705    USE print_control_mod, ONLY: prt_level,lunout
    706     USE mod_grid_phy_lmdz, ONLY: nbp_lon, nbp_lat
     706    USE lmdz_grid_phy, ONLY: nbp_lon, nbp_lat
    707707    USE wxios, ONLY: wxios_add_field_to_file, using_xios
    708708    USE print_control_mod, ONLY: prt_level,lunout
    … …  
    804804
    805805    USE dimphy, ONLY: klon
    806     USE mod_phys_lmdz_para, ONLY: Gather_omp, grid1Dto2D_mpi, &
     806    USE lmdz_phys_para, ONLY: Gather_omp, grid1Dto2D_mpi, &
    807807                                  is_sequential, klon_mpi_begin, klon_mpi_end, &
    808808                                  jj_nb, klon_mpi, is_master
    809809    USE ioipsl, ONLY: histwrite
    810810    USE print_control_mod, ONLY: prt_level,lunout
    811     USE mod_grid_phy_lmdz, ONLY: nbp_lon, nbp_lat
     811    USE lmdz_grid_phy, ONLY: nbp_lon, nbp_lat
    812812
    813813    IMPLICIT NONE
    … …  
    871871
    872872    USE dimphy, ONLY: klon
    873     USE mod_phys_lmdz_para, ONLY: Gather_omp, grid1Dto2D_mpi, &
     873    USE lmdz_phys_para, ONLY: Gather_omp, grid1Dto2D_mpi, &
    874874                                  is_sequential, klon_mpi_begin, klon_mpi_end, &
    875875                                  jj_nb, klon_mpi, is_master
    876     USE mod_grid_phy_lmdz, ONLY: nbp_lon, nbp_lat
     876    USE lmdz_grid_phy, ONLY: nbp_lon, nbp_lat
    877877    USE ioipsl, ONLY: histwrite
    878878    USE print_control_mod, ONLY: prt_level,lunout
    … …  
    942942  SUBROUTINE histwrite2d_phy(var,field, STD_iff)
    943943
    944   USE mod_phys_lmdz_omp_transfert, ONLY: bcast_omp
     944  USE lmdz_phys_omp_transfert, ONLY: bcast_omp
    945945  USE dimphy, ONLY: klon, klev
    946   USE mod_phys_lmdz_para, ONLY: gather_omp, grid1dto2d_mpi, &
     946  USE lmdz_phys_para, ONLY: gather_omp, grid1dto2d_mpi, &
    947947                                jj_nb, klon_mpi, klon_mpi_begin, &
    948948                                klon_mpi_end, is_sequential, is_master
    … …  
    952952                                 nid_files, swaerofree_diag, swaero_diag, dryaod_diag, ok_4xCO2atm
    953953  USE print_control_mod, ONLY: prt_level,lunout
    954   USE mod_grid_phy_lmdz, ONLY: nbp_lon, nbp_lat, grid_type, unstructured, regular_lonlat
     954  USE lmdz_grid_phy, ONLY: nbp_lon, nbp_lat, grid_type, unstructured, regular_lonlat
    955955  USE lmdz_xios, ONLY: xios_send_field, xios_field_is_active, using_xios
    956956  USE print_control_mod, ONLY: lunout, prt_level
    … …  
    11551155  SUBROUTINE histwrite3d_phy(var, field, STD_iff)
    11561156
    1157   USE mod_phys_lmdz_omp_transfert, ONLY: bcast_omp
     1157  USE lmdz_phys_omp_transfert, ONLY: bcast_omp
    11581158  USE dimphy, ONLY: klon, klev
    1159   USE mod_phys_lmdz_para, ONLY: gather_omp, grid1dto2d_mpi, &
     1159  USE lmdz_phys_para, ONLY: gather_omp, grid1dto2d_mpi, &
    11601160                                jj_nb, klon_mpi, klon_mpi_begin, &
    11611161                                klon_mpi_end, is_sequential, is_master
    … …  
    11641164                                 nfiles, vars_defined, clef_stations, &
    11651165                                 nid_files, swaerofree_diag
    1166   USE mod_grid_phy_lmdz, ONLY: nbp_lon, nbp_lat, grid_type, regular_lonlat, unstructured
     1166  USE lmdz_grid_phy, ONLY: nbp_lon, nbp_lat, grid_type, regular_lonlat, unstructured
    11671167  USE lmdz_xios, ONLY: xios_send_field, xios_field_is_active, using_xios
    11681168  USE print_control_mod, ONLY: prt_level,lunout
    … …  
    13571357
    13581358  USE dimphy, ONLY: klon, klev
    1359   USE mod_phys_lmdz_para, ONLY: gather_omp, grid1Dto2D_mpi, &
     1359  USE lmdz_phys_para, ONLY: gather_omp, grid1Dto2D_mpi, &
    13601360                                is_sequential, klon_mpi_begin, klon_mpi_end, &
    13611361                                jj_nb, klon_mpi, is_master
    1362   USE mod_grid_phy_lmdz, ONLY: nbp_lon, nbp_lat, grid_type, unstructured
     1362  USE lmdz_grid_phy, ONLY: nbp_lon, nbp_lat, grid_type, unstructured
    13631363  USE lmdz_xios, ONLY: xios_send_field
    13641364  USE print_control_mod, ONLY: prt_level,lunout
    … …  
    14401440
    14411441  USE dimphy, ONLY: klon, klev
    1442   USE mod_phys_lmdz_para, ONLY: gather_omp, grid1Dto2D_mpi, &
     1442  USE lmdz_phys_para, ONLY: gather_omp, grid1Dto2D_mpi, &
    14431443                                is_sequential, klon_mpi_begin, klon_mpi_end, &
    14441444                                jj_nb, klon_mpi, is_master
    14451445  USE lmdz_xios, ONLY: xios_send_field
    1446   USE mod_grid_phy_lmdz, ONLY: nbp_lon, nbp_lat, grid_type, unstructured
     1446  USE lmdz_grid_phy, ONLY: nbp_lon, nbp_lat, grid_type, unstructured
    14471447  USE print_control_mod, ONLY: prt_level,lunout
    14481448
    … …  
    15281528  SUBROUTINE histwrite0d_xios(field_name, field)
    15291529  USE lmdz_xios, ONLY: xios_send_field
    1530   USE mod_phys_lmdz_para, ONLY: is_master
     1530  USE lmdz_phys_para, ONLY: is_master
    15311531  USE print_control_mod, ONLY: prt_level,lunout
    15321532  USE phys_output_var_mod, ONLY: vars_defined

  • LMDZ6/branches/Amaury_dev/libf/phylmd/iophys.F90

    r5103 r5110  
    66      SUBROUTINE iophys_ecrit(nom,lllm,titre,unite,px)
    77
    8       USE mod_phys_lmdz_para, ONLY: klon_omp, is_mpi_root
    9       USE mod_phys_lmdz_transfert_para, ONLY: gather
    10       USE mod_grid_phy_lmdz, ONLY: klon_glo, nbp_lon, nbp_lat, grid1dto2d_glo
     8      USE lmdz_phys_para, ONLY: klon_omp, is_mpi_root
     9      USE lmdz_phys_transfert_para, ONLY: gather
     10      USE lmdz_grid_phy, ONLY: klon_glo, nbp_lon, nbp_lat, grid1dto2d_glo
    1111      IMPLICIT NONE
    1212
    … …  
    7676    SUBROUTINE iophys_ecrit_index(nom,lllm,titre,unite,knon,knindex,px)
    7777
    78     USE mod_phys_lmdz_para, ONLY: klon_omp
     78    USE lmdz_phys_para, ONLY: klon_omp
    7979    USE dimphy, ONLY: klon
    80     USE mod_grid_phy_lmdz, ONLY: klon_glo
     80    USE lmdz_grid_phy, ONLY: klon_glo
    8181    IMPLICIT NONE
    8282
    … …  
    110110!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
    111111      SUBROUTINE iophys_ini(timestep)
    112       USE mod_phys_lmdz_para, ONLY: is_mpi_root
     112      USE lmdz_phys_para, ONLY: is_mpi_root
    113113      USE vertical_layers_mod, ONLY: presnivs
    114114      USE regular_lonlat_mod, ONLY: lon_reg, lat_reg
    115115      USE dimphy, ONLY: klev
    116       USE mod_grid_phy_lmdz, ONLY: klon_glo
     116      USE lmdz_grid_phy, ONLY: klon_glo
    117117      USE time_phylmdz_mod, ONLY: annee_ref, day_ref, day_ini
    118118      USE phys_cal_mod, ONLY: calend

  • LMDZ6/branches/Amaury_dev/libf/phylmd/iostart.F90

    r5101 r5110  
    3131  SUBROUTINE Open_startphy(filename)
    3232  USE netcdf, ONLY: nf90_nowrite, nf90_noerr,nf90_open
    33   USE mod_phys_lmdz_para
     33  USE lmdz_phys_para
    3434  IMPLICIT NONE
    3535    CHARACTER(LEN=*) :: filename
    … …  
    4949  SUBROUTINE Close_startphy
    5050  USE netcdf, ONLY: nf90_close
    51   USE mod_phys_lmdz_para
     51  USE lmdz_phys_para
    5252  IMPLICIT NONE
    5353    INTEGER          :: ierr
    … …  
    6262  FUNCTION Inquire_Field(Field_name)
    6363  USE netcdf, ONLY: nf90_noerr,nf90_inq_varid
    64   USE mod_phys_lmdz_para
     64  USE lmdz_phys_para
    6565  IMPLICIT NONE
    6666    CHARACTER(LEN=*) :: Field_name
    … …  
    118118  USE dimphy
    119119  USE geometry_mod
    120   USE mod_grid_phy_lmdz
    121   USE mod_phys_lmdz_para
     120  USE lmdz_grid_phy
     121  USE lmdz_phys_para
    122122  IMPLICIT NONE
    123123    CHARACTER(LEN=*) :: Field_name
    … …  
    253253  USE netcdf, ONLY: nf90_noerr,nf90_get_var,nf90_inq_varid
    254254  USE dimphy
    255   USE mod_grid_phy_lmdz
    256   USE mod_phys_lmdz_para
     255  USE lmdz_grid_phy
     256  USE lmdz_phys_para
    257257  IMPLICIT NONE
    258258    CHARACTER(LEN=*) :: var_name
    … …  
    303303  USE netcdf, ONLY: nf90_create,nf90_clobber,nf90_64bit_offset,nf90_noerr,nf90_strerror,&
    304304          nf90_global,nf90_put_att,nf90_def_dim
    305   USE mod_phys_lmdz_para, ONLY: is_master
    306   USE mod_grid_phy_lmdz, ONLY: klon_glo
     305  USE lmdz_phys_para, ONLY: is_master
     306  USE lmdz_grid_phy, ONLY: klon_glo
    307307  USE dimphy, ONLY: klev, klevp1
    308308  USE print_control_mod, ONLY: lunout
    … …  
    334334  SUBROUTINE enddef_restartphy
    335335  USE netcdf, ONLY: nf90_enddef
    336   USE mod_phys_lmdz_para
     336  USE lmdz_phys_para
    337337  IMPLICIT NONE
    338338    INTEGER          :: ierr
    … …  
    344344  SUBROUTINE close_restartphy
    345345  USE netcdf, ONLY: nf90_close
    346   USE mod_phys_lmdz_para
     346  USE lmdz_phys_para
    347347  IMPLICIT NONE
    348348    INTEGER          :: ierr
    … …  
    390390  USE dimphy
    391391  USE geometry_mod
    392   USE mod_grid_phy_lmdz
    393   USE mod_phys_lmdz_para
     392  USE lmdz_grid_phy
     393  USE lmdz_phys_para
    394394  IMPLICIT NONE
    395395  INTEGER, INTENT(IN)            :: pass
    … …  
    513513  USE lmdz_cppkeys_wrapper, ONLY: nf90_format
    514514  USE dimphy
    515   USE mod_phys_lmdz_para
     515  USE lmdz_phys_para
    516516  IMPLICIT NONE
    517517    INTEGER, INTENT(IN)         :: pass

  • LMDZ6/branches/Amaury_dev/libf/phylmd/limit_read_mod.F90

    r5103 r5110  
    3333
    3434  SUBROUTINE init_limit_read(first_day)
    35   USE mod_grid_phy_lmdz
     35  USE lmdz_grid_phy
    3636  USE surface_data
    37   USE mod_phys_lmdz_para
     37  USE lmdz_phys_para
    3838  USE lmdz_xios
    3939
    … …  
    162162
    163163    USE dimphy
    164     USE mod_grid_phy_lmdz
    165     USE mod_phys_lmdz_para
     164    USE lmdz_grid_phy
     165    USE lmdz_phys_para
    166166    USE surface_data, ONLY: type_ocean, ok_veget
    167167    USE netcdf, ONLY:nf90_get_var,nf90_inq_varid,nf90_close,nf90_inquire_dimension,&

  • LMDZ6/branches/Amaury_dev/libf/phylmd/limit_slab.F90

    r5103 r5110  
    44
    55  USE dimphy
    6   USE mod_grid_phy_lmdz, ONLY: klon_glo
    7   USE mod_phys_lmdz_para
     6  USE lmdz_grid_phy, ONLY: klon_glo
     7  USE lmdz_phys_para
    88  USE netcdf, ONLY: nf90_close,nf90_get_var,nf90_inq_varid,nf90_nowrite,nf90_noerr,nf90_open
    99  USE indice_sol_mod

  • LMDZ6/branches/Amaury_dev/libf/phylmd/lsc_scav.F90

    r5103 r5110  
    77  USE ioipsl
    88  USE dimphy
    9   USE mod_grid_phy_lmdz
    10   USE mod_phys_lmdz_para
     9  USE lmdz_grid_phy
     10  USE lmdz_phys_para
    1111  USE traclmdz_mod
    1212  USE infotrac_phy,ONLY: nbtr

  • LMDZ6/branches/Amaury_dev/libf/phylmd/mo_simple_plumes.F90

    r5106 r5110  
    7474  SUBROUTINE sp_setup
    7575
    76     USE mod_phys_lmdz_mpi_data, ONLY: is_mpi_root
    77     USE mod_phys_lmdz_omp_data, ONLY: is_omp_root
    78     USE mod_phys_lmdz_transfert_para, ONLY: bcast
     76    USE lmdz_phys_mpi_data, ONLY: is_mpi_root
     77    USE lmdz_phys_omp_data, ONLY: is_omp_root
     78    USE lmdz_phys_transfert_para, ONLY: bcast
    7979
    8080    ! ----------

  • LMDZ6/branches/Amaury_dev/libf/phylmd/mod_surf_para.F90

    r4600 r5110  
    4949
    5050  SUBROUTINE Init_surf_para(knon)
    51   USE mod_phys_lmdz_para
     51  USE lmdz_phys_para
    5252  USE lmdz_mpi
    5353
    … …  
    116116 
    117117  SUBROUTINE Finalize_surf_para
    118   USE mod_phys_lmdz_para
     118  USE lmdz_phys_para
    119119
    120120!$OMP BARRIER   
    … …  
    135135 
    136136  SUBROUTINE gather_surf_i(FieldIn, FieldOut)
    137   USE mod_phys_lmdz_para
     137  USE lmdz_phys_para
    138138    INTEGER :: FieldIn(:)
    139139    INTEGER :: FieldOut(:)
    … …  
    147147
    148148  SUBROUTINE gather_surf_omp_i(FieldIn,FieldOut)
    149   USE mod_phys_lmdz_para
     149  USE lmdz_phys_para
    150150    INTEGER :: FieldIn(:)
    151151    INTEGER :: FieldOut(:)
    … …  
    165165     
    166166  SUBROUTINE gather_surf_mpi_i(FieldIn,FieldOut)
    167   USE mod_phys_lmdz_para
     167  USE lmdz_phys_para
    168168  USE lmdz_mpi
    169169
    … …  
    187187
    188188  SUBROUTINE gather_surf_r(FieldIn, FieldOut)
    189   USE mod_phys_lmdz_para
     189  USE lmdz_phys_para
    190190    REAL :: FieldIn(:)
    191191    REAL :: FieldOut(:)
    … …  
    199199
    200200  SUBROUTINE gather_surf_omp_r(FieldIn,FieldOut)
    201   USE mod_phys_lmdz_para
     201  USE lmdz_phys_para
    202202    REAL :: FieldIn(:)
    203203    REAL :: FieldOut(:)
    … …  
    217217     
    218218  SUBROUTINE gather_surf_mpi_r(FieldIn,FieldOut)
    219   USE mod_phys_lmdz_para
     219  USE lmdz_phys_para
    220220  USE lmdz_mpi
    221221
    … …  
    238238
    239239  SUBROUTINE scatter_surf_i(FieldIn, FieldOut)
    240   USE mod_phys_lmdz_para
     240  USE lmdz_phys_para
    241241    INTEGER :: FieldIn(:)
    242242    INTEGER :: FieldOut(:)
    … …  
    250250
    251251  SUBROUTINE scatter_surf_omp_i(FieldIn,FieldOut)
    252   USE mod_phys_lmdz_para
     252  USE lmdz_phys_para
    253253    INTEGER :: FieldIn(:)
    254254    INTEGER :: FieldOut(:)
    … …  
    267267     
    268268  SUBROUTINE scatter_surf_mpi_i(FieldIn,FieldOut)
    269   USE mod_phys_lmdz_para
     269  USE lmdz_phys_para
    270270  USE lmdz_mpi
    271271
    … …  
    287287
    288288  SUBROUTINE scatter_surf_r(FieldIn, FieldOut)
    289   USE mod_phys_lmdz_para
     289  USE lmdz_phys_para
    290290    REAL :: FieldIn(:)
    291291    REAL :: FieldOut(:)
    … …  
    299299
    300300  SUBROUTINE scatter_surf_omp_r(FieldIn,FieldOut)
    301   USE mod_phys_lmdz_para
     301  USE lmdz_phys_para
    302302    REAL :: FieldIn(:)
    303303    REAL :: FieldOut(:)
    … …  
    316316     
    317317  SUBROUTINE scatter_surf_mpi_r(FieldIn,FieldOut)
    318   USE mod_phys_lmdz_para
     318  USE lmdz_phys_para
    319319  USE lmdz_mpi
    320320

  • LMDZ6/branches/Amaury_dev/libf/phylmd/mod_synchro_omp.F90

    r5099 r5110  
    99
    1010  SUBROUTINE Init_synchro_omp
    11   USE mod_phys_lmdz_para
     11  USE lmdz_phys_para
    1212  IMPLICIT NONE
    1313
    … …  
    2121 
    2222  SUBROUTINE Synchro_omp 
    23   USE mod_phys_lmdz_para
     23  USE lmdz_phys_para
    2424  IMPLICIT NONE
    2525  LOGICAL :: out

  • LMDZ6/branches/Amaury_dev/libf/phylmd/o3_chem_m.F90

    r5103 r5110  
    2020    use dimphy, only: klon
    2121    use regr_pr_comb_coefoz_m, only: c_Mob, a4_mass, a2, r_het_interm
    22     use mod_grid_phy_lmdz, only: nbp_lev
     22    use lmdz_grid_phy, only: nbp_lev
    2323    use nrtype, only: pi
    2424
    … …  
    118118    use assert_m, only: assert
    119119    use dimphy, only: klon
    120     use mod_grid_phy_lmdz, only: nbp_lev
     120    use lmdz_grid_phy, only: nbp_lev
    121121
    122122    real, intent(in):: q(:, :) ! mass fraction of ozone

  • LMDZ6/branches/Amaury_dev/libf/phylmd/oasis.F90

    r5103 r5110  
    1111
    1212  USE dimphy
    13   USE mod_phys_lmdz_para
     13  USE lmdz_phys_para
    1414  USE write_field_phy
    1515
    … …  
    118118    USE lmdz_xios 
    119119    USE print_control_mod, ONLY: lunout
    120     USE mod_grid_phy_lmdz, ONLY: nbp_lon, nbp_lat, grid_type, unstructured, regular_lonlat
     120    USE lmdz_grid_phy, ONLY: nbp_lon, nbp_lat, grid_type, unstructured, regular_lonlat
    121121    USE geometry_mod, ONLY: ind_cell_glo                   
    122     USE mod_phys_lmdz_mpi_data, ONLY: klon_mpi_para_nb
     122    USE lmdz_phys_mpi_data, ONLY: klon_mpi_para_nb
    123123    use config_ocean_skin_m, only: activate_ocean_skin
    124124
    … …  
    404404
    405405    USE print_control_mod, ONLY: lunout
    406     USE mod_grid_phy_lmdz, ONLY: nbp_lon, nbp_lat
     406    USE lmdz_grid_phy, ONLY: nbp_lon, nbp_lat
    407407! Input arguments
    408408!************************************************************************************
    … …  
    464464
    465465    USE print_control_mod, ONLY: lunout
    466     USE mod_grid_phy_lmdz, ONLY: nbp_lon, nbp_lat
     466    USE lmdz_grid_phy, ONLY: nbp_lon, nbp_lat
    467467! Input arguments
    468468!************************************************************************************

  • LMDZ6/branches/Amaury_dev/libf/phylmd/ocean_forced_mod.F90

    r5103 r5110  
    3737    USE calcul_fluxs_mod
    3838    USE limit_read_mod
    39     USE mod_grid_phy_lmdz
     39    USE lmdz_grid_phy
    4040    USE indice_sol_mod
    4141    USE phys_output_var_mod, ONLY: sens_prec_liq_o, sens_prec_sol_o, lat_prec_liq_o, lat_prec_sol_o

  • LMDZ6/branches/Amaury_dev/libf/phylmd/ocean_slab_mod.F90

    r5101 r5110  
    88  USE indice_sol_mod
    99  USE surface_data
    10   USE mod_grid_phy_lmdz, ONLY: klon_glo
    11   USE mod_phys_lmdz_mpi_data, ONLY: is_mpi_root
     10  USE lmdz_grid_phy, ONLY: klon_glo
     11  USE lmdz_phys_mpi_data, ONLY: is_mpi_root
    1212
    1313  IMPLICIT NONE
    … …  
    129129
    130130    USE ioipsl_getin_p_mod, ONLY: getin_p
    131     USE mod_phys_lmdz_transfert_para, ONLY: gather
     131    USE lmdz_phys_transfert_para, ONLY: gather
    132132    USE slab_heat_transp_mod, ONLY: ini_slab_transp
    133133
    … …  
    344344    USE calcul_fluxs_mod
    345345    USE slab_heat_transp_mod, ONLY: divgrad_phy,slab_ekman1,slab_ekman2,slab_gmdiff
    346     USE mod_phys_lmdz_para
     346    USE lmdz_phys_para
    347347
    348348    INCLUDE "clesphys.h"

  • LMDZ6/branches/Amaury_dev/libf/phylmd/open_climoz_m.F90

    r5101 r5110  
    1414  USE netcdf95, ONLY: nf95_open, nf95_close, nf95_gw_var, nf95_inq_varid
    1515  USE netcdf,   ONLY: nf90_nowrite
    16   USE mod_phys_lmdz_mpi_data,      ONLY: is_mpi_root
    17   USE mod_phys_lmdz_mpi_transfert, ONLY: bcast_mpi
     16  USE lmdz_phys_mpi_data,      ONLY: is_mpi_root
     17  USE lmdz_phys_mpi_transfert, ONLY: bcast_mpi
    1818  USE phys_cal_mod,                ONLY: calend, year_len, year_cur
    1919!-------------------------------------------------------------------------------

  • LMDZ6/branches/Amaury_dev/libf/phylmd/orografi.F90

    r5105 r5110  
    15571557SUBROUTINE sugwd(nlon, nlev, paprs, pplay)
    15581558  USE dimphy
    1559   USE mod_phys_lmdz_para
    1560   USE mod_grid_phy_lmdz
     1559  USE lmdz_phys_para
     1560  USE lmdz_grid_phy
    15611561  ! USE parallel
    15621562

  • LMDZ6/branches/Amaury_dev/libf/phylmd/orografi_strato.F90

    r5105 r5110  
    18171817  ! ------------------------------------------------------------------
    18181818  USE dimphy
    1819   USE mod_phys_lmdz_para
    1820   USE mod_grid_phy_lmdz
     1819  USE lmdz_phys_para
     1820  USE lmdz_grid_phy
    18211821  USE geometry_mod
    18221822  IMPLICIT NONE

  • LMDZ6/branches/Amaury_dev/libf/phylmd/output_physiqex_mod.F90

    r5103 r5110  
    1010      USE iophy, ONLY: histbeg_phy,histwrite_phy
    1111      USE ioipsl, ONLY: histvert,histdef,histend,histsync
    12       USE mod_phys_lmdz_para, ONLY: jj_nb
     12      USE lmdz_phys_para, ONLY: jj_nb
    1313      USE ioipsl_getin_p_mod, ONLY: getin_p
    14       USE mod_grid_phy_lmdz, ONLY: nbp_lon,nbp_lat
     14      USE lmdz_grid_phy, ONLY: nbp_lon,nbp_lat
    1515      USE iophy, ONLY: init_iophy_new
    1616      USE geometry_mod, ONLY: latitude_deg, longitude_deg

  • LMDZ6/branches/Amaury_dev/libf/phylmd/paramlmdz_phy_mod.F90

    r5103 r5110  
    1111    USE dimphy
    1212    USE ioipsl, only: histbeg, histvert, histdef, histend, ymds2ju
    13     USE mod_phys_lmdz_mpi_data, ONLY: is_mpi_root
     13    USE lmdz_phys_mpi_data, ONLY: is_mpi_root
    1414    USE geometry_mod, ONLY: longitude_deg, latitude_deg
    15     USE mod_grid_phy_lmdz, only: nbp_lon, nbp_lat, klon_glo
     15    USE lmdz_grid_phy, only: nbp_lon, nbp_lat, klon_glo
    1616    USE time_phylmdz_mod, ONLY: annee_ref, day_ref, itau_phy, pdtphys
    17     USE mod_phys_lmdz_transfert_para, ONLY: gather, bcast
     17    USE lmdz_phys_transfert_para, ONLY: gather, bcast
    1818
    1919    IMPLICIT NONE
    … …  
    143143  SUBROUTINE write_paramLMDZ_phy(itap,nid_ctesGCM,ok_sync)
    144144
    145     USE mod_phys_lmdz_mpi_data, ONLY: is_mpi_root
     145    USE lmdz_phys_mpi_data, ONLY: is_mpi_root
    146146    USE time_phylmdz_mod, ONLY: day_step_phy, annee_ref, itau_phy, start_time
    147     USE mod_grid_phy_lmdz, only: nbp_lon, nbp_lat, klon_glo
     147    USE lmdz_grid_phy, only: nbp_lon, nbp_lat, klon_glo
    148148
    149149    USE iophy

  • LMDZ6/branches/Amaury_dev/libf/phylmd/pbl_surface_mod.F90

    r5103 r5110  
    1111
    1212  USE dimphy
    13   USE mod_phys_lmdz_para,  ONLY: mpi_size
    14   USE mod_grid_phy_lmdz,   ONLY: klon_glo
     13  USE lmdz_phys_para,  ONLY: mpi_size
     14  USE lmdz_grid_phy,   ONLY: klon_glo
    1515  USE ioipsl
    1616  USE surface_data,        ONLY: type_ocean, ok_veget, landice_opt
    … …  
    396396    USE indice_sol_mod
    397397    USE time_phylmdz_mod,   ONLY: day_ini,annee_ref,itau_phy
    398     USE mod_grid_phy_lmdz,  ONLY: nbp_lon, nbp_lat, grid1dto2d_glo
     398    USE lmdz_grid_phy,  ONLY: nbp_lon, nbp_lat, grid1dto2d_glo
    399399    USE print_control_mod,  ONLY: prt_level,lunout
    400400#ifdef ISO

  • LMDZ6/branches/Amaury_dev/libf/phylmd/phyaqua_mod.F90

    r5105 r5110  
    3333    USE nrtype, ONLY: pi
    3434!    USE ioipsl
    35     USE mod_phys_lmdz_para, ONLY: is_master
    36     USE mod_phys_lmdz_transfert_para, ONLY: bcast
    37     USE mod_grid_phy_lmdz
     35    USE lmdz_phys_para, ONLY: is_master
     36    USE lmdz_phys_transfert_para, ONLY: bcast
     37    USE lmdz_grid_phy
    3838    USE ioipsl_getin_p_mod, ONLY: getin_p
    3939    USE phys_cal_mod , ONLY: calend, year_len_phy => year_len
    … …  
    512512      phy_ice, phy_fter, phy_foce, phy_flic, phy_fsic)
    513513
    514     USE mod_phys_lmdz_para, ONLY: is_omp_master, klon_mpi
    515     USE mod_phys_lmdz_transfert_para, ONLY: gather_omp
     514    USE lmdz_phys_para, ONLY: is_omp_master, klon_mpi
     515    USE lmdz_phys_transfert_para, ONLY: gather_omp
    516516    USE lmdz_xios
    517517    IMPLICIT NONE
    … …  
    566566      phy_ice, phy_fter, phy_foce, phy_flic, phy_fsic)
    567567
    568     USE mod_phys_lmdz_para, ONLY: is_master
    569     USE mod_grid_phy_lmdz, ONLY: klon_glo
    570     USE mod_phys_lmdz_transfert_para, ONLY: gather
     568    USE lmdz_phys_para, ONLY: is_master
     569    USE lmdz_grid_phy, ONLY: klon_glo
     570    USE lmdz_phys_transfert_para, ONLY: gather
    571571    USE phys_cal_mod, ONLY: year_len
    572572    USE netcdf, ONLY: nf90_def_var, nf90_put_var, nf90_get_var, nf90_strerror, nf90_close, &

  • LMDZ6/branches/Amaury_dev/libf/phylmd/phys_cal_mod.F90

    r5103 r5110  
    3838
    3939    USE IOIPSL, ONLY:  ymds2ju, ioconf_calendar
    40     USE mod_phys_lmdz_para, ONLY:  is_master,is_omp_master
     40    USE lmdz_phys_para, ONLY:  is_master,is_omp_master
    4141    USE ioipsl_getin_p_mod, ONLY: getin_p
    4242

  • LMDZ6/branches/Amaury_dev/libf/phylmd/phys_output_mod.F90

    r5103 r5110  
    3838    USE ioipsl
    3939    USE phys_cal_mod, ONLY: hour, calend
    40     USE mod_phys_lmdz_para
     40    USE lmdz_phys_para
    4141    !Martin
    4242    USE surface_data, ONLY: landice_opt
    4343    USE phys_output_ctrlout_mod
    44     USE mod_grid_phy_lmdz, only: klon_glo,nbp_lon,nbp_lat
     44    USE lmdz_grid_phy, only: klon_glo,nbp_lon,nbp_lat
    4545    USE print_control_mod, ONLY: prt_level,lunout
    4646    USE vertical_layers_mod, ONLY: ap,bp,preff,presnivs, aps, bps, pseudoalt, presinter

  • LMDZ6/branches/Amaury_dev/libf/phylmd/phys_output_write_mod.F90

    r5103 r5110  
    2727    USE infotrac_phy, ONLY: nbtr, nqtot, nqo, type_trac, tracers, niso, ntiso
    2828    USE strings_mod,  ONLY: maxlen
    29     USE mod_phys_lmdz_para, ONLY: is_north_pole_phy,is_south_pole_phy
    30     USE mod_grid_phy_lmdz, ONLY: nbp_lon, nbp_lat
     29    USE lmdz_phys_para, ONLY: is_north_pole_phy,is_south_pole_phy
     30    USE lmdz_grid_phy, ONLY: nbp_lon, nbp_lat
    3131    USE time_phylmdz_mod, ONLY: day_step_phy, start_time, itau_phy
    3232    USE vertical_layers_mod, ONLY: ap, bp, aps, bps

  • LMDZ6/branches/Amaury_dev/libf/phylmd/physiq_mod.F90

    r5106 r5110  
    4343    USE iophy
    4444    USE limit_read_mod, ONLY: init_limit_read
    45     USE mod_grid_phy_lmdz, ONLY: nbp_lon, nbp_lat, nbp_lev, klon_glo, grid1dTo2d_glo, grid_type, unstructured
    46     USE mod_phys_lmdz_mpi_data, ONLY: is_mpi_root
    47     USE mod_phys_lmdz_para
     45    USE lmdz_grid_phy, ONLY: nbp_lon, nbp_lat, nbp_lev, klon_glo, grid1dTo2d_glo, grid_type, unstructured
     46    USE lmdz_phys_mpi_data, ONLY: is_mpi_root
     47    USE lmdz_phys_para
    4848    USE netcdf95, ONLY: nf95_close
    4949    USE netcdf, ONLY: nf90_fill_real     ! IM for NMC files

  • LMDZ6/branches/Amaury_dev/libf/phylmd/phystokenc_mod.F90

    r5106 r5110  
    3838  USE indice_sol_mod
    3939  USE print_control_mod, ONLY: lunout
    40   USE mod_grid_phy_lmdz, ONLY: nbp_lon, nbp_lat
     40  USE lmdz_grid_phy, ONLY: nbp_lon, nbp_lat
    4141 
    4242  IMPLICIT NONE

  • LMDZ6/branches/Amaury_dev/libf/phylmd/phytrac_mod.F90

    r5103 r5110  
    124124    USE infotrac_phy, ONLY: nbtr, nqCO2, type_trac, conv_flg, pbl_flg
    125125    USE strings_mod, ONLY: int2str
    126     USE mod_grid_phy_lmdz
    127     USE mod_phys_lmdz_para
     126    USE lmdz_grid_phy
     127    USE lmdz_phys_para
    128128    USE iophy
    129129    USE traclmdz_mod
    … …  
    131131    USE tracreprobus_mod
    132132    USE indice_sol_mod
    133     USE mod_phys_lmdz_mpi_data, ONLY: is_mpi_root
     133    USE lmdz_phys_mpi_data, ONLY: is_mpi_root
    134134    USE print_control_mod, ONLY: lunout
    135135    USE aero_mod, ONLY: naero_grp

  • LMDZ6/branches/Amaury_dev/libf/phylmd/press_coefoz_m.F90

    r5103 r5110  
    2626    use netcdf, only: nf90_nowrite
    2727
    28     use mod_phys_lmdz_mpi_data, only: is_mpi_root
    29     use mod_phys_lmdz_mpi_transfert, only: bcast_mpi ! broadcast
     28    use lmdz_phys_mpi_data, only: is_mpi_root
     29    use lmdz_phys_mpi_transfert, only: bcast_mpi ! broadcast
    3030
    3131    ! Variables local to the procedure:

  • LMDZ6/branches/Amaury_dev/libf/phylmd/read_map2D.F90

    r5101 r5110  
    44  USE dimphy
    55  USE netcdf, ONLY: nf90_open,nf90_close,nf90_nowrite,nf90_noerr,nf90_get_var,nf90_inq_varid
    6   USE mod_grid_phy_lmdz
    7   USE mod_phys_lmdz_para
     6  USE lmdz_grid_phy
     7  USE lmdz_phys_para
    88  USE print_control_mod, ONLY: lunout
    99

  • LMDZ6/branches/Amaury_dev/libf/phylmd/read_pstoke.F90

    r5105 r5110  
    2121  USE dimphy
    2222  USE indice_sol_mod
    23   USE mod_grid_phy_lmdz, ONLY: nbp_lon, nbp_lat, nbp_lev
     23  USE lmdz_grid_phy, ONLY: nbp_lon, nbp_lat, nbp_lev
    2424
    2525  IMPLICIT NONE

  • LMDZ6/branches/Amaury_dev/libf/phylmd/read_pstoke0.F90

    r5105 r5110  
    2020  USE dimphy
    2121  USE indice_sol_mod
    22   USE mod_grid_phy_lmdz, ONLY: nbp_lon, nbp_lat, nbp_lev
     22  USE lmdz_grid_phy, ONLY: nbp_lon, nbp_lat, nbp_lev
    2323
    2424  IMPLICIT NONE

  • LMDZ6/branches/Amaury_dev/libf/phylmd/readaerosol_interp.F90

    r5103 r5110  
    1515  USE ioipsl
    1616  USE dimphy, ONLY: klev,klon
    17   USE mod_phys_lmdz_para, ONLY: mpi_rank
     17  USE lmdz_phys_para, ONLY: mpi_rank
    1818  USE readaerosol_mod
    1919  USE aero_mod, ONLY: naero_spc, name_aero

  • LMDZ6/branches/Amaury_dev/libf/phylmd/readaerosol_mod.F90

    r5101 r5110  
    177177
    178178SUBROUTINE init_aero_fromfile(flag_aerosol, aerosol_couple)
    179   USE mod_phys_lmdz_para
    180   USE mod_grid_phy_lmdz, ONLY: grid_type, unstructured
     179  USE lmdz_phys_para
     180  USE lmdz_grid_phy, ONLY: grid_type, unstructured
    181181  USE lmdz_xios
    182182  IMPLICIT NONE
    … …  
    268268
    269269    USE dimphy
    270     USE mod_grid_phy_lmdz, ONLY: nbp_lon_=>nbp_lon, nbp_lat_=>nbp_lat, klon_glo, &
     270    USE lmdz_grid_phy, ONLY: nbp_lon_=>nbp_lon, nbp_lat_=>nbp_lat, klon_glo, &
    271271                                 grid2Dto1D_glo, grid_type, unstructured
    272     USE mod_phys_lmdz_para
     272    USE lmdz_phys_para
    273273    USE iophy, ONLY: io_lon, io_lat
    274274    USE print_control_mod, ONLY: lunout

  • LMDZ6/branches/Amaury_dev/libf/phylmd/readaerosolstrato.F90

    r5103 r5110  
    66
    77    USE phys_cal_mod, ONLY: mth_cur
    8     USE mod_grid_phy_lmdz, ONLY: nbp_lon, nbp_lat, klon_glo, &
     8    USE lmdz_grid_phy, ONLY: nbp_lon, nbp_lat, klon_glo, &
    99                                 grid2dto1d_glo, grid_type, unstructured
    10     USE mod_phys_lmdz_mpi_data, ONLY:  is_mpi_root
    11     USE mod_phys_lmdz_omp_data, ONLY:  is_omp_root
    12     USE mod_phys_lmdz_para
     10    USE lmdz_phys_mpi_data, ONLY:  is_mpi_root
     11    USE lmdz_phys_omp_data, ONLY:  is_omp_root
     12    USE lmdz_phys_para
    1313    USE phys_state_var_mod
    1414    USE phys_local_var_mod

  • LMDZ6/branches/Amaury_dev/libf/phylmd/readaerosolstrato_m.F90

    r5101 r5110  
    55
    66  SUBROUTINE init_readaerosolstrato(flag_aerosol_strat)
    7   USE mod_grid_phy_lmdz, ONLY: grid_type, unstructured
     7  USE lmdz_grid_phy, ONLY: grid_type, unstructured
    88  IMPLICIT NONE
    99  INTEGER,INTENT(IN) :: flag_aerosol_strat
    … …  
    2727  USE netcdf95, ONLY: nf95_close, nf95_gw_var, nf95_inq_dimid, &
    2828                      nf95_inq_varid, nf95_open
    29   USE mod_phys_lmdz_para
     29  USE lmdz_phys_para
    3030  USE lmdz_xios
    3131!  USE YOERAD, ONLY: NLW
    … …  
    7070  USE netcdf95, ONLY: nf95_close, nf95_gw_var, nf95_inq_dimid, &
    7171                      nf95_inq_varid, nf95_open
    72   USE mod_phys_lmdz_para
     72  USE lmdz_phys_para
    7373  USE lmdz_xios
    7474!  USE YOERAD, ONLY: NLW

  • LMDZ6/branches/Amaury_dev/libf/phylmd/readchlorophyll.F90

    r5099 r5110  
    1010    USE netcdf, ONLY: nf90_get_var, nf90_noerr, nf90_nowrite
    1111    USE phys_cal_mod, ONLY: mth_cur
    12     USE mod_grid_phy_lmdz, ONLY: nbp_lon, nbp_lat, klon_glo, grid2dto1d_glo
    13     USE mod_phys_lmdz_mpi_data, ONLY: is_mpi_root
    14     USE mod_phys_lmdz_omp_data, ONLY: is_omp_root
    15     USE mod_phys_lmdz_para, ONLY: scatter
     12    USE lmdz_grid_phy, ONLY: nbp_lon, nbp_lat, klon_glo, grid2dto1d_glo
     13    USE lmdz_phys_mpi_data, ONLY: is_mpi_root
     14    USE lmdz_phys_omp_data, ONLY: is_omp_root
     15    USE lmdz_phys_para, ONLY: scatter
    1616    USE phys_state_var_mod, ONLY: chl_con
    1717    USE print_control_mod, ONLY: prt_level,lunout

  • LMDZ6/branches/Amaury_dev/libf/phylmd/regr_horiz_time_climoz_m.F90

    r5103 r5110  
    22
    33  USE interpolation, ONLY: locate
    4   USE mod_grid_phy_lmdz, ONLY: nbp_lon, nbp_lat, grid_type, unstructured
     4  USE lmdz_grid_phy, ONLY: nbp_lon, nbp_lat, grid_type, unstructured
    55  USE nrtype, ONLY: pi
    66  USE netcdf, ONLY: nf90_clobber, nf90_float, nf90_open, &
    … …  
    6767    USE slopes_m, ONLY: slopes
    6868    USE lmdz_xios
    69     USE mod_phys_lmdz_para, ONLY: is_mpi_root, is_master, is_omp_master, gather, gather_mpi, bcast_mpi, klon_mpi
     69    USE lmdz_phys_para, ONLY: is_mpi_root, is_master, is_omp_master, gather, gather_mpi, bcast_mpi, klon_mpi
    7070    USE geometry_mod, ONLY: latitude_deg, ind_cell_glo
    71     USE mod_grid_phy_lmdz, ONLY: klon_glo
     71    USE lmdz_grid_phy, ONLY: klon_glo
    7272
    7373    !-------------------------------------------------------------------------------
    … …  
    601601    USE regular_lonlat_mod, ONLY: lon_reg, lat_reg
    602602    USE regular_lonlat_mod, ONLY: lon_reg, lat_reg
    603     USE mod_phys_lmdz_para, ONLY: is_mpi_root
    604     USE mod_grid_phy_lmdz, ONLY: klon_glo
     603    USE lmdz_phys_para, ONLY: is_mpi_root
     604    USE lmdz_grid_phy, ONLY: klon_glo
    605605
    606606    !-------------------------------------------------------------------------------

  • LMDZ6/branches/Amaury_dev/libf/phylmd/regr_lat_time_coefoz_m.F90

    r5103 r5110  
    4040    ! when we regrid in pressure).
    4141
    42     use mod_grid_phy_lmdz, ONLY: nbp_lat
     42    use lmdz_grid_phy, ONLY: nbp_lat
    4343    use regr_conserv_m, only: regr_conserv
    4444    use regr_lint_m, only: regr_lint
    … …  
    240240    ! dimensions and variables, and writes one of the coordinate variables.
    241241
    242     use mod_grid_phy_lmdz, ONLY: nbp_lat
     242    use lmdz_grid_phy, ONLY: nbp_lat
    243243    use assert_eq_m, only: assert_eq
    244244

  • LMDZ6/branches/Amaury_dev/libf/phylmd/regr_pr_comb_coefoz_m.F90

    r5103 r5110  
    4040
    4141    use dimphy, only: klon
    42     use mod_grid_phy_lmdz, only: nbp_lev
     42    use lmdz_grid_phy, only: nbp_lev
    4343
    4444    ! Variables local to the procedure:
    … …  
    7575    use assert_m, only: assert
    7676    use dimphy, only: klon
    77     use mod_phys_lmdz_mpi_data, only: is_mpi_root
     77    use lmdz_phys_mpi_data, only: is_mpi_root
    7878    use regr_pr_time_av_m, only: regr_pr_time_av
    7979    use regr_pr_int_m, only: regr_pr_int
    8080    use press_coefoz_m, only: press_in_edg, plev
    81     use mod_grid_phy_lmdz, only: nbp_lev
     81    use lmdz_grid_phy, only: nbp_lev
    8282
    8383    integer, intent(in):: julien ! jour julien, 1 <= julien <= 360

  • LMDZ6/branches/Amaury_dev/libf/phylmd/regr_pr_int_m.F90

    r5103 r5110  
    2828    use assert_m, only: assert
    2929    use regr_lint_m, only: regr_lint
    30     use mod_phys_lmdz_mpi_data, only: is_mpi_root
    31     use mod_grid_phy_lmdz, only: nbp_lon, nbp_lat, nbp_lev
    32     use mod_phys_lmdz_transfert_para, only: scatter2d
     30    use lmdz_phys_mpi_data, only: is_mpi_root
     31    use lmdz_grid_phy, only: nbp_lon, nbp_lat, nbp_lev
     32    use lmdz_phys_transfert_para, only: scatter2d
    3333    ! (pack to the LMDZ horizontal "physics" grid and scatter)
    3434

  • LMDZ6/branches/Amaury_dev/libf/phylmd/regr_pr_o3_m.F90

    r5103 r5110  
    3131    use press_coefoz_m, only: press_in_edg
    3232    use time_phylmdz_mod, only: day_ref
    33     use mod_grid_phy_lmdz, only: nbp_lon, nbp_lat, nbp_lev
     33    use lmdz_grid_phy, only: nbp_lon, nbp_lat, nbp_lev
    3434
    3535    REAL, intent(in):: p3d(:, :, :) ! pressure at layer interfaces, in Pa

  • LMDZ6/branches/Amaury_dev/libf/phylmd/regr_pr_time_av_m.F90

    r5103 r5110  
    33
    44  USE write_field_phy
    5   USE mod_phys_lmdz_transfert_para, ONLY: bcast
    6   USE mod_phys_lmdz_para, ONLY: mpi_rank, omp_rank
     5  USE lmdz_phys_transfert_para, ONLY: bcast
     6  USE lmdz_phys_para, ONLY: mpi_rank, omp_rank
    77  USE print_control_mod,  ONLY: prt_level
    88  IMPLICIT NONE
    … …  
    123123  USE regr_lint_m,    ONLY: regr_lint
    124124  USE slopes_m,       ONLY: slopes
    125   USE mod_phys_lmdz_para,           ONLY: is_mpi_root,is_master
    126   USE mod_grid_phy_lmdz,            ONLY: nlon=>nbp_lon, nlat=>nbp_lat, nlev_ou=>nbp_lev, klon_glo, grid_type, unstructured
    127   USE mod_phys_lmdz_transfert_para, ONLY: scatter2d, scatter, gather
     125  USE lmdz_phys_para,           ONLY: is_mpi_root,is_master
     126  USE lmdz_grid_phy,            ONLY: nlon=>nbp_lon, nlat=>nbp_lat, nlev_ou=>nbp_lev, klon_glo, grid_type, unstructured
     127  USE lmdz_phys_transfert_para, ONLY: scatter2d, scatter, gather
    128128  USE phys_cal_mod,                 ONLY: calend, year_len, days_elapsed, jH_cur
    129129  USE geometry_mod,                 ONLY: ind_cell_glo

  • LMDZ6/branches/Amaury_dev/libf/phylmd/slab_heat_transp_mod.F90

    r5105 r5110  
    55! and / or Ekman transport
    66
    7 USE mod_grid_phy_lmdz, ONLY: nbp_lon, nbp_lat, klon_glo
     7USE lmdz_grid_phy, ONLY: nbp_lon, nbp_lat, klon_glo
    88IMPLICIT NONE
    99

  • LMDZ6/branches/Amaury_dev/libf/phylmd/soil.F90

    r5103 r5110  
    66 
    77  USE dimphy
    8   USE mod_phys_lmdz_para
     8  USE lmdz_phys_para
    99  USE indice_sol_mod
    1010  USE print_control_mod, ONLY: lunout

  • LMDZ6/branches/Amaury_dev/libf/phylmd/surf_land_bucket_mod.F90

    r5099 r5110  
    3131    USE dimphy
    3232    USE geometry_mod, ONLY: longitude,latitude
    33     USE mod_grid_phy_lmdz
    34     USE mod_phys_lmdz_para
     33    USE lmdz_grid_phy
     34    USE lmdz_phys_para
    3535    USE indice_sol_mod
    3636#ifdef ISO

  • LMDZ6/branches/Amaury_dev/libf/phylmd/surf_land_orchidee_mod.F90

    r5103 r5110  
    2626  USE surface_data, ONLY: type_ocean, landice_opt
    2727  USE geometry_mod, ONLY: dx, dy, boundslon, boundslat,longitude, latitude, cell_area,  ind_cell_glo
    28   USE mod_grid_phy_lmdz
    29   USE mod_phys_lmdz_para, mpi_root_rank=>mpi_master
     28  USE lmdz_grid_phy
     29  USE lmdz_phys_para, mpi_root_rank=>mpi_master
    3030  USE carbon_cycle_mod, ONLY: nbcf_in_orc, nbcf_out, fields_in, yfields_in, yfields_out, cfname_in, cfname_out
    3131  USE nrtype, ONLY: PI
    … …  
    5757    USE indice_sol_mod
    5858    USE print_control_mod, ONLY: lunout
    59     USE mod_grid_phy_lmdz, ONLY: nbp_lon, nbp_lat
     59    USE lmdz_grid_phy, ONLY: nbp_lon, nbp_lat
    6060#ifdef CPP_VEGET
    6161    USE time_phylmdz_mod, ONLY: itau_phy
    … …  
    658658  SUBROUTINE Init_orchidee_index(knon,knindex,offset,ktindex)
    659659  USE mod_surf_para
    660   USE mod_grid_phy_lmdz
     660  USE lmdz_grid_phy
    661661 
    662662    INTEGER,INTENT(IN)    :: knon
    … …  
    741741
    742742  SUBROUTINE Init_neighbours(knon,neighbours,knindex,pctsrf)
    743     USE mod_grid_phy_lmdz
     743    USE lmdz_grid_phy
    744744    USE mod_surf_para   
    745745    USE indice_sol_mod

  • LMDZ6/branches/Amaury_dev/libf/phylmd/surf_land_orchidee_nofrein_mod.F90

    r5103 r5110  
    2626  USE surface_data, ONLY: type_ocean
    2727  USE geometry_mod, ONLY: dx, dy
    28   USE mod_grid_phy_lmdz
    29   USE mod_phys_lmdz_para, mpi_root_rank=>mpi_master
     28  USE lmdz_grid_phy
     29  USE lmdz_phys_para, mpi_root_rank=>mpi_master
    3030
    3131  IMPLICIT NONE
    … …  
    5656    USE indice_sol_mod
    5757    USE print_control_mod, ONLY: lunout
    58     USE mod_grid_phy_lmdz, ONLY: nbp_lon, nbp_lat
     58    USE lmdz_grid_phy, ONLY: nbp_lon, nbp_lat
    5959#ifdef CPP_VEGET
    6060    USE time_phylmdz_mod, ONLY: itau_phy
    … …  
    482482  SUBROUTINE Init_orchidee_index(knon,knindex,offset,ktindex)
    483483  USE mod_surf_para
    484   USE mod_grid_phy_lmdz
     484  USE lmdz_grid_phy
    485485 
    486486    INTEGER,INTENT(IN)    :: knon
    … …  
    563563
    564564  SUBROUTINE Init_neighbours(knon,neighbours,knindex,pctsrf)
    565     USE mod_grid_phy_lmdz
     565    USE lmdz_grid_phy
    566566    USE mod_surf_para   
    567567    USE indice_sol_mod

  • LMDZ6/branches/Amaury_dev/libf/phylmd/surf_land_orchidee_nolic_mod.F90

    r5103 r5110  
    2222  USE surface_data, ONLY: type_ocean
    2323  USE geometry_mod, ONLY: dx, dy, boundslon, boundslat,longitude, latitude, cell_area,  ind_cell_glo
    24   USE mod_grid_phy_lmdz
    25   USE mod_phys_lmdz_para, mpi_root_rank=>mpi_master
     24  USE lmdz_grid_phy
     25  USE lmdz_phys_para, mpi_root_rank=>mpi_master
    2626  USE carbon_cycle_mod, ONLY: nbcf_in_orc, nbcf_out, fields_in, yfields_in, yfields_out, cfname_in, cfname_out
    2727  USE nrtype, ONLY: PI
    … …  
    5353    USE indice_sol_mod
    5454    USE print_control_mod, ONLY: lunout
    55     USE mod_grid_phy_lmdz, ONLY: nbp_lon, nbp_lat
     55    USE lmdz_grid_phy, ONLY: nbp_lon, nbp_lat
    5656#ifdef CPP_VEGET
    5757    USE time_phylmdz_mod, ONLY: itau_phy
    … …  
    647647  SUBROUTINE Init_orchidee_index(knon,knindex,offset,ktindex)
    648648  USE mod_surf_para
    649   USE mod_grid_phy_lmdz
     649  USE lmdz_grid_phy
    650650 
    651651    INTEGER,INTENT(IN)    :: knon
    … …  
    730730
    731731  SUBROUTINE Init_neighbours(knon,neighbours,knindex,pctsrf)
    732     USE mod_grid_phy_lmdz
     732    USE lmdz_grid_phy
    733733    USE mod_surf_para   
    734734    USE indice_sol_mod

  • LMDZ6/branches/Amaury_dev/libf/phylmd/surf_land_orchidee_noopenmp_mod.F90

    r5101 r5110  
    2323  USE surface_data, ONLY: type_ocean
    2424  USE geometry_mod, ONLY: dx, dy
    25   USE mod_grid_phy_lmdz
    26   USE mod_phys_lmdz_para
     25  USE lmdz_grid_phy
     26  USE lmdz_phys_para
    2727
    2828  IMPLICIT NONE
    … …  
    101101    USE carbon_cycle_mod, ONLY: carbon_cycle_cpl, fco2_land_inst, fco2_lu_inst
    102102    USE indice_sol_mod
    103     USE mod_grid_phy_lmdz, ONLY: nbp_lon, nbp_lat
     103    USE lmdz_grid_phy, ONLY: nbp_lon, nbp_lat
    104104    USE print_control_mod, ONLY: lunout
    105105#ifdef CPP_VEGET
    … …  
    538538  SUBROUTINE Init_orchidee_index(knon,orch_comm,knindex,offset,ktindex)
    539539   
    540     USE mod_grid_phy_lmdz, ONLY: nbp_lon, nbp_lat
     540    USE lmdz_grid_phy, ONLY: nbp_lon, nbp_lat
    541541    USE lmdz_mpi
    542542
    … …  
    627627   
    628628    USE indice_sol_mod
    629     USE mod_grid_phy_lmdz, ONLY: nbp_lon, nbp_lat
     629    USE lmdz_grid_phy, ONLY: nbp_lon, nbp_lat
    630630    USE lmdz_mpi
    631631

  • LMDZ6/branches/Amaury_dev/libf/phylmd/surf_land_orchidee_nounstruct_mod.F90

    r5103 r5110  
    2222  USE surface_data, ONLY: type_ocean
    2323  USE geometry_mod, ONLY: dx, dy
    24   USE mod_grid_phy_lmdz
    25   USE mod_phys_lmdz_para, mpi_root_rank=>mpi_master
     24  USE lmdz_grid_phy
     25  USE lmdz_phys_para, mpi_root_rank=>mpi_master
    2626
    2727  IMPLICIT NONE
    … …  
    5252    USE indice_sol_mod
    5353    USE print_control_mod, ONLY: lunout
    54     USE mod_grid_phy_lmdz, ONLY: nbp_lon, nbp_lat
     54    USE lmdz_grid_phy, ONLY: nbp_lon, nbp_lat
    5555#ifdef CPP_VEGET
    5656    USE time_phylmdz_mod, ONLY: itau_phy
    … …  
    479479  SUBROUTINE Init_orchidee_index(knon,knindex,offset,ktindex)
    480480  USE mod_surf_para
    481   USE mod_grid_phy_lmdz
     481  USE lmdz_grid_phy
    482482 
    483483    INTEGER,INTENT(IN)    :: knon
    … …  
    560560
    561561  SUBROUTINE Init_neighbours(knon,neighbours,knindex,pctsrf)
    562     USE mod_grid_phy_lmdz
     562    USE lmdz_grid_phy
    563563    USE mod_surf_para   
    564564    USE indice_sol_mod

  • LMDZ6/branches/Amaury_dev/libf/phylmd/surf_land_orchidee_noz0h_mod.F90

    r5103 r5110  
    2525  USE surface_data, ONLY: type_ocean
    2626  USE geometry_mod, ONLY: dx, dy
    27   USE mod_grid_phy_lmdz
    28   USE mod_phys_lmdz_para, mpi_root_rank=>mpi_master
     27  USE lmdz_grid_phy
     28  USE lmdz_phys_para, mpi_root_rank=>mpi_master
    2929
    3030  IMPLICIT NONE
    … …  
    5454    USE indice_sol_mod
    5555    USE print_control_mod, ONLY: lunout
    56     USE mod_grid_phy_lmdz, ONLY: nbp_lon, nbp_lat
     56    USE lmdz_grid_phy, ONLY: nbp_lon, nbp_lat
    5757#ifdef CPP_VEGET
    5858    USE time_phylmdz_mod, ONLY: itau_phy
    … …  
    482482  SUBROUTINE Init_orchidee_index(knon,knindex,offset,ktindex)
    483483  USE mod_surf_para
    484   USE mod_grid_phy_lmdz
     484  USE lmdz_grid_phy
    485485 
    486486    INTEGER,INTENT(IN)    :: knon
    … …  
    563563
    564564  SUBROUTINE Init_neighbours(knon,neighbours,knindex,pctsrf)
    565     USE mod_grid_phy_lmdz
     565    USE lmdz_grid_phy
    566566    USE mod_surf_para   
    567567    USE indice_sol_mod

  • LMDZ6/branches/Amaury_dev/libf/phylmd/tracco2i_mod.F90

    r5103 r5110  
    4242    USE carbon_cycle_mod, ONLY: ocean_area_tot
    4343    USE carbon_cycle_mod, ONLY: land_area_tot
    44     USE mod_grid_phy_lmdz
    45     USE mod_phys_lmdz_mpi_data, ONLY: is_mpi_root
    46     USE mod_phys_lmdz_para, ONLY: gather, bcast, scatter
    47     USE mod_phys_lmdz_omp_data, ONLY: is_omp_root
     44    USE lmdz_grid_phy
     45    USE lmdz_phys_mpi_data, ONLY: is_mpi_root
     46    USE lmdz_phys_para, ONLY: gather, bcast, scatter
     47    USE lmdz_phys_omp_data, ONLY: is_omp_root
    4848    USE phys_cal_mod
    4949    USE phys_state_var_mod, ONLY: pctsrf
    … …  
    345345!    USE infotrac_phy
    346346    USE geometry_mod, ONLY: cell_area
    347     USE mod_grid_phy_lmdz
    348     USE mod_phys_lmdz_mpi_data, ONLY: is_mpi_root
    349     USE mod_phys_lmdz_para, ONLY: gather, scatter
     347    USE lmdz_grid_phy
     348    USE lmdz_phys_mpi_data, ONLY: is_mpi_root
     349    USE lmdz_phys_para, ONLY: gather, scatter
    350350    USE phys_cal_mod
    351351

  • LMDZ6/branches/Amaury_dev/libf/phylmd/tracinca_mod.F90

    r5103 r5110  
    6060    USE indice_sol_mod
    6161    USE geometry_mod, ONLY: cell_area
    62     USE mod_grid_phy_lmdz, ONLY: nbp_lon, nbp_lat
     62    USE lmdz_grid_phy, ONLY: nbp_lon, nbp_lat
    6363    USE aero_mod, ONLY: naero_grp
    6464    USE lmdz_cppkeys_wrapper, ONLY: CPPKEY_INCA

  • LMDZ6/branches/Amaury_dev/libf/phylmd/traclmdz_mod.F90

    r5103 r5110  
    9191    USE regr_pr_comb_coefoz_m, ONLY: alloc_coefoz
    9292    USE press_coefoz_m, ONLY: press_coefoz
    93     USE mod_grid_phy_lmdz
    94     USE mod_phys_lmdz_para
     93    USE lmdz_grid_phy
     94    USE lmdz_phys_para
    9595    USE indice_sol_mod
    9696    USE print_control_mod, ONLY: lunout
Note: See TracChangeset for help on using the changeset viewer.