Changeset 1650 for XIOS/dev

Timestamp:

02/12/19 10:16:40 (5 years ago)

Author:

yushan

Message:

branch tested with openmpi thread_multiple

Location:

XIOS/dev/dev_trunk_omp

Files:

• arch/arch-X64_IRENE_openmpi.env (added)
• arch/arch-X64_IRENE_openmpi.fcm (added)
• arch/arch-X64_IRENE_openmpi.path (added)
• arch/arch-X64_IRENE_trunk.env (added)
• arch/arch-X64_IRENE_trunk.fcm (added)
• arch/arch-X64_IRENE_trunk.path (added)
• extern/src_ep_dev/ep_type.hpp (modified) (2 diffs)
• inputs/COMPLETE/context_atmosphere.xml (modified) (1 diff)
• inputs/REMAP/iodef.xml (modified) (1 diff)
• src/interface/c/oasis_cinterface.cpp (modified) (3 diffs)
• src/interface/c/oasis_cinterface.hpp (modified) (1 diff)
• src/mpi.hpp (modified) (1 diff)
• src/mpi_std.hpp (modified) (1 diff)
• src/test/test_complete_omp.f90 (modified) (4 diffs)

XIOS/dev/dev_trunk_omp/extern/src_ep_dev/ep_type.hpp

@@ -62 +62 @@
   };
 
-  class MPI_Fint
+  class EP_Fint
   {
     public:
@@ -68 +68 @@
     void* mpi_fint;
     
-    MPI_Fint() {}
-    MPI_Fint(void* fint);
+    EP_Fint() {}
+    EP_Fint(void* fint);
                                  
   };

XIOS/dev/dev_trunk_omp/inputs/COMPLETE/context_atmosphere.xml

@@ -3 +3 @@
 <context id="atmosphere">
 
-  <field_definition level="1" enabled=".FALSE." default_value="9.96921e+36">
+  <field_definition level="1" enabled=".TRUE." default_value="9.96921e+36">
     <field id="field_A_atm"  name="field_A_atm_origin" operation="average" freq_op="1ts" grid_ref="grid_A_atm" />
     <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

@@ -183 +183 @@
         <variable_group id="parameters" >
           <variable id="using_server" type="bool">true</variable>
-          <variable id="info_level" type="int">200</variable>
+          <variable id="info_level" type="int">0</variable>
           <variable id="print_file" type="bool">true</variable>
         </variable_group>

XIOS/dev/dev_trunk_omp/src/interface/c/oasis_cinterface.cpp

@@ -25 +25 @@
   void oasis_get_localcomm(MPI_Comm& comm)
   {
-    MPI_Fint f_comm ;
+    EP_Fint f_comm ;
     
     fxios_oasis_get_localcomm(&f_comm) ;
@@ -33 +33 @@
   void oasis_get_intracomm(MPI_Comm& comm_client_server,const std::string& server_id)
   {
-    MPI_Fint f_comm ;
+    EP_Fint f_comm ;
     
     fxios_oasis_get_intracomm(&f_comm,server_id.data(),server_id.size()) ;
@@ -41 +41 @@
   void oasis_get_intercomm(MPI_Comm& comm_client_server,const std::string& server_id)
   {
-    MPI_Fint f_comm ;
+    EP_Fint f_comm ;
     
     fxios_oasis_get_intercomm(&f_comm,server_id.data(),server_id.size()) ;

XIOS/dev/dev_trunk_omp/src/interface/c/oasis_cinterface.hpp

@@ -10 +10 @@
   void fxios_oasis_enddef(void) ;
   void fxios_oasis_finalize(void) ;
-  void fxios_oasis_get_localcomm(ep_lib::MPI_Fint* f_comm) ;
-  void fxios_oasis_get_intracomm(ep_lib::MPI_Fint* f_comm_client_server,const char* client_id,int str_len) ;
-  void fxios_oasis_get_intercomm(ep_lib::MPI_Fint* f_comm_client_server,const char* client_id,int str_len) ;
+  void fxios_oasis_get_localcomm(ep_lib::EP_Fint* f_comm) ;
+  void fxios_oasis_get_intracomm(ep_lib::EP_Fint* f_comm_client_server,const char* client_id,int str_len) ;
+  void fxios_oasis_get_intercomm(ep_lib::EP_Fint* f_comm_client_server,const char* client_id,int str_len) ;
 }
  

XIOS/dev/dev_trunk_omp/src/mpi.hpp

@@ -18 +18 @@
   #include <mpi.h>
   #define ep_lib 
+  #define EP_Fint MPI_Fint 
 #endif
 

XIOS/dev/dev_trunk_omp/src/mpi_std.hpp

@@ -20 +20 @@
 #include <mpi.h>
 #define ep_lib 
+#define EP_Fint MPI_Fint 
 #endif
 

XIOS/dev/dev_trunk_omp/src/test/test_complete_omp.f90

@@ -14 +14 @@
   TYPE(xios_duration)  :: dtime
   TYPE(xios_context) :: ctx_hdl
-  INTEGER,PARAMETER :: ni_glo=100
-  INTEGER,PARAMETER :: nj_glo=100
+  INTEGER,PARAMETER :: ni_glo=1000
+  INTEGER,PARAMETER :: nj_glo=1000
   INTEGER,PARAMETER :: llm=5
   DOUBLE PRECISION  :: lval(llm)=1
@@ -36 +36 @@
     if(provided .NE. 3) then
       print*, "provided thread level = ", provided
-      call MPI_Abort()
+      !call MPI_Abort()
     endif 
 
@@ -45 +45 @@
   CALL MPI_COMM_RANK(MPI_COMM_WORLD,rank,ierr)
   CALL MPI_COMM_SIZE(MPI_COMM_WORLD,size,ierr)
-  if(rank < size-2) then
+  if(rank < size-4) then
 
   !$omp parallel default(firstprivate) 
@@ -276 +276 @@
       CALL xios_send_field("field_A_srf",field_A_srf)
 
-      CALL wait_us(5000) ;
+      CALL wait_us(5) ;