Changeset 3359 for branches/2012/dev_r3337_NOCS10_ICB/NEMOGCM/NEMO/OPA_SRC/ICB/icbrun.F90

Timestamp:

2012-04-18T12:42:56+02:00 (12 years ago)

Author:

sga

Message:

NEMO branch dev_r3337_NOCS10_ICB: make code conform to NEMO coding conventions

File:

• branches/2012/dev_r3337_NOCS10_ICB/NEMOGCM/NEMO/OPA_SRC/ICB/icbrun.F90 (modified) (9 diffs)

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

@@ -39 +39 @@
    PRIVATE
 
-   PUBLIC   icb_stp        ! routine called in xxx.F90 module
-   PUBLIC   icb_end        ! routine called in xxx.F90 module
+   PUBLIC   icb_stp        ! routine called in sbcmod.F90 module
+   PUBLIC   icb_end        ! routine called in nemogcm.F90 module
 
 CONTAINS
@@ -52 +52 @@
       !! ** Method  : - blah blah
       !!----------------------------------------------------------------------
-      INTEGER, INTENT( in )           ::  kt
+      INTEGER, INTENT( in )           ::   kt
       !
       INTEGER                         ::   iyr, imon, iday, ihr, imin, isec
-      LOGICAL                         ::   lerr, sample_traj, l_budget, l_verbose
+      LOGICAL                         ::   ll_sample_traj, ll_budget, ll_verbose
       !!----------------------------------------------------------------------
       !! start of timestep housekeeping
 
-      ktberg = kt
+      nktberg = kt
 
       ! read calving data
@@ -65 +65 @@
          !
          CALL fld_read ( kt, 1, sf_icb )
-         p_calving(:,:)      = sf_icb(1)%fnow(:,:,1)    ! calving in km^3/year (water equivalent)
-         p_calving_hflx(:,:) = 0._wp                    ! NO heat flux for now
+         src_calving(:,:)      = sf_icb(1)%fnow(:,:,1)    ! calving in km^3/year (water equivalent)
+         src_calving_hflx(:,:) = 0._wp                    ! NO heat flux for now
          !
       ENDIF
@@ -87 +87 @@
       current_yearday = yearday(imon, iday, ihr, imin, isec)
 
-      l_verbose = .FALSE.
+      ll_verbose = .FALSE.
       IF( nn_verbose_write .GT. 0 .AND. &
-          MOD(kt-1,nn_verbose_write ) == 0 ) l_verbose = nn_verbose_level >= 0
-      IF( l_verbose ) WRITE(numicb,9100) iyr, imon, iday, ihr, imin, isec, &
+          MOD(kt-1,nn_verbose_write ) == 0 ) ll_verbose = nn_verbose_level >= 0
+      IF( ll_verbose ) WRITE(numicb,9100) iyr, imon, iday, ihr, imin, isec, &
                                         current_year, current_yearday
  9100 FORMAT('y,m,d=',3i5,' h,m,s=',3i5,' yr,yrdy=',i5,f8.3)
@@ -112 +112 @@
 
       IF( lk_mpp ) THEN
-                                      CALL mpp_send_bergs ()     ! Send bergs to other PEs
+                                     CALL mpp_send_bergs ()     ! Send bergs to other PEs
       ELSE
-                                      CALL lbc_send_bergs()      ! Deal with any cyclic boundaries in non-mpp case
+                                     CALL lbc_send_bergs()      ! Deal with any cyclic boundaries in non-mpp case
       ENDIF
 
@@ -122 +122 @@
       !! end of timestep housekeeping
 
-      sample_traj = .FALSE.
-      IF( nn_sample_rate .GT. 0 .AND. MOD(kt-1,nn_sample_rate) == 0 )   sample_traj = .TRUE.
-      IF( sample_traj .AND.   &
+      ll_sample_traj = .FALSE.
+      IF( nn_sample_rate .GT. 0 .AND. MOD(kt-1,nn_sample_rate) == 0 )   ll_sample_traj = .TRUE.
+      IF( ll_sample_traj .AND.   &
           ASSOCIATED(first_berg) )   CALL traj_write    ( kt )  ! For each berg, record trajectory
 
@@ -142 +142 @@
 
       ! Diagnose budgets
-      l_budget = .FALSE.
-      IF( nn_verbose_write .GT. 0 .AND. MOD(kt-1,nn_verbose_write) == 0 )   l_budget = ln_bergdia
-      CALL icb_budget( l_budget )
+      ll_budget = .FALSE.
+      IF( nn_verbose_write .GT. 0 .AND. MOD(kt-1,nn_verbose_write) == 0 )   ll_budget = ln_bergdia
+      CALL icb_budget( ll_budget )
 
       IF( MOD(kt,nn_stock) == 0 ) THEN
@@ -175 +175 @@
       DEALLOCATE( ssh_e )
 
-      DEALLOCATE( icbfldpts )
+      DEALLOCATE( nicbfldpts )
+      DEALLOCATE( nicbflddest )
+      DEALLOCATE( nicbfldproc )
 
       IF( lk_mpp ) CALL dealloc_buffers()
@@ -206 +208 @@
       DEALLOCATE(berg_grid)
 
-      DEALLOCATE(initial_width)
-      DEALLOCATE(initial_length)
+      DEALLOCATE(first_width)
+      DEALLOCATE(first_length)
 
       IF (lwp) WRITE(numout,'(a,i6)') 'icebergs: icb_end complete',narea