Changeset 1242 for trunk/NEMO/OPA_SRC/SBC/sbcrnf.F90

Timestamp:

2009-01-06T11:21:38+01:00 (15 years ago)

Author:

rblod

Message:

Fix runtime issues with AGRIF on NEC and add the ability to run without sea-ice on the fine grid hierarchy

File:

• trunk/NEMO/OPA_SRC/SBC/sbcrnf.F90 (modified) (4 diffs)

trunk/NEMO/OPA_SRC/SBC/sbcrnf.F90

@@ -66 +66 @@
       !
       INTEGER  ::   ji, jj   ! dummy loop indices
+      INTEGER  ::   ierror   ! temporary integer
       !!----------------------------------------------------------------------
       !                                   
-      IF( kt == nit000 )   CALL sbc_rnf_init
+      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) )
+         ENDIF
+         CALL sbc_rnf_init(sf_rnf)
+      ENDIF
 
       !                                                   !-------------------!
@@ -97 +108 @@
 
 
-   SUBROUTINE sbc_rnf_init
+   SUBROUTINE sbc_rnf_init( sf_rnf )
       !!----------------------------------------------------------------------
       !!                  ***  ROUTINE sbc_rnf_init  ***
@@ -107 +118 @@
       !! ** Action  : - read parameters
       !!----------------------------------------------------------------------
-      INTEGER  ::   ierror   ! temporary integer
+      TYPE(FLD), INTENT(inout), DIMENSION(:) :: sf_rnf   ! input data
       !!
       NAMELIST/namsbc_rnf/ cn_dir, ln_rnf_emp, sn_rnf, sn_cnf, ln_rnf_mouth,   &
@@ -148 +159 @@
       ELSE                                      ! runoffs read in a file : set sf_rnf structure 
          !
-         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) )
-
+         ! sf_rnf already allocated in main routine
          ! 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' )