Changeset 3183 for branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/OBS/diaobs.F90

Timestamp:

2011-11-25T16:31:02+01:00 (13 years ago)

Author:

davestorkey

Message:

Update dynamic allocation in OBS and ASM modules.

File:

• branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/OBS/diaobs.F90 (modified) (4 diffs)

branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/OBS/diaobs.F90

@@ -16 +16 @@
    !!----------------------------------------------------------------------
    !! * Modules used   
+   USE wrk_nemo_2               ! Memory Allocation
    USE par_kind                 ! Precision variables
    USE in_out_manager           ! I/O manager
@@ -1018 +1019 @@
          & frld
 #endif
-      USE wrk_nemo, ONLY: wrk_in_use, wrk_not_released
-#if ! defined key_ice_lim
-      USE wrk_nemo, ONLY: frld => wrk_2d_1
-#endif
       IMPLICIT NONE
 
@@ -1034 +1031 @@
       INTEGER :: jveloset               ! velocity profile data loop variable
       INTEGER :: jvar                   ! Variable number    
+#if ! defined key_ice_lim
+      REAL(wp), POINTER, DIMENSION(:,:) :: frld   
+#endif
       CHARACTER(LEN=20) :: datestr=" ",timestr=" "
  
 #if ! defined key_ice_lim
-      IF(wrk_in_use(2, 1))THEN
-         CALL ctl_stop('dia_obs : requested workspace array unavailable.')
-         RETURN
-      END IF
+      CALL wrk_alloc(jpi,jpj,frld) 
 #endif
 
@@ -1123 +1120 @@
 
 #if ! defined key_ice_lim
-      IF(wrk_not_released(2, 1))THEN
-         CALL ctl_stop('dia_obs : failed to release workspace array.')
-      END IF
+      CALL wrk_dealloc(jpi,jpj,frld) 
 #endif