Changeset 3494 for LMDZ6/trunk/libf/phylmd

Timestamp:

May 9, 2019, 11:46:36 AM (6 years ago)

Author:

jghattas

Message:

Bug correction: ENDIF was bad placed. Changed some indentation and add comments.
Thanks to Christian Ethe.

File:

• LMDZ6/trunk/libf/phylmd/cpl_mod.F90 (modified) (2 diffs)

LMDZ6/trunk/libf/phylmd/cpl_mod.F90

@@ -148 +148 @@
 
 !***************************************
-! Use old calving or not (default no)
+! Use old calving or not (default new calving method)
+! New calving method should be used with DYNAMICO and when using new coupling
+! weights.
     cpl_old_calving=.FALSE.
     CALL getin_p("cpl_old_calving",cpl_old_calving)
@@ -1266 +1268 @@
 
       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
+         ! cpl_old_calving=FALSE
+         ! To be used with new method for calculation of coupling weights
+         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
+         CALL MPI_ALLREDUCE(calving, calving_glo, nb_zone_calving, MPI_REAL_LMDZ, MPI_SUM, COMM_LMDZ_PHY, error)
+#endif
+         
+         tab_flds(:,:,ids_calvin) = 0
+         DO k=1,nb_zone_calving
+            IF (ind_calving(k)>0 ) THEN
+               j=(ind_calving(k)-1)/nbp_lon + 1
+               i=MOD(ind_calving(k)-1,nbp_lon)+1
+               tab_flds(i,j,ids_calvin) = calving_glo(k)
+            ENDIF
+         ENDDO
+         
       ENDIF
       
-#ifdef CPP_MPI
-      CALL MPI_ALLREDUCE(calving, calving_glo, nb_zone_calving, MPI_REAL_LMDZ, MPI_SUM, COMM_LMDZ_PHY, error)
-#endif
-      
-      tab_flds(:,:,ids_calvin) = 0
-      DO k=1,nb_zone_calving
-        IF (ind_calving(k)>0 ) THEN
-          j=(ind_calving(k)-1)/nbp_lon + 1
-          i=MOD(ind_calving(k)-1,nbp_lon)+1
-          tab_flds(i,j,ids_calvin) = calving_glo(k)
-        ENDIF
-      ENDDO
-
 !*************************************************************************************
 ! Calculate total flux for snow, rain and wind with weighted addition using the