Changeset 12459

Timestamp:

2020-02-25T17:14:19+01:00 (5 years ago)

Author:

smasson

Message:

trunk: fix uninitialized variable in sbcblk, see #2387

File:

• NEMO/trunk/src/OCE/SBC/sbcblk.F90 (modified) (2 diffs)

NEMO/trunk/src/OCE/SBC/sbcblk.F90

@@ -259 +259 @@
       IF( ierror > 0 )   CALL ctl_stop( 'STOP', 'sbc_blk_init: unable to allocate sf structure' )
       !
+      !                                      !- fill the bulk structure with namelist informations
+      CALL fld_fill( sf, slf_i, cn_dir, 'sbc_blk_init', 'surface boundary condition -- bulk formulae', 'namsbc_blk' )
+      !
       DO jfpr= 1, jpfld
          !
@@ -269 +272 @@
                &      jfpr == jp_hpgi .OR. jfpr == jp_hpgj .OR. jfpr == jp_tair     )  ) THEN   ! ABL: some fields are 3D input
                ALLOCATE( sf(jfpr)%fnow(jpi,jpj,jpka) )
-               IF( slf_i(jfpr)%ln_tint )   ALLOCATE( sf(jfpr)%fdta(jpi,jpj,jpka,2) )
+               IF( sf(jfpr)%ln_tint )   ALLOCATE( sf(jfpr)%fdta(jpi,jpj,jpka,2) )
             ELSE                                                                                ! others or Bulk fields are 2D fiels
                ALLOCATE( sf(jfpr)%fnow(jpi,jpj,1) )
-               IF( slf_i(jfpr)%ln_tint )   ALLOCATE( sf(jfpr)%fdta(jpi,jpj,1,2) )
+               IF( sf(jfpr)%ln_tint )   ALLOCATE( sf(jfpr)%fdta(jpi,jpj,1,2) )
             ENDIF
             !
-            IF( slf_i(jfpr)%freqh > 0. .AND. MOD( NINT(3600. * slf_i(jfpr)%freqh), nn_fsbc * NINT(rdt) ) /= 0 )   &
+            IF( sf(jfpr)%freqh > 0. .AND. MOD( NINT(3600. * sf(jfpr)%freqh), nn_fsbc * NINT(rdt) ) /= 0 )   &
                &  CALL ctl_warn( 'sbc_blk_init: sbcmod timestep rdt*nn_fsbc is NOT a submultiple of atmospheric forcing frequency.',   &
                &                 '               This is not ideal. You should consider changing either rdt or nn_fsbc value...' )
          ENDIF
       END DO
-      !                                      !- fill the bulk structure with namelist informations
-      CALL fld_fill( sf, slf_i, cn_dir, 'sbc_blk_init', 'surface boundary condition -- bulk formulae', 'namsbc_blk' )
       !
       IF( ln_wave ) THEN