Changeset 3841 for LMDZ6


Ignore:
Timestamp:
Feb 11, 2021, 3:29:29 PM (3 years ago)
Author:
acozic
Message:

add parameters to define unstructured grid on Inca model

Location:
LMDZ6/branches/LMDZ-INCA-Dyn/libf
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • LMDZ6/branches/LMDZ-INCA-Dyn/libf/phy_common/mod_phys_lmdz_mpi_data.F90

    r3820 r3841  
    4646CONTAINS
    4747 
    48   SUBROUTINE init_phys_lmdz_mpi_data(nbp, nbp_lon, nbp_lat, nbp_lev, communicator)
    49 
    50     USE infotrac, ONLY: type_trac
     48  SUBROUTINE init_phys_lmdz_mpi_data(nbp, nbp_lon, nbp_lat, nbp_lev, grid_type, nvertex, communicator)
     49
     50!    USE infotrac, ONLY: type_trac
    5151
    5252  IMPLICIT NONE
    … …  
    5959    INTEGER,INTENT(IN) :: nbp_lev
    6060    INTEGER,INTENT(IN) :: communicator
     61    INTEGER,INTENT(IN) :: grid_type
     62    INTEGER,INTENT(IN) :: nvertex
    6163   
    6264    INTEGER,ALLOCATABLE :: distrib(:)
    … …  
    184186    CALL Print_module_data
    185187
    186     IF (type_trac == 'inca') THEN
     188!    IF (type_trac == 'inca') THEN
    187189#ifdef INCA
    188190       CALL init_inca_para( &
    189191            nbp_lon,nbp_lat,nbp_lev,klon_glo,mpi_size, &
    190             distrib,communicator)
    191 #endif
    192     ENDIF
     192            distrib,nvertex, grid_type,communicator)
     193#endif
     194!    ENDIF
    193195   
    194196  END SUBROUTINE Init_phys_lmdz_mpi_data

  • LMDZ6/branches/LMDZ-INCA-Dyn/libf/phy_common/mod_phys_lmdz_para.F90

    r3820 r3841  
    1717CONTAINS
    1818
    19   SUBROUTINE Init_phys_lmdz_para(nbp,nbp_lon,nbp_lat,nbp_lev,communicator)
     19  SUBROUTINE Init_phys_lmdz_para(nbp,nbp_lon,nbp_lat,nbp_lev,grid_type, nvertex,communicator)
    2020  IMPLICIT NONE
    2121    INTEGER,INTENT(in) :: nbp
    … …  
    2424    INTEGER,INTENT(in) :: nbp_lev
    2525    INTEGER,INTENT(in) :: communicator
     26    INTEGER,INTENT(IN) :: grid_type
     27    INTEGER,INTENT(IN) :: nvertex
    2628
    27     CALL Init_phys_lmdz_mpi_data(nbp,nbp_lon,nbp_lat,nbp_lev,communicator)
     29    CALL Init_phys_lmdz_mpi_data(nbp,nbp_lon,nbp_lat,nbp_lev, grid_type, nvertex,communicator)
    2830!$OMP PARALLEL
    2931    CALL Init_phys_lmdz_omp_data(klon_mpi)

  • LMDZ6/branches/LMDZ-INCA-Dyn/libf/phy_common/physics_distribution_mod.F90

    r3840 r3841  
    1313  USE mod_grid_phy_lmdz, ONLY: init_grid_phy_lmdz
    1414  USE dimphy, ONLY : Init_dimphy
    15 ! attention a modifier, on ne peut pas garder infotrac depuis la physique
    16 ! bug avec le couplage dynamico
    17   USE infotrac, ONLY : type_trac
     15!  USE infotrac, ONLY : type_trac
    1816#ifdef REPROBUS
    1917  USE CHEM_REP, ONLY : Init_chem_rep_phys
    … …  
    3129
    3230    CALL init_grid_phy_lmdz(grid_type,nvertex, nbp_lon,nbp_lat,nbp_lev)
    33     CALL init_phys_lmdz_para(nbp,nbp_lon, nbp_lat,nbp_lev, communicator)
     31    CALL init_phys_lmdz_para(nbp,nbp_lon, nbp_lat,nbp_lev, grid_type,nvertex, communicator)
    3432!$OMP PARALLEL
    3533    CALL init_dimphy(klon_omp,nbp_lev)
    3634
    3735! Initialization of Reprobus
    38     IF (type_trac == 'repr') THEN
     36!    IF (type_trac == 'repr') THEN
    3937#ifdef REPROBUS
    4038       CALL Init_chem_rep_phys(klon_omp,nbp_lev)
    4139#endif
    42     END IF
    43     IF (type_trac == 'inca') THEN
     40!    END IF
     41!    IF (type_trac == 'inca') THEN
    4442#ifdef INCA
    4543       CALL Init_inca_dim(klon_omp,nbp_lev)
    4644#endif
    47     END IF
     45!    END IF
    4846
    4947!$OMP END PARALLEL

  • LMDZ6/branches/LMDZ-INCA-Dyn/libf/phylmd/physiq_mod.F90

    r3820 r3841  
    4242    USE iophy
    4343    USE limit_read_mod, ONLY : init_limit_read
    44     USE mod_grid_phy_lmdz, ONLY: nbp_lon, nbp_lat, nbp_lev, klon_glo, grid1dTo2d_glo, grid_type, unstructured
     44    USE mod_grid_phy_lmdz, ONLY: nbp_lon, nbp_lat, nbp_lev, klon_glo, grid1dTo2d_glo, grid_type, unstructured, nvertex
    4545    USE mod_phys_lmdz_mpi_data, only: is_mpi_root
    4646    USE mod_phys_lmdz_para
    … …  
    19481948          ndays, nbsrf, is_oce,is_sic, is_ter,is_lic, calend, &
    19491949          config_inca)
     1950
     1951          CALL init_inca_geometry( &
     1952               longitude, latitude, &
     1953               boundslon, boundslat, &
     1954               dx, dy, cell_area, ind_cell_glo)
     1955         
    19501956
    19511957
    … …  
    52815287#ifdef CPP_XIOS
    52825288       IF (is_omp_master) CALL xios_context_finalize
     5289#ifdef INCA
     5290       IF (is_omp_master) THEN
     5291
     5292          CALL finalize_inca
     5293
     5294
     5295       ENDIF
     5296#endif
     5297
    52835298#endif
    52845299       WRITE(lunout,*) ' physiq fin, nombre de steps ou cvpas = 1 : ', Ncvpaseq1
Note: See TracChangeset for help on using the changeset viewer.