Changeset 2062 for branches

Timestamp:

2010-08-19T15:50:43+02:00 (14 years ago)

Author:

djlea

Message:

Two minor fixes. One to correct a typo in the output of asm namelist variables. The other to put missing if defined key control around code which calls asm.

Location:

branches/dev_1784_ASM/NEMO/OPA_SRC

Files:

• ASM/asminc.F90 (modified) (1 diff)
• DYN/sshwzv.F90 (modified) (2 diffs)

branches/dev_1784_ASM/NEMO/OPA_SRC/ASM/asminc.F90

@@ -246 +246 @@
             &            ' nittrjfrq = ', nittrjfrq
          WRITE(numout,*) '             Logical switch for ensuring that the sa > salfixmin     ', &
-            &            ' ln_salinc = ', ln_salfix
+            &            ' ln_salfix = ', ln_salfix
          WRITE(numout,*) '             Minimum salinity after applying the increments          ', &
             &            ' salfixmin = ', salfixmin

branches/dev_1784_ASM/NEMO/OPA_SRC/DYN/sshwzv.F90

@@ -28 +28 @@
    USE diaar5, ONLY :   lk_diaar5
    USE iom
+#if defined key_asminc   
    USE asminc          ! Assimilation increment
+#endif
 
    IMPLICIT NONE
@@ -190 +192 @@
 
 ! Include the IAU weighted SSH increment
+#if defined key_asminc
       IF( ( lk_asminc ).AND.( ln_sshinc ).AND.( ln_asmiau ) ) THEN
          CALL ssh_asm_inc( kt )
          ssha(:,:) = ssha(:,:) + z2dt * ssh_iau(:,:)
       ENDIF
+#endif
 
       !                                           !------------------------------!