Changeset 4843 for branches/2014/dev_r4650_UKMO14.12_STAND_ALONE_OBSOPER

Timestamp:

2014-11-12T12:34:53+01:00 (9 years ago)

Author:

andrewryan

Message:

removed dia_obs_init from nemo_init and removed guard logical from nemo_gcm

File:

• branches/2014/dev_r4650_UKMO14.12_STAND_ALONE_OBSOPER/NEMOGCM/NEMO/OOO_SRC/nemogcm.F90 (modified) (2 diffs)

branches/2014/dev_r4650_UKMO14.12_STAND_ALONE_OBSOPER/NEMOGCM/NEMO/OOO_SRC/nemogcm.F90

@@ -106 +106 @@
          !! Loop over various model counterparts
          DO jimatch = 1, cl4_match_len
-            IF (jimatch .GT. 1) THEN
-               !! Initialise obs_oper
-               CALL dia_obs_init
-            END IF
+            !! Initialise obs_oper
+            CALL dia_obs_init
             !! Interpolate to observation space
             CALL ooo_interp
@@ -294 +292 @@
 
                             CALL  istate_init   ! ocean initial state (Dynamics and tracers)
-
-      !     
-      IF( lk_diaobs     ) THEN                  ! Observation & model comparison
-                            CALL dia_obs_init            ! Initialize observational data
-                            CALL dia_obs( nit000 - 1 )   ! Observation operator for restart
-      ENDIF
    END SUBROUTINE nemo_init