Changeset 4839

Timestamp:

2014-11-10T15:43:23+01:00 (9 years ago)

Author:

timgraham

Message:

Corrected bug fix for unitialised variables in GLS scheme when using AMM12 with reduced restarts - see ticket #1402.
Also set nn_istate=0 for AMM12 as uses too much disk space in SETTE tests.

Location:

trunk/NEMOGCM

Files:

• CONFIG/AMM12/EXP00/namelist_cfg (modified) (1 diff)
• NEMO/OPA_SRC/ZDF/zdfgls.F90 (modified) (2 diffs)

trunk/NEMOGCM/CONFIG/AMM12/EXP00/namelist_cfg

@@ -14 +14 @@
    cn_ocerst_in   = "amm12_restart_oce"   !  suffix of ocean restart name (input)
    cn_ocerst_out  = "restart_oce_out"   !  suffix of ocean restart name (input)
-   nn_istate   =       1   !  output the initial state (1) or not (0)
    nn_stock    =    1296   !  frequency of creation of a restart file (modulo referenced to 1)
    nn_write    =     144   !  frequency of write in the output file   (modulo referenced to nit000) 

trunk/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfgls.F90

@@ -1258 +1258 @@
                en  (:,:,:) = rn_emin
                mxln(:,:,:) = 0.001        
+               avt_k (:,:,:) = avt (:,:,:)
+               avm_k (:,:,:) = avm (:,:,:)
+               avmu_k(:,:,:) = avmu(:,:,:)
+               avmv_k(:,:,:) = avmv(:,:,:)
                DO jit = nit000 + 1, nit000 + 10   ;   CALL zdf_gls( jit )   ;   END DO
             ENDIF
@@ -1264 +1268 @@
             en  (:,:,:) = rn_emin
             mxln(:,:,:) = 0.001       
-            avt_k (:,:,:) = avt (:,:,:)
-            avm_k (:,:,:) = avm (:,:,:)
-            avmu_k(:,:,:) = avmu(:,:,:)
-            avmv_k(:,:,:) = avmv(:,:,:)
          ENDIF
          !