Changeset 7837 for branches/UKMO/dev_r5785_SSS_obsoper/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90

Timestamp:

2017-03-27T10:50:24+02:00 (7 years ago)

Author:

mattmartin

Message:

First version of generic obs oper which works at NEMO3.6 with other GO6 branches.

File:

• branches/UKMO/dev_r5785_SSS_obsoper/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90 (modified) (2 diffs)

branches/UKMO/dev_r5785_SSS_obsoper/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90

@@ -176 +176 @@
 #endif
 
-      IF( ln_diaobs   )   CALL dia_obs_wri
+      IF( lk_diaobs   )   CALL dia_obs_wri
       !
       IF( ln_icebergs )   CALL icb_end( nitend )
@@ -467 +467 @@
                             CALL dia_hsb_init   ! heat content, salt content and volume budgets
                             CALL     trd_init   ! Mixed-layer/Vorticity/Integral constraints trends
+      IF( lk_diaobs     ) THEN                  ! Observation & model comparison
                             CALL dia_obs_init            ! Initialize observational data
-      IF( ln_diaobs     )   CALL dia_obs( nit000 - 1 )   ! Observation operator for restart
-
+                            CALL dia_obs( nit000 - 1 )   ! Observation operator for restart
+      ENDIF
       !                                         ! Assimilation increments
       IF( lk_asminc     )   CALL asm_inc_init   ! Initialize assimilation increments