Changeset 3658 for branches/2012/dev_r3604_LEGI8_TAM/NEMOGCM/NEMO/OPATAM_SRC/SBC/sbcssr_tam.F90

Timestamp:

2012-11-26T14:08:30+01:00 (11 years ago)

Author:

pabouttier

Message:

Missing allocation for sbcssr_tam variables - see Ticket #1022

File:

• branches/2012/dev_r3604_LEGI8_TAM/NEMOGCM/NEMO/OPATAM_SRC/SBC/sbcssr_tam.F90 (modified) (5 diffs)

branches/2012/dev_r3604_LEGI8_TAM/NEMOGCM/NEMO/OPATAM_SRC/SBC/sbcssr_tam.F90

@@ -36 +36 @@
    PUBLIC   sbc_ssr_tan    ! routine called in sbcmod_tam
    PUBLIC   sbc_ssr_adj    ! routine called in sbcmod_tam
+   PUBLIC   sbc_ssr_ini_tam    ! routine called in sbcmod_tam
    PUBLIC   sbc_ssr_adj_tst! routine called in tst
 
@@ -88 +89 @@
       !
       !                                               ! -------------------- !
-      IF( kt == nit000 ) THEN                         ! First call kt=nit000 !
-         !                                            ! -------------------- !
-         ! Allocate erp and qrp array
-         ALLOCATE( qrp_tl(jpi,jpj), erp_tl(jpi,jpj), STAT=ierror )
-         IF( ierror > 0 )   CALL ctl_stop( 'STOP', 'sbc_ssr: unable to allocate erp and qrp array' )
-         CALL sbc_ssr_ini_tam ( 0 )
-      ENDIF
+      !IF( kt == nit000 ) THEN                         ! First call kt=nit000 !
+         !!                                            ! -------------------- !
+         !! Allocate erp and qrp array
+         !ALLOCATE( qrp_tl(jpi,jpj), erp_tl(jpi,jpj), STAT=ierror )
+         !IF( ierror > 0 )   CALL ctl_stop( 'STOP', 'sbc_ssr: unable to allocate erp and qrp array' )
+         !CALL sbc_ssr_ini_tam ( 0 )
+      !ENDIF
 
       IF( nn_sstr + nn_sssr /= 0 ) THEN
@@ -150 +151 @@
       zqrpad = 0.0
       !                                               ! -------------------- !
-      IF( kt == nit000 ) THEN                         ! First call kt=nit000 !
-         !                                            ! -------------------- !
-         ! Allocate erp and qrp array
-         ALLOCATE( qrp_ad(jpi,jpj), erp_ad(jpi,jpj), STAT=ierror )
-         IF( ierror > 0 )   CALL ctl_stop( 'STOP', 'sbc_ssr: unable to allocate erp and qrp array' )
-         CALL sbc_ssr_ini_tam ( 1 )
-      ENDIF
+      !IF( kt == nit000 ) THEN                         ! First call kt=nit000 !
+         !!                                            ! -------------------- !
+         !! Allocate erp and qrp array
+         !ALLOCATE( qrp_ad(jpi,jpj), erp_ad(jpi,jpj), STAT=ierror )
+         !IF( ierror > 0 )   CALL ctl_stop( 'STOP', 'sbc_ssr: unable to allocate erp and qrp array' )
+         !CALL sbc_ssr_ini_tam ( 1 )
+      !ENDIF
 
       IF( nn_sstr + nn_sssr /= 0 ) THEN
@@ -346 +347 @@
    END SUBROUTINE sbc_ssr_adj_tst
 
-
-   SUBROUTINE sbc_ssr_ini_tam( kindic )
+   SUBROUTINE sbc_ssr_ini_tam
       USE fldread
+      INTEGER :: ierror
       CHARACTER(len=100) ::  cn_dir          ! Root directory for location of ssr files
       TYPE(FLD_N) ::   sn_sst, sn_sss        ! informations about the fields to be read
       !!----------------------------------------------------------------------
-      INTEGER, INTENT(IN) :: kindic
       NAMELIST/namsbc_ssr/ cn_dir, nn_sstr, nn_sssr, rn_dqdt, rn_deds, sn_sst, &
          &                 sn_sss, ln_sssr_bnd, rn_sssr_bnd
@@ -369 +369 @@
          WRITE(numout,*) '          dE/dS (restoring magnitude on SST)     deds    = ', rn_deds, ' mm/day'
       ENDIF
+         ALLOCATE( qrp_ad(jpi,jpj), erp_ad(jpi,jpj), &
+            &      qrp_tl(jpi,jpj), erp_tl(jpi,jpj), STAT=ierror )
+         IF( ierror > 0 )   CALL ctl_stop( 'STOP', 'sbc_ssr: unable to allocate erp and qrp array' )
 
       !
       ! Initialize qrp and erp if no restoring
-      IF ( kindic == 0 ) THEN
-         qrp_tl(:,:) = 0.e0
-         erp_tl(:,:) = 0.e0
-      ELSEIF ( kindic == 1 ) THEN
-         qrp_ad(:,:) = 0.e0
-         erp_ad(:,:) = 0.e0
-      END IF
+      qrp_tl(:,:) = 0.e0
+      erp_tl(:,:) = 0.e0
+      qrp_ad(:,:) = 0.e0
+      erp_ad(:,:) = 0.e0
    END SUBROUTINE sbc_ssr_ini_tam