Changeset 3473 for LMDZ6/trunk/libf

Timestamp:

Apr 10, 2019, 5:08:18 PM (6 years ago)

Author:

Laurent Fairhead

Message:

Missing initialisation and misplaced IF/ELSE/ENDIF block in cpl_mod
AC, LF

Location:

LMDZ6/trunk/libf/phylmd

Files:

• cpl_mod.F90 (modified) (1 diff)
• orografi_strato.F90 (modified) (1 diff)

LMDZ6/trunk/libf/phylmd/cpl_mod.F90

@@ -1232 +1232 @@
       IF (cpl_old_calving) THEN   ! use old calving
 
-      DO j = 1, jj_nb
-         tmp_calv(:,j) = DOT_PRODUCT (cpl_rlic2D(1:nbp_lon,j), &
-              pctsrf2D(1:nbp_lon,j,is_lic)) / REAL(nbp_lon)
-      ENDDO
-    
-    
-      IF (is_parallel) THEN
-         IF (.NOT. is_north_pole_dyn) THEN
+        DO j = 1, jj_nb
+           tmp_calv(:,j) = DOT_PRODUCT (cpl_rlic2D(1:nbp_lon,j), &
+                pctsrf2D(1:nbp_lon,j,is_lic)) / REAL(nbp_lon)
+        ENDDO
+    
+    
+        IF (is_parallel) THEN
+           IF (.NOT. is_north_pole_dyn) THEN
 #ifdef CPP_MPI
-            CALL MPI_RECV(Up,1,MPI_REAL_LMDZ,mpi_rank-1,1234,COMM_LMDZ_PHY,status,error)
-            CALL MPI_SEND(tmp_calv(1,1),1,MPI_REAL_LMDZ,mpi_rank-1,1234,COMM_LMDZ_PHY,error)
+              CALL MPI_RECV(Up,1,MPI_REAL_LMDZ,mpi_rank-1,1234,COMM_LMDZ_PHY,status,error)
+              CALL MPI_SEND(tmp_calv(1,1),1,MPI_REAL_LMDZ,mpi_rank-1,1234,COMM_LMDZ_PHY,error)
 #endif
-         ENDIF
+           ENDIF
        
-         IF (.NOT. is_south_pole_dyn) THEN
+           IF (.NOT. is_south_pole_dyn) THEN
 #ifdef CPP_MPI
-            CALL MPI_SEND(tmp_calv(1,jj_nb),1,MPI_REAL_LMDZ,mpi_rank+1,1234,COMM_LMDZ_PHY,error)
-            CALL MPI_RECV(down,1,MPI_REAL_LMDZ,mpi_rank+1,1234,COMM_LMDZ_PHY,status,error)
+              CALL MPI_SEND(tmp_calv(1,jj_nb),1,MPI_REAL_LMDZ,mpi_rank+1,1234,COMM_LMDZ_PHY,error)
+              CALL MPI_RECV(down,1,MPI_REAL_LMDZ,mpi_rank+1,1234,COMM_LMDZ_PHY,status,error)
 #endif
-         ENDIF
+           ENDIF
          
-         IF (.NOT. is_north_pole_dyn .AND. ii_begin /=1) THEN
-            Up=Up+tmp_calv(nbp_lon,1)
-            tmp_calv(:,1)=Up
-         ENDIF
-         
-         IF (.NOT. is_south_pole_dyn .AND. ii_end /= nbp_lon) THEN
-            Down=Down+tmp_calv(1,jj_nb)
-            tmp_calv(:,jj_nb)=Down       
-         ENDIF
+           IF (.NOT. is_north_pole_dyn .AND. ii_begin /=1) THEN
+              Up=Up+tmp_calv(nbp_lon,1)
+              tmp_calv(:,1)=Up
+           ENDIF
+           
+           IF (.NOT. is_south_pole_dyn .AND. ii_end /= nbp_lon) THEN
+              Down=Down+tmp_calv(1,jj_nb)
+              tmp_calv(:,jj_nb)=Down
+           ENDIF
+        ENDIF
+        tab_flds(:,:,ids_calvin) = tmp_calv(:,:)
+
+      ELSE
+
+        DO k=1,nb_zone_calving
+          calving(k)=0
+          DO j = 1, jj_nb
+            calving(k)= calving(k)+DOT_PRODUCT(cpl_rlic2D(:,j)*area_calving(:,j,k),pctsrf2D(:,j,is_lic))
+          ENDDO
+        ENDDO
       ENDIF
-      tab_flds(:,:,ids_calvin) = tmp_calv(:,:)
-
-      ENDIF
-
-      DO k=1,nb_zone_calving
-        calving(k)=0
-        DO j = 1, jj_nb
-          calving(k)= calving(k)+DOT_PRODUCT(cpl_rlic2D(:,j)*area_calving(:,j,k),pctsrf2D(:,j,is_lic))
-        ENDDO
-      ENDDO
       
 #ifdef CPP_MPI

LMDZ6/trunk/libf/phylmd/orografi_strato.F90

@@ -1852 +1852 @@
 !ym Take the point at equator close to (0,0) coordinates.
   dist_min=360
+  dist_min_glo=360.
   cell=-1
   DO ij=1,klon