Changeset 6650

Timestamp:

2016-06-01T14:38:10+02:00 (8 years ago)

Author:

kingr

Message:

Altered code committed at last revision. Now uses IOM module function to check for surft increment to decide on apllying 2D or 3D increments. Previous code did not work for 2D case.

File:

• branches/UKMO/dev_r5518_v3.4_asm_nemovar_community/NEMOGCM/NEMO/OPA_SRC/ASM/asminc.F90 (modified) (3 diffs)

branches/UKMO/dev_r5518_v3.4_asm_nemovar_community/NEMOGCM/NEMO/OPA_SRC/ASM/asminc.F90

@@ -36 +36 @@
    USE in_out_manager   ! I/O manager
    USE lib_mpp          ! MPP library
-   USE netcdf           ! netcdf library
 #if defined key_lim2
    USE ice_2            ! LIM2
@@ -139 +138 @@
       INTEGER :: iitiaustr_date  ! Date YYYYMMDD of IAU interval start time step
       INTEGER :: iitiaufin_date  ! Date YYYYMMDD of IAU interval final time step
-      INTEGER :: idumvar         ! Local dummy integer
       INTEGER :: isurfstat       ! Local integer for status of reading surft variable
       !
@@ -433 +431 @@
             
             !Test if the increments file contains the surft variable.
-            isurfstat = nf90_inq_varid( inum, 'bckinsurft', idumvar )
-            IF ( isurfstat == 0 ) THEN
+            isurfstat = iom_varid( inum, 'bckinsurft', ldstop = .FALSE. )
+            IF ( isurfstat == -1 ) THEN
+               lk_surft = .FALSE.
+            ELSE
                lk_surft = .TRUE.
-            ELSE
-               lk_surft = .FALSE.
             ENDIF