Changeset 6042 for branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/OBS/diaobs.F90

Timestamp:

2015-12-14T10:25:40+01:00 (8 years ago)

Author:

timgraham

Message:

Merged branches/2015/dev_r5776_UKMO2_OBS_efficiency_improvs into branch

File:

• branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/OBS/diaobs.F90 (modified) (3 diffs)

branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/OBS/diaobs.F90

@@ -210 +210 @@
          RETURN
       ENDIF
-
+      
       !-----------------------------------------------------------------------
       ! Set up list of observation types to be used
@@ -370 +370 @@
       ENDIF
 
+      IF ( ln_grid_global ) THEN
+         CALL ctl_warn( 'ln_grid_global=T may cause memory issues when used with a large number of processors' )
+      ENDIF
+
       IF ( ( nn_1dint < 0 ) .OR. ( nn_1dint > 1 ) ) THEN
          CALL ctl_stop(' Choice of vertical (1D) interpolation method', &
@@ -381 +385 @@
 
       CALL obs_typ_init
-
-      CALL mppmap_init
+      IF(ln_grid_global)
+         CALL mppmap_init
+      ENDIF
 
       CALL obs_grid_setup( )