Changeset 3651 for branches/2012/dev_NOC_MERCATOR_2012/NEMOGCM/NEMO/OPA_SRC/OBS/obs_surf_def.F90

Timestamp:

2012-11-26T11:46:39+01:00 (11 years ago)

Author:

cbricaud

Message:

merge dev_MERCATOR_2012_rev3555 into dev_NOC_MERCATOR_2012 ; see ticket 1020

File:

• branches/2012/dev_NOC_MERCATOR_2012/NEMOGCM/NEMO/OPA_SRC/OBS/obs_surf_def.F90 (modified) (8 diffs)

branches/2012/dev_NOC_MERCATOR_2012/NEMOGCM/NEMO/OPA_SRC/OBS/obs_surf_def.F90

@@ -47 +47 @@
       INTEGER :: nextra     !: Number of extra fields at observation points
       INTEGER :: nstp       !: Number of time steps
+      INTEGER :: npi        !: Number of 3D grid points
+      INTEGER :: npj
       INTEGER :: nsurfup    !: Observation counter used in obs_oper
 
@@ -79 +81 @@
          & rext           !: Extra fields interpolated to observation points
 
+      REAL(KIND=wp), POINTER, DIMENSION(:,:) :: &
+         & vdmean         !: Time averaged of model field
+
       ! Arrays with size equal to the number of time steps in the window
 
@@ -103 +108 @@
 CONTAINS
    
-   SUBROUTINE obs_surf_alloc( surf, ksurf, kvar, kextra, kstp )
+   SUBROUTINE obs_surf_alloc( surf, ksurf, kvar, kextra, kstp, kpi, kpj )
       !!----------------------------------------------------------------------
       !!                     ***  ROUTINE obs_surf_alloc  ***
@@ -120 +125 @@
       INTEGER, INTENT(IN) :: kextra  ! Number of extra fields at observation points
       INTEGER, INTENT(IN) :: kstp    ! Number of time steps
+      INTEGER, INTENT(IN) :: kpi     ! Number of 3D grid points
+      INTEGER, INTENT(IN) :: kpj
 
       !!* Local variables
@@ -131 +138 @@
       surf%nvar     = kvar
       surf%nstp     = kstp
+      surf%npi      = kpi
+      surf%npj      = kpj
       
       ! Allocate arrays of number of surface data size
@@ -174 +183 @@
          & )
 
+      ! Allocate arrays of size number of grid points
+
+      ALLOCATE( &
+         & surf%vdmean(kpi,kpj) &
+         & )
+
       ! Set defaults for compression indices
       
@@ -242 +257 @@
          & )
 
+      ! Deallocate arrays of size number of grid points size times
+      ! number of variables
+
+      DEALLOCATE( &
+         & surf%vdmean &
+         & )
+
       ! Deallocate arrays of number of time step size
 
@@ -300 +322 @@
       IF ( lallocate ) THEN
          CALL obs_surf_alloc( newsurf,  insurf, surf%nvar, &
-            & surf%nextra, surf%nstp )
+            & surf%nextra, surf%nstp, surf%npi, surf%npj )
       ENDIF