Changeset 7571 for branches/UKMO/dev_r5518_MEDUSA_optim_MG_MS_RH/NEMOGCM/NEMO/OPA_SRC/SBC/fldread.F90

Timestamp:

2017-01-17T11:33:49+01:00 (7 years ago)

Author:

frrh

Message:

Commit first phase of changes - these work OK in a UKESM vn0.5
suite employing the GO6 package branch at:

branches/UKMO/dev_r5518_GO6_package@7206

File:

• branches/UKMO/dev_r5518_MEDUSA_optim_MG_MS_RH/NEMOGCM/NEMO/OPA_SRC/SBC/fldread.F90 (modified) (9 diffs)

branches/UKMO/dev_r5518_MEDUSA_optim_MG_MS_RH/NEMOGCM/NEMO/OPA_SRC/SBC/fldread.F90

@@ -93 +93 @@
       !                                                         ! =-1 not cyclic
       LOGICAL                                 ::   cyclic       ! east-west cyclic or not
-      INTEGER,  DIMENSION(:,:,:), POINTER     ::   data_jpi     ! array of source integers
-      INTEGER,  DIMENSION(:,:,:), POINTER     ::   data_jpj     ! array of source integers
-      REAL(wp), DIMENSION(:,:,:), POINTER     ::   data_wgt     ! array of weights on model grid
-      REAL(wp), DIMENSION(:,:,:), POINTER     ::   fly_dta      ! array of values on input grid
-      REAL(wp), DIMENSION(:,:,:), POINTER     ::   col          ! temporary array for reading in columns
+      INTEGER,  DIMENSION(:,:,:), ALLOCATABLE ::   data_jpi     ! array of source integers
+      INTEGER,  DIMENSION(:,:,:), ALLOCATABLE ::   data_jpj     ! array of source integers
+      REAL(wp), DIMENSION(:,:,:), ALLOCATABLE ::   data_wgt     ! array of weights on model grid
+      REAL(wp), DIMENSION(:,:,:), ALLOCATABLE ::   fly_dta      ! array of values on input grid
+      REAL(wp), DIMENSION(:,:,:), ALLOCATABLE ::   col          ! temporary array for reading in columns
    END TYPE WGT
 
@@ -688 +688 @@
       REAL(wp), POINTER, DIMENSION(:,:,:)     ::   dta_read  ! work space for global data
       !!---------------------------------------------------------------------
-            
+
       ipi = SIZE( dta, 1 )
       ipj = 1
@@ -745 +745 @@
       INTEGER                           ::   ill          ! character length
       INTEGER                           ::   iv           ! indice of V component
-      REAL(wp), POINTER, DIMENSION(:,:) ::   utmp, vtmp   ! temporary arrays for vector rotation
+      REAL(wp), ALLOCATABLE, DIMENSION(:,:) ::   utmp, vtmp   ! temporary arrays for vector rotation
       CHARACTER (LEN=100)               ::   clcomp       ! dummy weight name
       !!---------------------------------------------------------------------
 
-      CALL wrk_alloc( jpi,jpj, utmp, vtmp )
+      ALLOCATE( utmp (1:jpi, 1:jpj) )
+      ALLOCATE( vtmp (1:jpi, 1:jpj) )
 
       !! (sga: following code should be modified so that pairs arent searched for each time
@@ -786 +787 @@
        END DO
       !
-      CALL wrk_dealloc( jpi,jpj, utmp, vtmp )
+      DEALLOCATE (utmp, vtmp)
       !
    END SUBROUTINE fld_rot
@@ -935 +936 @@
          END DO
       ENDIF
-      
+
    END SUBROUTINE fld_fill
 
@@ -1005 +1006 @@
             WRITE(numout,*) '       not cyclical'
          ENDIF
-         IF( ASSOCIATED(ref_wgts(kw)%data_wgt) )  WRITE(numout,*) '       allocated'
+         IF( ALLOCATED(ref_wgts(kw)%data_wgt) )  WRITE(numout,*) '       allocated'
       END DO
       !
@@ -1026 +1027 @@
       CHARACTER (len=5)                 ::   aname
       INTEGER , DIMENSION(:), ALLOCATABLE ::   ddims
-      INTEGER , POINTER, DIMENSION(:,:) ::   data_src
-      REAL(wp), POINTER, DIMENSION(:,:) ::   data_tmp
+      INTEGER , ALLOCATABLE, DIMENSION(:,:) ::   data_src
+      REAL(wp), ALLOCATABLE, DIMENSION(:,:) ::   data_tmp
       LOGICAL                           ::   cyclical
       INTEGER                           ::   zwrap      ! local integer
       !!----------------------------------------------------------------------
       !
-      CALL wrk_alloc( jpi,jpj, data_src )   ! integer
-      CALL wrk_alloc( jpi,jpj, data_tmp )
+      ALLOCATE(data_src(1:jpi, 1:jpj))
+      ALLOCATE(data_tmp(1:jpi, 1:jpj))
+
       !
       IF( nxt_wgt > tot_wgts ) THEN
@@ -1152 +1154 @@
       DEALLOCATE (ddims )
 
-      CALL wrk_dealloc( jpi,jpj, data_src )   ! integer
-      CALL wrk_dealloc( jpi,jpj, data_tmp )
+      DEALLOCATE( data_src )   ! integer
+      DEALLOCATE( data_tmp )
       !
    END SUBROUTINE fld_weight
@@ -1294 +1296 @@
       INTEGER                                   ::   jpi1_lsm,jpi2_lsm,jpj1_lsm,jpj2_lsm   ! temporary indices
       INTEGER                                   ::   itmpi,itmpj,itmpz                     ! lengths
-      
+
       !!----------------------------------------------------------------------
       !