Changeset 1441

Timestamp:

2009-05-12T15:33:06+02:00 (16 years ago)

Author:

rblod

Message:

Correct some incompatibility with AGRIF, see #415 first part

Location:

trunk/NEMO

Files:

• NST_SRC/agrif_opa_update.F90 (modified) (1 diff)
• OPA_SRC/IOM/iom.F90 (modified) (1 diff)
• OPA_SRC/lib_mpp.F90 (modified) (4 diffs)

trunk/NEMO/NST_SRC/agrif_opa_update.F90

@@ -107 +107 @@
 
       IF( n_cla == 1 ) CALL div_cla( kt )
-      CALL wzv( kt )
+!      CALL wzv( kt )
 
    END SUBROUTINE recompute_diags

trunk/NEMO/OPA_SRC/IOM/iom.F90

@@ -153 +153 @@
       ENDIF
 #else
-IF( Agrif_Root() ) THEN
-      IF( iom_open_init == 0 ) THEN
-         iom_file(:)%nfid = 0
-         iom_open_init = 1
+      IF( Agrif_Root() ) THEN
+         IF( iom_open_init == 0 ) THEN
+            iom_file(:)%nfid = 0
+            iom_open_init = 1
+         ENDIF
       ENDIF
 #endif

trunk/NEMO/OPA_SRC/lib_mpp.F90

@@ -106 +106 @@
    !!  MPI  variable definition !!
    !! ========================= !!
-   !$AGRIF_DO_NOT_TREAT
-#  include <mpif.h>
-   !$AGRIF_END_DO_NOT_TREAT
+!$AGRIF_DO_NOT_TREAT
+#  include "mpif.h"
+!$AGRIF_END_DO_NOT_TREAT
    
    LOGICAL, PUBLIC, PARAMETER ::   lk_mpp = .TRUE.    !: mpp flag
@@ -1965 +1965 @@
       ! Allocate the right size to nrank_north
 #if ! defined key_agrif
-      IF( ALLOCATED( nrank_ice ) )   DEALLOCATE( nrank_ice )
+      IF( ALLOCATED ( nrank_ice ) )   DEALLOCATE( nrank_ice )
 #else
-      DEALLOCATE( nrank_ice )
+      IF( ASSOCIATED( nrank_ice ) )   DEALLOCATE( nrank_ice )
 #endif
       ALLOCATE( nrank_ice(ndim_rank_ice) )
@@ -2044 +2044 @@
          ! Allocate the right size to nrank_znl
 #if ! defined key_agrif
-         IF (ALLOCATED(nrank_znl)) DEALLOCATE(nrank_znl)
+         IF (ALLOCATED (nrank_znl)) DEALLOCATE(nrank_znl)
 #else
-         DEALLOCATE(nrank_znl)
+         IF (ASSOCIATED(nrank_znl)) DEALLOCATE(nrank_znl)
 #endif
          ALLOCATE(nrank_znl(ndim_rank_znl))
@@ -2126 +2126 @@
       !
       ! Allocate the right size to nrank_north
+#if ! defined key_agrif
+      IF (ALLOCATED (nrank_north)) DEALLOCATE(nrank_north)
+#else
+      IF (ASSOCIATED(nrank_north)) DEALLOCATE(nrank_north)
+#endif
       ALLOCATE( nrank_north(ndim_rank_north) )