Changeset 1573 for trunk/NEMO

Timestamp:

2009-08-03T17:57:25+02:00 (15 years ago)

Author:

ctlod

Message:

Add a control on the nn_fwb parameter, it is related to ticket #501

Location:

trunk/NEMO/OPA_SRC/SBC

Files:

• sbcfwb.F90 (modified) (1 diff)
• sbcssr.F90 (modified) (1 diff)

trunk/NEMO/OPA_SRC/SBC/sbcfwb.F90

@@ -81 +81 @@
             IF( kn_fwb == 1 )   WRITE(numout,*) '          instantaneously set to zero'
             IF( kn_fwb == 2 )   WRITE(numout,*) '          adjusted from previous year budget'
-            IF( kn_fwb == 3 )   WRITE(numout,*) '          set to zero and spread out over erp area'
+            IF( kn_fwb == 3 )   WRITE(numout,*) '          emp set to zero and spread out over erp area'
+            !
+            IF( kn_fwb == 3 .AND. nn_sssr /= 2 )   &
+               &   CALL ctl_stop( 'The option nn_fwb = 3 must be associated to nn_sssr = 2 ' )
+            
          ENDIF
          !

trunk/NEMO/OPA_SRC/SBC/sbcssr.F90

@@ -32 +32 @@
    REAL(wp), PUBLIC, DIMENSION(jpi,jpj) ::   qrp      !: heat flux damping        [w/m2]
 
-   !                              !!* Namelist namsbc_ssr *
-   INTEGER ::   nn_sstr, nn_sssr   ! SST/SSS restoring indicator
-   REAL(wp) ::  dqdt   , deds      ! restoring factor on SST and SSS
-   LOGICAL ::   ln_sssr_bnd        ! flag to bound erp term 
-   REAL(wp) ::  rn_sssr_bnd        ! ABS(Max./Min.) value of erp term [mm/day]
+   !                                      !!* Namelist namsbc_ssr *
+   INTEGER, PUBLIC ::   nn_sstr, nn_sssr   ! SST/SSS restoring indicator
+   REAL(wp)        ::   dqdt, deds         ! restoring factor on SST and SSS
+   LOGICAL         ::   ln_sssr_bnd        ! flag to bound erp term 
+   REAL(wp)        ::   rn_sssr_bnd        ! ABS(Max./Min.) value of erp term [mm/day]
 
    REAL(wp) , ALLOCATABLE, DIMENSION(:) ::   buffer   ! Temporary buffer for exchange