Ignore:
Timestamp:
Feb 4, 2021, 3:59:25 PM (4 years ago)
Author:
lmdz-users
Message:

to be able to work with dynamico's dynamic, we modify call for the inca initialisation

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

Legend:

Unmodified
Added
Removed
  • LMDZ6/branches/LMDZ-INCA-Dyn/libf/dynphy_lonlat/phylmd/iniphysiq_mod.F90

    r3677 r3820  
    172172!$OMP END PARALLEL
    173173
    174   IF (type_trac == 'inca') THEN
    175 #ifdef INCA
    176      call init_const_lmdz( &
    177           anneeref,dayref, iphysiq,day_step,nday,  &
    178           nbsrf, is_oce,is_sic, is_ter,is_lic, calend, &
    179           config_inca)
    180      call init_inca_para( &
    181           nbp_lon,nbp_lat,nbp_lev,klon_glo,mpi_size, &
    182           distrib_phys,communicator)
    183 #endif
    184   END IF
    185174  IF (type_trac == 'repr') THEN
    186175#ifdef REPROBUS
     
    198187  END IF
    199188
    200   IF (type_trac == 'inca') THEN
    201 #ifdef INCA
    202      CALL init_inca_dim(klon_omp,nbp_lev,nbp_lon,nbp_lat - 1, &
    203           rlonudyn,rlatudyn,rlonvdyn,rlatvdyn)
    204 #endif
    205     IF (type_trac == 'repr') THEN
    206 #ifdef REPROBUS
    207        CALL Init_chem_rep_phys(klon_omp,nbp_lev)
    208 #endif
    209     END IF
    210   END IF
    211 
    212189!$OMP END PARALLEL
    213190
  • LMDZ6/branches/LMDZ-INCA-Dyn/libf/phy_common/mod_phys_lmdz_mpi_data.F90

    r3435 r3820  
    4646CONTAINS
    4747 
    48   SUBROUTINE init_phys_lmdz_mpi_data(nbp, nbp_lon, nbp_lat, communicator)
     48  SUBROUTINE init_phys_lmdz_mpi_data(nbp, nbp_lon, nbp_lat, nbp_lev, communicator)
     49
     50    USE infotrac, ONLY: type_trac
     51
    4952  IMPLICIT NONE
    5053#ifdef CPP_MPI
     
    5457    INTEGER,INTENT(IN) :: nbp_lon
    5558    INTEGER,INTENT(IN) :: nbp_lat
     59    INTEGER,INTENT(IN) :: nbp_lev
    5660    INTEGER,INTENT(IN) :: communicator
    5761   
     
    179183   
    180184    CALL Print_module_data
     185
     186    IF (type_trac == 'inca') THEN
     187#ifdef INCA
     188       CALL init_inca_para( &
     189            nbp_lon,nbp_lat,nbp_lev,klon_glo,mpi_size, &
     190            distrib,communicator)
     191#endif
     192    ENDIF
    181193   
    182194  END SUBROUTINE Init_phys_lmdz_mpi_data
  • LMDZ6/branches/LMDZ-INCA-Dyn/libf/phy_common/mod_phys_lmdz_para.F90

    r3465 r3820  
    1717CONTAINS
    1818
    19   SUBROUTINE Init_phys_lmdz_para(nbp,nbp_lon,nbp_lat,communicator)
     19  SUBROUTINE Init_phys_lmdz_para(nbp,nbp_lon,nbp_lat,nbp_lev,communicator)
    2020  IMPLICIT NONE
    2121    INTEGER,INTENT(in) :: nbp
    2222    INTEGER,INTENT(in) :: nbp_lon
    2323    INTEGER,INTENT(in) :: nbp_lat
     24    INTEGER,INTENT(in) :: nbp_lev
    2425    INTEGER,INTENT(in) :: communicator
    2526
    26     CALL Init_phys_lmdz_mpi_data(nbp,nbp_lon,nbp_lat,communicator)
     27    CALL Init_phys_lmdz_mpi_data(nbp,nbp_lon,nbp_lat,nbp_lev,communicator)
    2728!$OMP PARALLEL
    2829    CALL Init_phys_lmdz_omp_data(klon_mpi)
  • LMDZ6/branches/LMDZ-INCA-Dyn/libf/phy_common/physics_distribution_mod.F90

    r3435 r3820  
    2929
    3030    CALL init_grid_phy_lmdz(grid_type,nvertex, nbp_lon,nbp_lat,nbp_lev)
    31     CALL init_phys_lmdz_para(nbp,nbp_lon, nbp_lat, communicator)
     31    CALL init_phys_lmdz_para(nbp,nbp_lon, nbp_lat,nbp_lev, communicator)
    3232!$OMP PARALLEL
    3333    CALL init_dimphy(klon_omp,nbp_lev)
     
    3737#ifdef REPROBUS
    3838       CALL Init_chem_rep_phys(klon_omp,nbp_lev)
     39#endif
     40    END IF
     41    IF (type_trac == 'inca') THEN
     42#ifdef INCA
     43       CALL Init_inca_dim(klon_omp,nbp_lev)
    3944#endif
    4045    END IF
  • LMDZ6/branches/LMDZ-INCA-Dyn/libf/phylmd/physiq_mod.F90

    r3792 r3820  
    3434    USE FLOTT_GWD_rando_m, only: FLOTT_GWD_rando
    3535    USE fonte_neige_mod, ONLY  : fonte_neige_get_vars
    36     USE geometry_mod, ONLY: cell_area, latitude_deg, longitude_deg
     36    USE geometry_mod
    3737    USE ioipsl, only: histbeg, histvert, histdef, histend, histsync, &
    3838         histwrite, ju2ymds, ymds2ju, getin
     
    5353    USE phystokenc_mod, ONLY: offline, phystokenc
    5454    USE phys_cal_mod, only: year_len, mth_len, days_elapsed, jh_1jan, &
    55          year_cur, mth_cur,jD_cur, jH_cur, jD_ref, day_cur, hour
     55         year_cur, mth_cur,jD_cur, jH_cur, jD_ref, day_cur, hour, calend
    5656!!  USE phys_local_var_mod, ONLY : a long list of variables
    5757!!              ==> see below, after "CPP Keys" section
     
    6767    USE surface_data,     ONLY : type_ocean, ok_veget, landice_opt
    6868    USE time_phylmdz_mod, only: annee_ref, current_time, day_ini, day_ref, &
    69           day_step_phy, itau_phy, pdtphys, raz_date, start_time, update_time
     69          day_step_phy, itau_phy, pdtphys, raz_date, start_time, update_time, ndays
    7070    USE tracinca_mod, ONLY: config_inca
    7171    USE tropopause_m,     ONLY: dyn_tropopause
     
    19441944          calday = REAL(days_elapsed) + jH_cur
    19451945          WRITE(lunout,*) 'initial time chemini', days_elapsed, calday
     1946
     1947          call init_const_lmdz( &
     1948          ndays, nbsrf, is_oce,is_sic, is_ter,is_lic, calend, &
     1949          config_inca)
     1950
    19461951
    19471952          CALL chemini(  &
Note: See TracChangeset for help on using the changeset viewer.