Changeset 2129 for branches/devukmo2010/NEMO/OPA_SRC/opa.F90

Timestamp:

2010-09-29T13:01:23+02:00 (14 years ago)

Author:

rfurner

Message:

pervious merge had mised bits of OBS branch, adding these now

File:

• branches/devukmo2010/NEMO/OPA_SRC/opa.F90 (modified) (3 diffs)

branches/devukmo2010/NEMO/OPA_SRC/opa.F90

@@ -58 +58 @@
    USE sshwzv          ! vertical velocity used in asm
    USE diaptr          ! poleward transports           (dia_ptr_init routine)
+   USE diaobs          ! Observation diagnostics       (dia_obs_init routine)
    USE step            ! OPA time-stepping                  (stp     routine)
 #if defined key_oasis3
@@ -160 +161 @@
          END DO
       ENDIF
+
+      IF( lk_diaobs ) CALL dia_obs_wri
        
       !                            !------------------------!
@@ -294 +297 @@
       !                                     ! diagnostics
       CALL iom_init                             ! iom_put initialization
+
+      IF( lk_diaobs ) THEN
+         CALL dia_obs_init                  ! Initialize observational data
+         CALL dia_obs( nit000 - 1 )         ! Observation operator for restart
+      ENDIF      
+
       CALL dia_ptr_init                         ! Poleward TRansports initialization
       CALL trd_mod_init                         ! Mixed-layer/Vorticity/Integral constraints trends