Changeset 6646

Timestamp:

2016-05-31T15:53:49+02:00 (8 years ago)

Author:

mattmartin

Message:

Committing change to branch to check whether the increments file has the "surft" increment variable, and if it does then to only apply those ones, and if not then to go through the normal increments application code in NEMO.

File:

• branches/UKMO/dev_r5518_v3.4_asm_nemovar_community/NEMOGCM/NEMO/OPA_SRC/ASM/asminc.F90 (modified) (4 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
@@ -138 +139 @@
       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
       !
       REAL(wp) :: znorm        ! Normalization factor for IAU weights
@@ -153 +156 @@
           
       REAL(wp), POINTER, DIMENSION(:,:) ::   hdiv   ! 2D workspace
+      !
+      LOGICAL :: lk_surft      ! Logical: T => Increments file contains surft variable 
+                               !               so only apply surft increments.
       !!
       NAMELIST/nam_asminc/ ln_bkgwri,                                      &
@@ -426 +432 @@
          IF ( ln_trainc ) THEN   
             
-            IF (ln_sco) THEN 
+            !Test if the increments file contains the surft variable.
+            isurfstat = nf90_inq_varid( inum, 'bckinsurft', idumvar )
+            IF ( isurfstat == 0 ) THEN
+               lk_surft = .TRUE.
+            ELSE
+               lk_surft = .FALSE.
+            ENDIF             
+
+            IF (lk_surft) THEN 
                 
                ALLOCATE(z_mld(jpi,jpj))