Changeset 7911 for branches/2017/dev_r7881_no_wrk_alloc

Timestamp:

2017-04-13T17:13:42+02:00 (7 years ago)

Author:

timgraham

Message:

Minor bug fixes with pointers in bdy and also remove wrk_alloc calls in test cases

Location:

branches/2017/dev_r7881_no_wrk_alloc/NEMOGCM

Files:

• CONFIG/TEST_CASES/SAS_BIPER/MY_SRC/usrdef_sbc.F90 (modified) (2 diffs)
• CONFIG/TEST_CASES/WAD/MY_SRC/bdyini.F90 (modified) (3 diffs)
• NEMO/OPA_SRC/BDY/bdyini.F90 (modified) (3 diffs)
• NEMO/OPA_SRC/OBS/diaobs.F90 (modified) (1 diff)

branches/2017/dev_r7881_no_wrk_alloc/NEMOGCM/CONFIG/TEST_CASES/SAS_BIPER/MY_SRC/usrdef_sbc.F90

@@ -99 +99 @@
       !! ** Purpose :   provide the surface boundary (flux) condition over sea-ice
       !!---------------------------------------------------------------------
-      REAL(wp), DIMENSION(:,:), POINTER ::   zsnw       ! snw distribution after wind blowing
+      REAL(wp), DIMENSION(jpi,jpj) ::   zsnw       ! snw distribution after wind blowing
       INTEGER, INTENT(in) ::   kt   ! ocean time step
       !!---------------------------------------------------------------------
-      CALL wrk_alloc( jpi,jpj, zsnw )
       !
       IF( kt==nit000 .AND. lwp)   WRITE(numout,*)' usrdef_sbc_ice : SAS_BIPER case: NO flux forcing'
@@ -140 +139 @@
       fr2_i0(:,:) = ( 0.82 * ( 1.0 - cldf_ice ) + 0.65 * cldf_ice )
 
-      CALL wrk_dealloc( jpi,jpj, zsnw )
-
    END SUBROUTINE usrdef_sbc_ice_flx
 

branches/2017/dev_r7881_no_wrk_alloc/NEMOGCM/CONFIG/TEST_CASES/WAD/MY_SRC/bdyini.F90

@@ -151 +151 @@
       INTEGER :: com_east_b, com_west_b, com_south_b, com_north_b  ! Flags for boundaries receiving
       INTEGER :: iw_b(4), ie_b(4), is_b(4), in_b(4)                ! Arrays for neighbours coordinates
-      REAL(wp), POINTER, DIMENSION(:,:)       ::   zfmask  ! temporary fmask array excluding coastal boundary condition (shlat)
+      REAL(wp), DIMENSION(jpi,jpj)            ::   zfmask  ! temporary fmask array excluding coastal boundary condition (shlat)
       !!
       CHARACTER(LEN=1)                     ::   ctypebdy   !     -        - 
@@ -1217 +1217 @@
       ! For the flagu/flagv calculation below we require a version of fmask without
       ! the land boundary condition (shlat) included:
-      CALL wrk_alloc(jpi,jpj,  zfmask ) 
       DO ij = 2, jpjm1
          DO ii = 2, jpim1
@@ -1345 +1344 @@
       !--------
       IF( nb_bdy>0 )   DEALLOCATE( nbidta, nbjdta, nbrdta )
-      !
-      CALL wrk_dealloc(jpi,jpj,   zfmask ) 
       !
       IF( nn_timing == 1 )   CALL timing_stop('bdy_segs')

branches/2017/dev_r7881_no_wrk_alloc/NEMOGCM/NEMO/OPA_SRC/BDY/bdyini.F90

@@ -140 +140 @@
       INTEGER , POINTER  ::  nbi, nbj, nbr                 ! short cuts
       REAL(wp), POINTER  ::  flagu, flagv                  !    -   -
-      REAL(wp), POINTER, DIMENSION(:,:)       ::   pmask    ! pointer to 2D mask fields
+      REAL(wp), DIMENSION(jpi,jpj)       ::   pmask        ! 2D mask fields
       REAL(wp) ::   zefl, zwfl, znfl, zsfl                 ! local scalars
       INTEGER, DIMENSION (2)                  ::   kdimsz
@@ -1241 +1241 @@
          DO igrd = 1,jpbgrd 
             SELECT CASE( igrd )
-               CASE( 1 )   ;   pmask => umask   (:,:,1)   ;   i_offset = 0
-               CASE( 2 )   ;   pmask => bdytmask(:,:)     ;   i_offset = 1
-               CASE( 3 )   ;   pmask => zfmask  (:,:)     ;   i_offset = 0
+               CASE( 1 )   ;   pmask = umask   (:,:,1)   ;   i_offset = 0
+               CASE( 2 )   ;   pmask = bdytmask(:,:)     ;   i_offset = 1
+               CASE( 3 )   ;   pmask = zfmask  (:,:)     ;   i_offset = 0
             END SELECT 
             icount = 0
@@ -1276 +1276 @@
          DO igrd = 1, jpbgrd 
             SELECT CASE( igrd )
-               CASE( 1 )   ;   pmask => vmask (:,:,1)   ;   j_offset = 0
-               CASE( 2 )   ;   pmask => zfmask(:,:)     ;   j_offset = 0
-               CASE( 3 )   ;   pmask => bdytmask        ;   j_offset = 1
+               CASE( 1 )   ;   pmask = vmask (:,:,1)   ;   j_offset = 0
+               CASE( 2 )   ;   pmask = zfmask(:,:)     ;   j_offset = 0
+               CASE( 3 )   ;   pmask = bdytmask        ;   j_offset = 1
             END SELECT 
             icount = 0

branches/2017/dev_r7881_no_wrk_alloc/NEMOGCM/NEMO/OPA_SRC/OBS/diaobs.F90

@@ -547 +547 @@
       REAL(wp), DIMENSION(jpi,jpj) ::   zgphi1        ! Model latitudes for prof variable 1
       REAL(wp), DIMENSION(jpi,jpj) ::   zgphi2        ! Model latitudes for prof variable 2
-#if ! defined key_lim2  ! defined key_lim3
+#if ! defined key_lim2 && ! defined key_lim3
       REAL(wp), DIMENSION(jpi,jpj) :: frld
 #endif