Changeset 1789 for branches/dev_005_AWL

Timestamp:

2009-12-08T16:17:43+01:00 (14 years ago)

Author:

sga

Message:

add a logical so that code can be run with nolim key set, but zero nests, NEMO branch dev_005_AWL

Location:

branches/dev_005_AWL/NEMO

Files:

• NST_SRC/agrif_nolim_interp.F90 (modified) (3 diffs)
• OPA_SRC/SBC/sbcmod.F90 (modified) (3 diffs)

branches/dev_005_AWL/NEMO/NST_SRC/agrif_nolim_interp.F90

@@ -34 +34 @@
    PUBLIC agrif_nolim_extrap
 
+   LOGICAL, PUBLIC                ::   lk_nolim_nst = .TRUE.
    INTEGER, PARAMETER             ::   jp_nst = 10  ! maximum number of grids to remember
    INTEGER                        ::   mp_nst       ! number of grids remembered
@@ -142 +143 @@
 
   100 CONTINUE
+
+      !  only set logical if we have any nests to run with
+      lk_nolim_nst = .FALSE.
+      IF( mp_nst > 0 ) lk_nolim_nst = .TRUE.
 
    END SUBROUTINE agrif_nolim_init
@@ -474 +479 @@
 
 #else
+   !
+   LOGICAL, PUBLIC                ::   lk_nolim_nst = .FALSE.
+   !
 CONTAINS
-   SUBROUTINE Agrif_flx_Interp_empty
+   SUBROUTINE agrif_nolim_init( )
       !!---------------------------------------------
-      !!   *** ROUTINE agrif_flx_Interp_empty ***
+      !!   *** ROUTINE agrif_nolim_init  ***
       !!---------------------------------------------
-      WRITE(*,*)  'agrif_flx_interp : You should not have seen this print! error?'
-   END SUBROUTINE Agrif_flx_Interp_empty
+      WRITE(*,*)  'agrif_nolim_init : You should not have seen this print! error?'
+   END SUBROUTINE agrif_nolim_init
+   SUBROUTINE agrif_nolim_extrap( )
+      !!---------------------------------------------
+      !!   *** ROUTINE agrif_nolim_extrap  ***
+      !!---------------------------------------------
+      WRITE(*,*)  'agrif_nolim_extrap : You should not have seen this print! error?'
+   END SUBROUTINE agrif_nolim_extrap
+   SUBROUTINE agrif_nolim_flx( )
+      !!---------------------------------------------
+      !!   *** ROUTINE agrif_nolim_flx  ***
+      !!---------------------------------------------
+      WRITE(*,*)  'agrif_nolim_flx : You should not have seen this print! error?'
+   END SUBROUTINE agrif_nolim_flx
 #endif
    !!======================================================================

branches/dev_005_AWL/NEMO/OPA_SRC/SBC/sbcmod.F90

@@ -37 +37 @@
    USE iom
    USE in_out_manager  ! I/O manager
-#if defined key_agrif_nolim
    USE agrif_nolim
-#endif
 
    IMPLICIT NONE
@@ -215 +213 @@
 #if key_agrif && defined key_agrif_nolim
 
-      IF( Agrif_Root() ) THEN
-         !
-         CALL agrif_nolim_extrap( kt )
-         !
-      ELSE
-         !
-         CALL agrif_nolim_flx( kt )
-         !
-      ENDIF
-
-#else
+      ! use nolim code only if both key_agrif_nolim is set and logical is true
+      ! this way the logical can be false if there are no nests (ie AGRIF_FixedGrids.in has a zero)
+
+      IF( lk_nolim_nst) THEN
+
+         IF( Agrif_Root() ) THEN
+            !
+            CALL agrif_nolim_extrap( kt )
+            !
+         ELSE
+            !
+            CALL agrif_nolim_flx( kt )
+            !
+         ENDIF
+
+      ENDIF
+#endif
+
+      IF( .NOT. lk_nolim_nst ) THEN
 
       SELECT CASE( nsbc )                        ! Compute ocean surface boundary condition
@@ -265 +271 @@
       IF( nclosea == 1 )   CALL sbc_clo( kt )                   ! treatment of closed sea in the model domain 
       !                                                         ! (update freshwater fluxes)
-#endif
+      ENDIF
       !
       IF( MOD( kt-1, nn_fsbc ) == 0 ) THEN