Changeset 2110 for LMDZ5/trunk

Timestamp:

Aug 27, 2014, 5:54:44 PM (10 years ago)

Author:

lguez

Message:

Abort if surface pressure becomes negative. The call to abort_gcm
already was in the sequential version but not in dyn3dpar nor in
dyn3dmem. In dyn3dmem, there is a variable checksum_all, which is
always true. The call to MPI_ALLREDUCE which should update
checksum_all is commented out. I do not know why (performance?).

Non-ASCII characters in comments are not always rendered properly and
they risk being lost. See revision [1740].

Bug fix in procedure convect2: the dimension len must be declared
before the array idcum which has this dimension. Bug fix in procedure
icefrac: the dimensions nl and len must be declared before the arrays
which have these dimensions.

Location:

LMDZ5/trunk/libf

Files:

• dyn3dmem/integrd_loc.F (modified) (2 diffs)
• dyn3dpar/integrd_p.F (modified) (2 diffs)
• phylmd/clesphys.h (modified) (1 diff)
• phylmd/conf_phys_m.F90 (modified) (1 diff)
• phylmd/convect2.F90 (modified) (1 diff)
• phylmd/cv3_routines.F90 (modified) (1 diff)
• phylmd/phys_output_mod.F90 (modified) (3 diffs)

LMDZ5/trunk/libf/dyn3dmem/integrd_loc.F

@@ -147 +147 @@
 !     &                   MPI_LOGICAL,MPI_LOR,COMM_LMDZ,ierr)
       IF( .NOT. checksum ) THEN
-          write(lunout,*) "integrd: negative surface pressure ",
-     &                                                ps(stop_it)
+         write(lunout,*) "integrd: ps = ", ps(stop_it)
          write(lunout,*) " at node ij =", stop_it
          ! since ij=j+(i-1)*jjp1 , we have
@@ -155 +154 @@
 !         write(lunout,*) " lon = ",rlonv(i)*180./pi, " deg",
 !     &                   " lat = ",rlatu(j)*180./pi, " deg"
+         call abort_gcm("integrd_loc", "negative surface pressure", 1)
       ENDIF
 

LMDZ5/trunk/libf/dyn3dpar/integrd_p.F

@@ -137 +137 @@
        
         IF( .NOT. checksum ) THEN
-         write(lunout,*) "integrd: negative surface pressure ",
-     &                                                ps(stop_it)
+           write(lunout,*) "integrd: ps = ", ps(stop_it)
          write(lunout,*) " at node ij =", stop_it
          ! since ij=j+(i-1)*jjp1 , we have
@@ -145 +144 @@
          write(lunout,*) " lon = ",rlonv(i)*180./pi, " deg",
      &                   " lat = ",rlatu(j)*180./pi, " deg"
+         call abort_gcm("integrd_p", "negative surface pressure", 1)
         ENDIF
 

LMDZ5/trunk/libf/phylmd/clesphys.h

@@ -4 +4 @@
 !
 !  ATTENTION!!!!: ce fichier include est compatible format fixe/format libre
-!                 veillez à n'utiliser que des ! pour les commentaires
-!                 et à bien positionner les & des lignes de continuation 
+!                 veillez \`a n'utiliser que des ! pour les commentaires
+!                 et \`a bien positionner les & des lignes de continuation 
 !                 (les placer en colonne 6 et en colonne 73)
 !

LMDZ5/trunk/libf/phylmd/conf_phys_m.F90

@@ -1682 +1682 @@
     !Config  Desc = activation de la version strato
     !Config  Def  = .FALSE.
-    !Config  Help = active la version stratosphérique de LMDZ de F. Lott
+    !Config  Help = active la version stratosph\'erique de LMDZ de F. Lott
 
     ok_strato_omp=.FALSE.

LMDZ5/trunk/libf/phylmd/convect2.F90

@@ -160 +160 @@
 
   INTEGER ncum
+  INTEGER len
   INTEGER idcum(len)
-  INTEGER len
   INTEGER nd
   INTEGER ndp1

LMDZ5/trunk/libf/phylmd/cv3_routines.F90

@@ -994 +994 @@
 ! Calcul de la quantité d'eau sous forme de glace
 ! --------------------------------------------------------------------
+  INTEGER nl, len
   REAL qi(len, nl)
   REAL t(len, nl), clw(len, nl)
   REAL fracg
-  INTEGER nl, len, k, i
+  INTEGER k, i
 
   DO k = 3, nl

LMDZ5/trunk/libf/phylmd/phys_output_mod.F90

@@ -59 +59 @@
     include "iniprint.h"
 
-    ! ug Nouveaux arguments nécessaires au histwrite_mod:
+    ! ug Nouveaux arguments n\'ecessaires au histwrite_mod:
     INTEGER, INTENT(IN)                         :: ivap
     INTEGER, DIMENSION(klon), INTENT(IN)        :: lmax_th
@@ -130 +130 @@
                                                                     90., 90., 90., 90., 90. /)                        
 #ifdef CPP_XIOS
-    ! ug Variables utilisées pour récupérer le calendrier pour xios
+    ! ug Variables utilis\'ees pour r\'ecup\'erer le calendrier pour xios
     INTEGER :: x_an, x_mois, x_jour
     REAL :: x_heure
@@ -261 +261 @@
 
 #ifdef CPP_XIOS
-    ! ug Réglage du calendrier xios
+    ! ug R\'eglage du calendrier xios
     !Temps julian => an, mois, jour, heure
     CALL ju2ymds(zjulian, x_an, x_mois, x_jour, x_heure)