Changeset 1650


Ignore:
Timestamp:
02/12/19 10:16:40 (6 months ago)
Author:
yushan
Message:

branch tested with openmpi thread_multiple

Location:
XIOS/dev/dev_trunk_omp
Files:
6 added
8 edited

Legend:

Unmodified
Added
Removed
  • XIOS/dev/dev_trunk_omp/extern/src_ep_dev/ep_type.hpp

    r1646 r1650  
    6262  }; 
    6363 
    64   class MPI_Fint 
     64  class EP_Fint 
    6565  { 
    6666    public: 
     
    6868    void* mpi_fint; 
    6969     
    70     MPI_Fint() {} 
    71     MPI_Fint(void* fint); 
     70    EP_Fint() {} 
     71    EP_Fint(void* fint); 
    7272                                  
    7373  }; 
  • XIOS/dev/dev_trunk_omp/inputs/COMPLETE/context_atmosphere.xml

    r787 r1650  
    33<context id="atmosphere"> 
    44 
    5   <field_definition level="1" enabled=".FALSE." default_value="9.96921e+36"> 
     5  <field_definition level="1" enabled=".TRUE." default_value="9.96921e+36"> 
    66    <field id="field_A_atm"  name="field_A_atm_origin" operation="average" freq_op="1ts" grid_ref="grid_A_atm" /> 
    77    <field id="field_A_atm_zoom"  name="field_A_atm" operation="average" freq_op="1ts" field_ref="field_A_atm" grid_ref="grid_A_atm_zoom" /> 
  • XIOS/dev/dev_trunk_omp/inputs/REMAP/iodef.xml

    r1646 r1650  
    183183        <variable_group id="parameters" > 
    184184          <variable id="using_server" type="bool">true</variable> 
    185           <variable id="info_level" type="int">200</variable> 
     185          <variable id="info_level" type="int">0</variable> 
    186186          <variable id="print_file" type="bool">true</variable> 
    187187        </variable_group> 
  • XIOS/dev/dev_trunk_omp/src/interface/c/oasis_cinterface.cpp

    r1646 r1650  
    2525  void oasis_get_localcomm(MPI_Comm& comm) 
    2626  { 
    27     MPI_Fint f_comm ; 
     27    EP_Fint f_comm ; 
    2828     
    2929    fxios_oasis_get_localcomm(&f_comm) ; 
     
    3333  void oasis_get_intracomm(MPI_Comm& comm_client_server,const std::string& server_id) 
    3434  { 
    35     MPI_Fint f_comm ; 
     35    EP_Fint f_comm ; 
    3636     
    3737    fxios_oasis_get_intracomm(&f_comm,server_id.data(),server_id.size()) ; 
     
    4141  void oasis_get_intercomm(MPI_Comm& comm_client_server,const std::string& server_id) 
    4242  { 
    43     MPI_Fint f_comm ; 
     43    EP_Fint f_comm ; 
    4444     
    4545    fxios_oasis_get_intercomm(&f_comm,server_id.data(),server_id.size()) ; 
  • XIOS/dev/dev_trunk_omp/src/interface/c/oasis_cinterface.hpp

    r1601 r1650  
    1010  void fxios_oasis_enddef(void) ; 
    1111  void fxios_oasis_finalize(void) ; 
    12   void fxios_oasis_get_localcomm(ep_lib::MPI_Fint* f_comm) ; 
    13   void fxios_oasis_get_intracomm(ep_lib::MPI_Fint* f_comm_client_server,const char* client_id,int str_len) ; 
    14   void fxios_oasis_get_intercomm(ep_lib::MPI_Fint* f_comm_client_server,const char* client_id,int str_len) ; 
     12  void fxios_oasis_get_localcomm(ep_lib::EP_Fint* f_comm) ; 
     13  void fxios_oasis_get_intracomm(ep_lib::EP_Fint* f_comm_client_server,const char* client_id,int str_len) ; 
     14  void fxios_oasis_get_intercomm(ep_lib::EP_Fint* f_comm_client_server,const char* client_id,int str_len) ; 
    1515} 
    1616  
  • XIOS/dev/dev_trunk_omp/src/mpi.hpp

    r1646 r1650  
    1818  #include <mpi.h> 
    1919  #define ep_lib  
     20  #define EP_Fint MPI_Fint  
    2021#endif 
    2122 
  • XIOS/dev/dev_trunk_omp/src/mpi_std.hpp

    r1646 r1650  
    2020#include <mpi.h> 
    2121#define ep_lib  
     22#define EP_Fint MPI_Fint  
    2223#endif 
    2324 
  • XIOS/dev/dev_trunk_omp/src/test/test_complete_omp.f90

    r1604 r1650  
    1414  TYPE(xios_duration)  :: dtime 
    1515  TYPE(xios_context) :: ctx_hdl 
    16   INTEGER,PARAMETER :: ni_glo=100 
    17   INTEGER,PARAMETER :: nj_glo=100 
     16  INTEGER,PARAMETER :: ni_glo=1000 
     17  INTEGER,PARAMETER :: nj_glo=1000 
    1818  INTEGER,PARAMETER :: llm=5 
    1919  DOUBLE PRECISION  :: lval(llm)=1 
     
    3636    if(provided .NE. 3) then 
    3737      print*, "provided thread level = ", provided 
    38       call MPI_Abort() 
     38      !call MPI_Abort() 
    3939    endif  
    4040 
     
    4545  CALL MPI_COMM_RANK(MPI_COMM_WORLD,rank,ierr) 
    4646  CALL MPI_COMM_SIZE(MPI_COMM_WORLD,size,ierr) 
    47   if(rank < size-2) then 
     47  if(rank < size-4) then 
    4848 
    4949  !$omp parallel default(firstprivate)  
     
    276276      CALL xios_send_field("field_A_srf",field_A_srf) 
    277277 
    278       CALL wait_us(5000) ; 
     278      CALL wait_us(5) ; 
    279279 
    280280 
Note: See TracChangeset for help on using the changeset viewer.