Changeset 3376

Timestamp:

2012-05-01T08:25:59+02:00 (12 years ago)

Author:

sga

Message:

NEMO branch dev_r3337_NOCS10_ICB: remove unnecessary deallocation of arrays at end of iceberg run

Location:

branches/2012/dev_r3337_NOCS10_ICB/NEMOGCM/NEMO/OPA_SRC/ICB

Files:

• icbstp.F90 (modified) (2 diffs)
• icbutl.F90 (modified) (2 diffs)

branches/2012/dev_r3337_NOCS10_ICB/NEMOGCM/NEMO/OPA_SRC/ICB/icbstp.F90

@@ -164 +164 @@
       !!----------------------------------------------------------------------
       INTEGER, INTENT( in )  :: kt
-      !
-      TYPE(iceberg), POINTER :: this, next
       !!----------------------------------------------------------------------
-
-      ! expanded arrays for bilinear interpolation
-      DEALLOCATE( uo_e )
-      DEALLOCATE( vo_e )
-      DEALLOCATE( ff_e )
-      DEALLOCATE( ua_e )
-      DEALLOCATE( va_e )
-#if defined key_lim2 || defined key_lim3
-      DEALLOCATE( ui_e )
-      DEALLOCATE( vi_e )
-#endif
-      DEALLOCATE( ssh_e )
-
-      DEALLOCATE( nicbfldpts )
-      DEALLOCATE( nicbflddest )
-      DEALLOCATE( nicbfldproc )
-
-      IF (.NOT.ASSOCIATED(berg_grid)) RETURN
 
       ! only write a restart if not done in icb_stp
@@ -192 +172 @@
       IF( nn_sample_rate .GT. 0 ) CALL icb_trj_end()
 
-      ! Delete bergs and structures
-      this=>first_berg
-      DO WHILE (ASSOCIATED(this))
-        next=>this%next
-        CALL icb_utl_destroy(this)
-        this=>next
-      END DO
-
       CALL icb_dia_end()
-
-      DEALLOCATE(berg_grid%calving)
-      DEALLOCATE(berg_grid%calving_hflx)
-      DEALLOCATE(berg_grid%stored_heat)
-      DEALLOCATE(berg_grid%floating_melt)
-      DEALLOCATE(berg_grid%maxclass)
-      DEALLOCATE(berg_grid%tmp)
-      DEALLOCATE(berg_grid%stored_ice)
-      DEALLOCATE(berg_grid)
-
-      DEALLOCATE(first_width)
-      DEALLOCATE(first_length)
 
       IF(lwp)   WRITE(numout,'(a,i6)') 'icebergs: icb_end complete', narea

branches/2012/dev_r3337_NOCS10_ICB/NEMOGCM/NEMO/OPA_SRC/ICB/icbutl.F90

@@ -466 +466 @@
       IF (ASSOCIATED(berg%next)) berg%next%prev => berg%prev
       !
-      ! Bye-bye berg
       CALL icb_utl_destroy(berg)
       !
@@ -485 +484 @@
       IF( ASSOCIATED( berg%current_point ) )   DEALLOCATE( berg%current_point )
       !
-      ! Bye-bye berg
       DEALLOCATE(berg)
       !