Changeset 964 for codes/icosagcm/trunk/src

Timestamp:

07/25/19 17:32:38 (5 years ago)

Author:

adurocher

Message:

trunk : transfert_mpi_legacy is now default

File:

• codes/icosagcm/trunk/src/parallel/transfert.F90 (modified) (3 diffs)

codes/icosagcm/trunk/src/parallel/transfert.F90

@@ -2 +2 @@
 #ifdef CPP_USING_MPI
 
-#if defined(CPP_USING_MPI_LEGACY)
-#warning("Using legacy transfert_mpi (not default)")
-  use transfert_mpi_legacy_mod, only :  t_message, t_request, &
-                                        req_i1, req_e1_scal, req_e1_vect, &
-                                        req_i0, req_e0_scal, req_e0_vect, &
-                                        req_z1_scal, &
-                                        init_transfert, &
-                                        init_message => init_message_mpi, &
-                                        finalize_message => finalize_message_mpi, &
-                                        send_message => send_message_mpi, &
-                                        wait_message => wait_message_mpi, &
-                                        test_message => test_message_mpi
-#else
+#if defined(CPP_USING_MPI_NEW)
+#warning("Using new transfert_mpi (not default, not working with req_z1_scal)")
   ! transfert_mpi using manual pack/unpack (default)
   use transfert_mpi_mod, only : t_message, t_request, &
@@ -26 +15 @@
                                 wait_message, &
                                 test_message
+  
+#else
+  use transfert_mpi_legacy_mod, only :  t_message, t_request, &
+                                        req_i1, req_e1_scal, req_e1_vect, &
+                                        req_i0, req_e0_scal, req_e0_vect, &
+                                        req_z1_scal, &
+                                        init_transfert, &
+                                        init_message => init_message_mpi, &
+                                        finalize_message => finalize_message_mpi, &
+                                        send_message => send_message_mpi, &
+                                        wait_message => wait_message_mpi, &
+                                        test_message => test_message_mpi
 #endif
 #else
@@ -48 +49 @@
           req_i1, req_e1_scal, req_e1_vect, &
           req_i0, req_e0_scal, req_e0_vect, &
-          !req_z1_scal, &
+#if !defined(CPP_USING_MPI_NEW)
+          req_z1_scal, &
+#endif
           init_transfert, &
           init_message, &