Changeset 3363 for branches/2012/dev_r3322_NOCS09_SAS/NEMOGCM/NEMO/SAS_SRC/sbcssm.F90

Timestamp:

2012-04-24T13:24:17+02:00 (12 years ago)

Author:

sga

Message:

NEMO branch dev_r3322_NOCS09_SAS: bugfixes of the changes to the modifications of the sbcssm imposter

File:

• branches/2012/dev_r3322_NOCS09_SAS/NEMOGCM/NEMO/SAS_SRC/sbcssm.F90 (modified) (7 diffs)

branches/2012/dev_r3322_NOCS09_SAS/NEMOGCM/NEMO/SAS_SRC/sbcssm.F90

@@ -33 +33 @@
    PRIVATE
 
-   PUBLIC   sbc_ssm_init   ! called by opa.F90
-   PUBLIC   sbc_ssm        ! called by step.F90
-
-   CHARACTER(len=100) ::   cn_dir     = './'    !: Root directory for location of ssm files
-   LOGICAL            ::   ln_3d_uv   = .true.  !: specify whether input velocity data is 3D
+   PUBLIC   sbc_ssm_sas_init   ! called by opa.F90
+   PUBLIC   sbc_ssm            ! called by step.F90
+
+   CHARACTER(len=100)   ::   cn_dir     = './'    !: Root directory for location of ssm files
+   LOGICAL              ::   ln_3d_uv   = .true.  !: specify whether input velocity data is 3D
+   INTEGER  , SAVE      ::   nfld_3d
+   INTEGER  , SAVE      ::   nfld_2d
 
    INTEGER  , PARAMETER ::   jpfld_3d = 4   ! maximum number of files to read
@@ -118 +120 @@
       ENDIF
 
-      IF( jfld_3d > 0 ) CALL fld_read( kt, 1, sf_ssm_3d )      !==   read data at kt time step   ==!
-      IF( jfld_2d > 0 ) CALL fld_read( kt, 1, sf_ssm_2d )      !==   read data at kt time step   ==!
+      IF( nfld_3d > 0 ) CALL fld_read( kt, 1, sf_ssm_3d )      !==   read data at kt time step   ==!
+      IF( nfld_2d > 0 ) CALL fld_read( kt, 1, sf_ssm_2d )      !==   read data at kt time step   ==!
       ! 
       IF( ln_3d_uv ) THEN
@@ -162 +164 @@
       INTEGER  :: ierr, ierr0, ierr1, ierr2, ierr3   ! return error code
       INTEGER  :: ifpr                               ! dummy loop indice
-      INTEGER  :: jfld_3d, jfld_2d                   ! dummy loop arguments
       INTEGER  :: inum, idv, idimv, jpm              ! local integer
       !!
@@ -202 +203 @@
       IF( ln_3d_uv ) THEN
          jf_usp = 1 ; jf_vsp = 2
-         jfld_3d  = 2
-         jfld_2d  = 3
+         nfld_3d  = 2
+         nfld_2d  = 3
          slf_3d(jf_usp) = sn_usp ; slf_3d(jf_vsp) = sn_vsp
       ELSE
          jf_usp = 4 ; jf_vsp = 5
-         jfld_3d  = 0
-         jfld_2d  = 5
+         nfld_3d  = 0
+         nfld_2d  = 5
          slf_2d(jf_usp) = sn_usp ; slf_2d(jf_vsp) = sn_vsp
       ENDIF
@@ -214 +215 @@
       slf_2d(jf_tem) = sn_tem ; slf_2d(jf_sal) = sn_sal ; slf_2d(jf_ssh) = sn_ssh
       !
-      IF( jfld_3d > 0 ) THEN
-         ALLOCATE( sf_ssm_3d(jfld_3d), STAT=ierr )         ! set sf structure
+      IF( nfld_3d > 0 ) THEN
+         ALLOCATE( sf_ssm_3d(nfld_3d), STAT=ierr )         ! set sf structure
          IF( ierr > 0 ) THEN
             CALL ctl_stop( 'sbc_ssm: unable to allocate sf structure' )   ;   RETURN
          ENDIF
-         DO ifpr = 1, jfld_3d
+         DO ifpr = 1, nfld_3d
                                        ALLOCATE( sf_ssm_3d(ifpr)%fnow(jpi,jpj,jpk)    , STAT=ierr0 )
             IF( slf_3d(ifpr)%ln_tint ) ALLOCATE( sf_ssm_3d(ifpr)%fdta(jpi,jpj,jpk,2)  , STAT=ierr1 )
@@ -230 +231 @@
       ENDIF
 
-      IF( jfld_2d > 0 ) THEN
-         ALLOCATE( sf_ssm_2d(jfld_2d), STAT=ierr )         ! set sf structure
+      IF( nfld_2d > 0 ) THEN
+         ALLOCATE( sf_ssm_2d(nfld_2d), STAT=ierr )         ! set sf structure
          IF( ierr > 0 ) THEN
             CALL ctl_stop( 'sbc_ssm: unable to allocate sf 2d structure' )   ;   RETURN
          ENDIF
-         DO ifpr = 1, jfld_2d
+         DO ifpr = 1, nfld_2d
                                        ALLOCATE( sf_ssm_2d(ifpr)%fnow(jpi,jpj,1)    , STAT=ierr0 )
             IF( slf_2d(ifpr)%ln_tint ) ALLOCATE( sf_ssm_2d(ifpr)%fdta(jpi,jpj,1,2)  , STAT=ierr1 )
@@ -259 +260 @@
       ENDIF
       !
-   END SUBROUTINE sbc_ssm_init
+   END SUBROUTINE sbc_ssm_sas_init
 
    !!======================================================================