Changeset 2693


Ignore:
Timestamp:
2011-03-16T08:09:12+01:00 (10 years ago)
Author:
rblod
Message:

Use correct working arrays in dynldf_bilap

Location:
branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/DYN
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/DYN/dynldf_bilap.F90

    r2690 r2693  
    7676      USE wrk_nemo, ONLY:   wrk_in_use, wrk_not_released 
    7777      USE wrk_nemo, ONLY:   zcu => wrk_2d_1 , zcv => wrk_2d_2   ! 3D workspace 
    78       USE wrk_nemo, ONLY:   zuf => wrk_3d_1 , zut => wrk_3d_2   ! 3D workspace 
    79       USE wrk_nemo, ONLY:   zlu => wrk_3d_3 , zlv => wrk_3d_4 
     78      USE wrk_nemo, ONLY:   zuf => wrk_3d_3 , zut => wrk_3d_4   ! 3D workspace 
     79      USE wrk_nemo, ONLY:   zlu => wrk_3d_5 , zlv => wrk_3d_6 
    8080      ! 
    8181      INTEGER, INTENT(in) ::   kt   ! ocean time-step index 
     
    8585      !!---------------------------------------------------------------------- 
    8686 
    87       IF( wrk_in_use(2, 1,2) .OR. wrk_in_use(3, 1,2,3,4) ) THEN 
     87      IF( wrk_in_use(2, 1,2) .OR. wrk_in_use(3, 3,4,5,6) ) THEN 
    8888         CALL ctl_stop('dyn_ldf_bilap : requested workspace arrays unavailable')   ;   RETURN 
    8989      ENDIF 
     
    208208      !                                                ! =============== 
    209209      IF( wrk_not_released(2, 1,2)     .OR.   & 
    210           wrk_not_released(3, 1,2,3,4) )   CALL ctl_stop('dyn_ldf_bilap: failed to release workspace arrays') 
     210          wrk_not_released(3, 3,4,5,6) )   CALL ctl_stop('dyn_ldf_bilap: failed to release workspace arrays') 
    211211      ! 
    212212   END SUBROUTINE dyn_ldf_bilap 
  • branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/DYN/dynldf_bilapg.F90

    r2690 r2693  
    8585      !!---------------------------------------------------------------------- 
    8686      USE wrk_nemo, ONLY:   wrk_in_use, wrk_not_released 
    87       USE wrk_nemo, ONLY:   zwk1 => wrk_3d_1 , zwk2 => wrk_3d_2   ! 3D workspace 
     87      USE wrk_nemo, ONLY:   zwk1 => wrk_3d_3 , zwk2 => wrk_3d_4   ! 3D workspace 
    8888      USE oce     , ONLY:   zwk3 => ta       , zwk4 => sa         ! ta, sa used as 3D workspace    
    8989      ! 
     
    9393      !!---------------------------------------------------------------------- 
    9494 
    95       IF( wrk_in_use(3, 1,2) ) THEN 
     95      IF( wrk_in_use(3, 3,4) ) THEN 
    9696         CALL ctl_stop('dyn_ldf_bilapg: requested workspace arrays unavailable')   ;   RETURN 
    9797      ENDIF 
     
    129129      END DO 
    130130      ! 
    131       IF( wrk_not_released(3, 1,2) )   CALL ctl_stop('dyn_ldf_bilapg: failed to release workspace arrays') 
     131      IF( wrk_not_released(3, 3,4) )   CALL ctl_stop('dyn_ldf_bilapg: failed to release workspace arrays') 
    132132      ! 
    133133   END SUBROUTINE dyn_ldf_bilapg 
Note: See TracChangeset for help on using the changeset viewer.