Changeset 1790

Timestamp:

2009-12-09T09:29:24+01:00 (14 years ago)

Author:

sga

Message:

correct logic: no forcing in outer model is probably not good, 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) (4 diffs)

branches/dev_005_AWL/NEMO/NST_SRC/agrif_nolim_interp.F90

@@ -34 +34 @@
    PUBLIC agrif_nolim_extrap
 
-   LOGICAL, PUBLIC                ::   lk_nolim_nst = .TRUE.
+   LOGICAL, PUBLIC                ::   lk_nolim_nst
    INTEGER, PARAMETER             ::   jp_nst = 10  ! maximum number of grids to remember
    INTEGER                        ::   mp_nst       ! number of grids remembered
@@ -77 +77 @@
 
       !!----------------------------------------------------------------------
+
+      ! logical is always true in a nest by definition,
+      ! it is true in the outer model only if there is a nest present
+
+      lk_nolim_nst = .TRUE.
 
       IF( .NOT. Agrif_Root() ) RETURN
@@ -144 +149 @@
   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.
+      !  unset logical if we have don't any nests to run with
+      !
+      IF( mp_nst == 0 ) lk_nolim_nst = .FALSE.
 
    END SUBROUTINE agrif_nolim_init

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

@@ -103 +103 @@
          IF( nn_ice /= 0 ) CALL ctl_stop("sbcmod: non-zero nn_ice in nest model when interpolating") 
          IF( ln_ssr )      CALL ctl_stop("sbcmod: surface relaxation not valid when interpolating")
+         IF( ln_rnf )      CALL ctl_stop("sbcmod: adding runoff not valid when interpolating")
          IF( nn_fwb  /= 0) CALL ctl_stop("sbcmod: adjustment of freshwater budget not valid when interpolating")
       ENDIF
@@ -212 +213 @@
          
 #if key_agrif && defined key_agrif_nolim
-
-      ! 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
+      !
+      IF( .NOT. Agrif_Root() ) THEN
+         !
+         CALL agrif_nolim_flx( kt )
+         !
+      ELSE
+#endif
 
       SELECT CASE( nsbc )                        ! Compute ocean surface boundary condition
@@ -250 +238 @@
       END SELECT
 
+#if key_agrif && defined key_agrif_nolim
+      !
+      IF( lk_nolim_nst ) CALL agrif_nolim_extrap( kt )
+      !
+      ENDIF
+#endif
+
       ! Misc. Options
       ! -------------
@@ -271 +266 @@
       IF( nclosea == 1 )   CALL sbc_clo( kt )                   ! treatment of closed sea in the model domain 
       !                                                         ! (update freshwater fluxes)
-      ENDIF
-      !
       IF( MOD( kt-1, nn_fsbc ) == 0 ) THEN
          CALL iom_put( "emp"    , emp       )                   ! upward water flux