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

Timestamp:

2017-03-09T13:52:43+01:00 (7 years ago)

Author:

mattmartin

Message:

Committing updates after doing the following:

• merging the branch dev_r4650_general_vert_coord_obsoper@7763 into this branch
• updating it so that the following OBS changes were implemented correctly on top of the simplification changes:
  • generalised vertical coordinate for profile obs. This was done so that is now the default option.
  • sst bias correction implemented with the new simplified obs code.
  • included the biogeochemical obs types int he new simplified obs code.
  • included the changes to exclude obs in the boundary for limited area models
  • included other changes for the efficiency of the obs operator to remove global arrays.

File:

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

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

@@ -193 +193 @@
       IF( .NOT. Agrif_Root() ) THEN
          CALL Agrif_ParentGrid_To_ChildGrid()
-         IF( ln_diaobs ) CALL dia_obs_wri
+         IF( lk_diaobs ) CALL dia_obs_wri
          IF( nn_timing == 1 )   CALL timing_finalize
          CALL Agrif_ChildGrid_To_ParentGrid()
@@ -723 +723 @@
       INTEGER, PARAMETER :: ntest = 14
       INTEGER, DIMENSION(ntest) :: ilfax
-      !!----------------------------------------------------------------------
-      ! lfax contains the set of allowed factors.
+      !
+      ! ilfax contains the set of allowed factors.
+      ilfax(:) = (/(2**jl,jl=ntest,1,-1)/)
+      !!----------------------------------------------------------------------
+      ! ilfax contains the set of allowed factors.
       ilfax(:) = (/(2**jl,jl=ntest,1,-1)/)