Changeset 298 for codes/icosagcm/branches/SATURN_DYNAMICO/ICOSAGCM/src/caldyn_gcm.f90

Timestamp:

12/02/14 19:21:00 (10 years ago)

Author:

milmd

Message:

Less output messages are written. On 20000 cores it is better. In LMDZ, only master of MPI and OpenMP can write.

File:

• codes/icosagcm/branches/SATURN_DYNAMICO/ICOSAGCM/src/caldyn_gcm.f90 (modified) (5 diffs)

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

@@ -33 +33 @@
     USE exner_mod
     USE mpipara
+    USE omp_para, ONLY: omp_master
     IMPLICIT NONE
     CHARACTER(len=255) :: def
@@ -50 +51 @@
        STOP
     END SELECT
-    IF (is_mpi_root) PRINT *, 'caldyn_conserv=',def
+    IF (is_mpi_root .AND. omp_master) PRINT *, 'caldyn_conserv=',def
 
     CALL allocate_caldyn
@@ -294 +295 @@
     IF (write_out) THEN
 
-       IF (is_mpi_root) PRINT *,'CALL write_output_fields'
+!       IF (is_mpi_root) PRINT *,'CALL write_output_fields'
 
 ! ---> for openMP test to fix later
@@ -892 +893 @@
   USE icosa
   USE mpipara
+  USE omp_para, ONLY: omp_master
   IMPLICIT NONE
     TYPE(t_field),POINTER :: f_ps(:)
@@ -924 +926 @@
    
     ENDDO
-    IF (is_mpi_root) PRINT*, "mass_tot ", mass_tot,"      dmass_tot ",dmass_tot        
+    IF (is_mpi_root .AND. omp_master) PRINT*, "mass_tot ", mass_tot,"      dmass_tot ",dmass_tot        
 
   END SUBROUTINE check_mass_conservation