Changeset 7773 for branches/UKMO/dev_r5785_SSS_obsoper/NEMOGCM/NEMO/OPA_SRC/TRD/trdmxl.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/TRD/trdmxl.F90 (modified) (2 diffs)

branches/UKMO/dev_r5785_SSS_obsoper/NEMOGCM/NEMO/OPA_SRC/TRD/trdmxl.F90

@@ -165 +165 @@
 
 
-         SELECT CASE( ktrd )
-         CASE( jptra_npc  )               ! non-penetrative convection: regrouped with zdf
+      SELECT CASE( ktrd )
+      CASE( jptra_npc  )               ! non-penetrative convection: regrouped with zdf
 !!gm : to be completed ! 
-!        IF( ....
+!         IF( ....
 !!gm end
-         CASE( jptra_zdfp )               ! iso-neutral diffusion: "pure" vertical diffusion
-!                                   ! regroup iso-neutral diffusion in one term
+      CASE( jptra_zdfp )               ! iso-neutral diffusion: "pure" vertical diffusion
+         !                                   ! regroup iso-neutral diffusion in one term
          tmltrd(:,:,jpmxl_ldf) = tmltrd(:,:,jpmxl_ldf) + ( tmltrd(:,:,jpmxl_zdf) - tmltrd(:,:,jpmxl_zdfp) )
          smltrd(:,:,jpmxl_ldf) = smltrd(:,:,jpmxl_ldf) + ( smltrd(:,:,jpmxl_zdf) - smltrd(:,:,jpmxl_zdfp) )
@@ -811 +811 @@
 
 
-       nkstp     = nit000 - 1              ! current time step indicator initialization
+      nkstp     = nit000 - 1              ! current time step indicator initialization