Changeset 293 for codes

Timestamp:

10/22/14 15:11:29 (10 years ago)

Author:

millour

Message:

Sanity check in init_domain_param only valid for pure MPI.
Checks for OpenMP and mixed MPI/Openmp to be implemented...
EM

File:

• codes/icosagcm/branches/SATURN_DYNAMICO/ICOSAGCM/src/domain_param.f90 (modified) (3 diffs)

codes/icosagcm/branches/SATURN_DYNAMICO/ICOSAGCM/src/domain_param.f90

@@ -12 +12 @@
   SUBROUTINE init_domain_param
   USE ioipsl, ONLY: getin
-  USE mpipara, ONLY: mpi_size, is_mpi_master
+  USE mpipara, ONLY: using_mpi, mpi_size, is_mpi_master
+  USE omp_para, ONLY: using_openmp
   IMPLICIT NONE
     nsplit_i=default_nsplit_i
@@ -18 +19 @@
     CALL getin('nsplit_i',nsplit_i)
     CALL getin('nsplit_j',nsplit_j)
+
+    IF (using_mpi.and.(.not.using_openmp).and.(nsplit_i*nsplit_j*10<mpi_size)) THEN
     ! Check that nsplit_i*nsplit_j*10>=mpi_size
-    IF (nsplit_i*nsplit_j*10<mpi_size) THEN
       IF (is_mpi_master) THEN
         WRITE(*,*) "Error: Number of MPI processes must be"
@@ -28 +30 @@
       STOP
     ENDIF
+
+    ! TODO : same kind of test for OpenMP or mixed MPI/OpenMP cases
   END SUBROUTINE init_domain_param