Ignore:
Timestamp:
Oct 15, 2019, 12:38:46 PM (5 years ago)
Author:
Ehouarn Millour
Message:

Follow-up of r3579 (update of iniaqua) for the unstructured case, along with some code cleanup (use getin_p instead of getin+broadcasts).
EM

File:
1 edited

Legend:

Unmodified
Added
Removed
  • LMDZ6/trunk/libf/phylmd/create_etat0_limit_unstruct.F90

    r3543 r3585  
    1111  SUBROUTINE init_etat0_limit_unstruct
    1212#ifdef CPP_XIOS
    13   USE xios
    14   USE mod_phys_lmdz_para
    15   USE mod_grid_phy_lmdz
    16   USE ioipsl, ONLY : getin, ioget_year_len
     13  USE xios, ONLY: xios_set_axis_attr, xios_set_fieldgroup_attr, &
     14                  xios_set_filegroup_attr, xios_set_file_attr
     15  USE mod_phys_lmdz_para, ONLY: is_omp_master
     16  USE mod_grid_phy_lmdz, ONLY: grid_type, unstructured
     17  USE ioipsl, ONLY : ioget_year_len
     18  USE ioipsl_getin_p_mod, ONLY: getin_p
    1719  USE time_phylmdz_mod, ONLY : annee_ref
    18   USE create_etat0_unstruct_mod
     20  USE create_etat0_unstruct_mod, ONLY: init_create_etat0_unstruct
    1921  IMPLICIT NONE
    2022 
     
    2426   
    2527      IF (grid_type==unstructured) THEN
    26         IF (is_master) CALL getin("iflag_phys",iflag_phys)
    27         CALL bcast(iflag_phys)
     28        CALL getin_p("iflag_phys",iflag_phys)
    2829       
    29         IF (is_master) CALL getin('create_etat0_limit',create_etat0_limit)
    30         CALL bcast(create_etat0_limit)
     30        CALL getin_p('create_etat0_limit',create_etat0_limit)
    3131       
    3232        ndays=ioget_year_len(annee_ref)
     
    5454  SUBROUTINE create_etat0_limit_unstruct
    5555#ifdef CPP_XIOS
    56   USE mod_grid_phy_lmdz
    57   USE create_etat0_unstruct_mod
    58   USE create_limit_unstruct_mod
    59   USE phyaqua_mod
    60   USE mod_phys_lmdz_para
    61   USE ioipsl, ONLY : getin
    62   USE dimphy
    63   USE xios
     56  USE mod_grid_phy_lmdz, ONLY: grid_type, unstructured
     57  USE create_etat0_unstruct_mod, ONLY: create_etat0_unstruct
     58  USE create_limit_unstruct_mod, ONLY: create_limit_unstruct
     59  USE phyaqua_mod, ONLY: iniaqua
     60  USE phys_cal_mod, only: year_len
     61  USE mod_phys_lmdz_para, ONLY: is_omp_master
     62  USE ioipsl_getin_p_mod, ONLY: getin_p
     63  USE dimphy, ONLY: klon
     64  USE xios, ONLY: xios_context_finalize, xios_set_current_context, &
     65                  xios_finalize
    6466  USE print_control_mod, ONLY: lunout
    6567  IMPLICIT NONE
     
    7173      IF (grid_type==unstructured) THEN
    7274 
    73         IF (is_master) CALL getin("iflag_phys",iflag_phys)
    74         CALL bcast(iflag_phys)
     75        CALL getin_p("iflag_phys",iflag_phys)
    7576
    7677        IF (iflag_phys<100) THEN
     
    9697        ELSE
    9798          IF (create_etat0_limit) THEN
    98             CALL iniaqua(klon,iflag_phys)
     99            CALL iniaqua(klon,year_len,iflag_phys)
    99100              IF (is_omp_master)  THEN
    100101                CALL xios_context_finalize()
Note: See TracChangeset for help on using the changeset viewer.