Changeset 1998 for branches/DEV_R1821_Rivers/NEMO/OPA_SRC/SBC/sbcrnf.F90

Timestamp:

2010-07-08T17:12:21+02:00 (14 years ago)

Author:

acc

Message:

ticket #465_Rivers tidied code and added namelist changes in preparation for mid-year merge

File:

• branches/DEV_R1821_Rivers/NEMO/OPA_SRC/SBC/sbcrnf.F90 (modified) (7 diffs)

branches/DEV_R1821_Rivers/NEMO/OPA_SRC/SBC/sbcrnf.F90

@@ -38 +38 @@
    REAL(wp)          , PUBLIC ::   rn_hrnf      = 0.e0    !: runoffs, depth over which enhanced vertical mixing is used
    REAL(wp)          , PUBLIC ::   rn_avt_rnf   = 0.e0    !: runoffs, value of the additional vertical mixing coef. [m2/s]
-   LOGICAL           , PUBLIC ::   ln_rnf_att   = .false.  !: river runoffs attributes (temp, sal & depth) are specified in a file 
+   LOGICAL           , PUBLIC ::   ln_rnf_att   = .false. !: river runoffs attributes (temp, sal & depth) are specified in a file 
    REAL(wp)          , PUBLIC ::   rn_rfact     = 1.e0    !: multiplicative factor for runoff
 
@@ -45 +45 @@
    REAL(wp), PUBLIC, DIMENSION(jpk)     ::   rnfmsk_z    !: river mouth mask (vert.)
 
-   TYPE(FLD), ALLOCATABLE, DIMENSION(:) ::   sf_rnf   ! structure of input SST (file information, fields read)
-
-   TYPE(FLD), ALLOCATABLE, DIMENSION(:) ::   sf_sal_rnf    !: structure of input salinity (file information, fields read)  
-   TYPE(FLD), ALLOCATABLE, DIMENSION(:) ::   sf_tmp_rnf    !: structure of input tmeperature (file information, fields read)  
+   TYPE(FLD), ALLOCATABLE, DIMENSION(:) ::   sf_rnf        !: structure of input river runoff (file information, fields read)
+
+   TYPE(FLD), ALLOCATABLE, DIMENSION(:) ::   sf_sal_rnf    !: structure of input river runoff salinity (file information, fields read)  
+   TYPE(FLD), ALLOCATABLE, DIMENSION(:) ::   sf_tmp_rnf    !: structure of input river runoff temperature (file information, fields read)  
  
-!   REAL,    PUBLIC, DIMENSION(jpi,jpj) ::  rnf             !: mass flux of river runoff (in kg/m2/s)  
    REAL,    PUBLIC, DIMENSION(jpi,jpj) ::  rnf_dep         !: depth of runoff in m  
    INTEGER, PUBLIC, DIMENSION(jpi,jpj) ::  rnf_mod_dep     !: depth of runoff in model levels  
@@ -89 +88 @@
       !                                   
       IF( kt == nit000 ) THEN  
-         IF( .NOT. ln_rnf_emp ) THEN
-            ALLOCATE( sf_rnf(1), STAT=ierror )
-            IF( ierror > 0 ) THEN
-               CALL ctl_stop( 'sbc_rnf: unable to allocate sf_rnf structure' )   ;   RETURN
-            ENDIF
-            ALLOCATE( sf_rnf(1)%fnow(jpi,jpj) )
-            ALLOCATE( sf_rnf(1)%fdta(jpi,jpj,2) )
- 
-            ALLOCATE( sf_sal_rnf(1), STAT=ierror )  
-            IF( ierror > 0 ) THEN  
-               CALL ctl_stop( 'sbc_sal_rnf: unable to allocate sf_sal_rnf structure' )   ;   RETURN  
-            ENDIF  
-            ALLOCATE( sf_sal_rnf(1)%fnow(jpi,jpj) )  
-            ALLOCATE( sf_sal_rnf(1)%fdta(jpi,jpj,2) )  
-   
-            ALLOCATE( sf_tmp_rnf(1), STAT=ierror )  
-            IF( ierror > 0 ) THEN  
-                CALL ctl_stop( 'sbc_tmp_rnf: unable to allocate sf_tmp_rnf structure' )   ;   RETURN  
-            ENDIF  
-            ALLOCATE( sf_tmp_rnf(1)%fnow(jpi,jpj) )  
-            ALLOCATE( sf_tmp_rnf(1)%fdta(jpi,jpj,2) )  
-         ENDIF  
-         CALL sbc_rnf_init( sf_rnf, sf_tmp_rnf, sf_sal_rnf )  
+         CALL sbc_rnf_init                      ! Read namelist and allocate structures
       ENDIF
 
