Changeset 3605 for LMDZ6/branches/Ocean_skin/libf/phylmd/cv30_routines.F90

Timestamp:

Nov 21, 2019, 4:43:45 PM (4 years ago)

Author:

lguez

Message:

Merge revisions 3427:3600 of trunk into branch Ocean_skin

Location:

LMDZ6/branches/Ocean_skin

Files:

• . (modified) (1 prop)
• libf/phylmd/cv30_routines.F90 (modified) (8 diffs)

LMDZ6/branches/Ocean_skin/libf/phylmd/cv30_routines.F90

@@ -3050 +3050 @@
   ! variables pour tracer dans precip de l'AA et des mel
   ! local variables:
-  INTEGER i, j, k
+  INTEGER i, j, k, nam1
   REAL epm(nloc, na, na)
 
+  nam1=na-1 ! Introduced because ep is not defined for j=na
   ! variables d'Emanuel : du second indice au troisieme
   ! --->    tab(i,k,j) -> de l origine k a l arrivee j
@@ -3082 +3083 @@
   ! fraction deau condensee dans les melanges convertie en precip : epm
   ! et eau condensée précipitée dans masse d'air saturé : l_m*dM_m/dzdz.dzdz
-  DO j = 1, na
+  DO j = 1, nam1
     DO k = 1, j - 1
       DO i = 1, ncum
@@ -3095 +3096 @@
   END DO
 
-  DO j = 1, na
-    DO k = 1, na
+  DO j = 1, nam1
+    DO k = 1, nam1
       DO i = 1, ncum
         IF (k>=icb(i) .AND. k<=inb(i)) THEN
@@ -3106 +3107 @@
   END DO
 
-  DO j = 1, na
+  DO j = 1, nam1
     DO k = 1, j - 1
       DO i = 1, ncum
@@ -3117 +3118 @@
 
   ! matrices pour calculer la tendance des concentrations dans cvltr.F90
-  DO j = 1, na
-    DO k = 1, na
+  DO j = 1, nam1
+    DO k = 1, nam1
       DO i = 1, ncum
         da(i, j) = da(i, j) + (1.-sij(i,k,j))*ment(i, k, j)
@@ -3127 +3128 @@
   END DO
 
-  DO j = 1, na
+  DO j = 1, nam1
     DO k = 1, j - 1
       DO i = 1, ncum
@@ -3298 +3299 @@
       integer i,k    
       real hp_bak(nloc,nd)
+      CHARACTER (LEN=20) :: modname='cv30_epmax_fn_cape'
+      CHARACTER (LEN=80) :: abort_message
 
         ! on recalcule ep et hp
@@ -3346 +3349 @@
            write(*,*) 'clw(i,k)=',clw(i,k)
            write(*,*) 'cpd,cpv=',cpd,cpv
-           stop
+           CALL abort_physic(modname,abort_message,0)
         endif
        enddo !do k=1,nl