Changeset 1599 for LMDZ4/branches/LMDZ4_AR5

Timestamp:

Dec 6, 2011, 2:11:24 PM (13 years ago)

Author:

jghattas

Message:

phys_output_mod - Bug in write : bad second argument in ioget_mon_len function.

ce0l - Changed finalize_parallel into mpi_finalize because the program ce0l did not finish correctly for case ocean_type=couple.

Location:

LMDZ4/branches/LMDZ4_AR5/libf

Files:

• dyn3dpar/ce0l.F90 (modified) (3 diffs)
• phylmd/phys_output_mod.F90 (modified) (1 diff)

LMDZ4/branches/LMDZ4_AR5/libf/dyn3dpar/ce0l.F90

@@ -19 +19 @@
   USE dimphy
   USE comgeomphy
-  USE mod_phys_lmdz_para
+  USE mod_phys_lmdz_para, mpi_root_xx=>mpi_root
   USE mod_const_mpi
   USE infotrac
@@ -43 +43 @@
 #include "temps.h"
 #include "logic.h"
+#ifdef CPP_MPI
+      include 'mpif.h'
+#endif
+
   INTEGER, PARAMETER            :: longcles=20
+  INTEGER                       :: ierr
   REAL,    DIMENSION(longcles)  :: clesphy0
   REAL,    DIMENSION(iip1,jjp1) :: masque
   CHARACTER(LEN=15)             :: calnd
+  
 !-------------------------------------------------------------------------------
   CALL conf_gcm( 99, .TRUE. , clesphy0 )
 
+#ifdef CPP_MPI
   CALL init_mpi
+#endif
 
   CALL Init_Phys_lmdz(iim,jjp1,llm,1,(/(jjm-1)*iim+2/))
@@ -103 +111 @@
   END IF
 
+#ifdef CPP_MPI
 !$OMP MASTER
-  CALL finalize_parallel
+  CALL MPI_FINALIZE(ierr)
+  IF (ierr /= 0) CALL abort_gcm('ce0l','Error in MPI_FINALIZE',1)
 !$OMP END MASTER
+#endif
+
 
 #endif

LMDZ4/branches/LMDZ4_AR5/libf/phylmd/phys_output_mod.F90

@@ -1821 +1821 @@
         if ( type == 'day'.or.type == 'days'.or.type == 'jours'.or.type == 'jour' ) timestep = ttt * dayseconde
         if ( type == 'mounths'.or.type == 'mth'.or.type == 'mois' ) then
-           print*,'annee_ref,day_ref mon_len',annee_ref,day_ref,ioget_mon_len(annee_ref,day_ref)
-!IMbug     timestep = ttt * dayseconde * ioget_mon_len(annee_ref,day_ref)
+           print*,'annee_ref,day_ref mon_len',annee_ref,day_ref,mth_len
            timestep = ttt * dayseconde * mth_len
         endif