@@ -146 +123 @@
                rnf_tmp(:,:) = -999  
             ENDIF  
-            CALL iom_put( "runoffs", sf_rnf(1)%fnow )         ! runoffs
+            CALL iom_put( "runoffs", rnf )         ! runoffs
          ENDIF
          !
@@ -154 +131 @@
 
 
-   SUBROUTINE sbc_rnf_init( sf_rnf, sf_tmp_rnf, sf_sal_rnf )  
+   SUBROUTINE sbc_rnf_init
       !!----------------------------------------------------------------------
       !!                  ***  ROUTINE sbc_rnf_init  ***
@@ -164 +141 @@
       !! ** Action  : - read parameters
       !!----------------------------------------------------------------------
-      TYPE(FLD), INTENT(inout), DIMENSION(:) :: sf_rnf, sf_tmp_rnf, sf_sal_rnf   ! input data  
       CHARACTER(len=32) ::   rn_dep_file   ! runoff file name  
       !! 
@@ -207 +183 @@
          IF(lwp) WRITE(numout,*)
          IF(lwp) WRITE(numout,*) '          runoffs directly provided in the precipitations'
-         IF ( ln_rnf_att ) CALL ctl_warn( 'runoffs already included in precipitations & so runoff attributes not included' ) 
+         IF ( ln_rnf_att ) THEN
+           CALL ctl_warn( 'runoffs already included in precipitations & so runoff attributes will not be used' ) 
+           ln_rnf_att = .FALSE.
+         ENDIF
          !
       ELSE                                      ! runoffs read in a file : set sf_rnf structure 
          !
-         ! sf_rnf already allocated in main routine
+         ! Allocate sf_rnf structure and (if required) sf_sal_rnf and sf_tmp_rnf structures
+         ALLOCATE( sf_rnf(1), STAT=ierror )
+         IF( ierror > 0 ) THEN
+            CALL ctl_stop( 'sbc_rnf: unable to allocate sf_rnf structure' )   ;   RETURN
+         ENDIF
+         ALLOCATE( sf_rnf(1)%fnow(jpi,jpj) )
+         ALLOCATE( sf_rnf(1)%fdta(jpi,jpj,2) )
+
+         IF( ln_rnf_att ) THEN
+            ALLOCATE( sf_sal_rnf(1), STAT=ierror )
+            IF( ierror > 0 ) THEN
+               CALL ctl_stop( 'sbc_sal_rnf: unable to allocate sf_sal_rnf structure' )   ;   RETURN
+            ENDIF
+            ALLOCATE( sf_sal_rnf(1)%fnow(jpi,jpj) )
+            ALLOCATE( sf_sal_rnf(1)%fdta(jpi,jpj,2) )
+
+            ALLOCATE( sf_tmp_rnf(1), STAT=ierror )
+            IF( ierror > 0 ) THEN
+                CALL ctl_stop( 'sbc_tmp_rnf: unable to allocate sf_tmp_rnf structure' )   ;   RETURN
+            ENDIF
+            ALLOCATE( sf_tmp_rnf(1)%fnow(jpi,jpj) )
+            ALLOCATE( sf_tmp_rnf(1)%fdta(jpi,jpj,2) )
+         ENDIF
          ! fill sf_rnf with sn_rnf and control print
          CALL fld_fill( sf_rnf, (/ sn_rnf /), cn_dir, 'sbc_rnf_init', 'read runoffs data', 'namsbc_rnf' )