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

Timestamp:

2012-04-30T12:50:36+02:00 (12 years ago)

Author:

sga

Message:

NEMO branch dev_r3337_NOCS10_ICB: change all routine names and create more Gurvanistic havoc

File:

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

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

@@ -77 +77 @@
 
       ! anything that needs to be reset to zero each timestep for budgets is dealt with here
-      CALL icb_budget_step()
+      CALL icb_dia_step()
 
       ! Manage time
@@ -89 +89 @@
       isec = nsec_day - ihr*3600 - imin*60
       current_year    = iyr
-      current_yearday = yearday(imon, iday, ihr, imin, isec)
+      current_yearday = icb_utl_yearday(imon, iday, ihr, imin, isec)
 
       ll_verbose = .FALSE.
@@ -100 +100 @@
       ! copy nemo forcing arrays into iceberg versions with extra halo
       ! only necessary for variables not on T points
-      CALL copy_flds()
+      CALL icb_utl_copy()
 
       !!----------------------------------------------------------------------
       !! process icebergs
 
-                                     CALL accumulate_calving( kt )   ! Accumulate ice from calving
-
-                                     CALL calve_icebergs()           ! Calve excess stored ice into icebergs
-
-
-      !                               !==  For each berg, evolve  ==!
-      !
-      IF( ASSOCIATED(first_berg) )   CALL evolve_icebergs()          ! ice berg dynamics
-
-      IF( lk_mpp ) THEN          ;   CALL mpp_send_bergs ()          ! Send bergs to other PEs
-      ELSE                       ;   CALL lbc_send_bergs()           ! Deal with any cyclic boundaries in non-mpp case
+                                     CALL icb_clv_flx( kt )   ! Accumulate ice from calving
+
+                                     CALL icb_clv()           ! Calve excess stored ice into icebergs
+
+
+!                               !==  For each berg, evolve  ==!
+      !
+      IF( ASSOCIATED(first_berg) )   CALL icb_dyn()           ! ice berg dynamics
+
+      IF( lk_mpp ) THEN          ;   CALL icb_lbc_mpp()       ! Send bergs to other PEs
+      ELSE                       ;   CALL icb_lbc()           ! Deal with any cyclic boundaries in non-mpp case
       ENDIF
 
-      IF( ASSOCIATED(first_berg) )   CALL thermodynamics ( kt )      ! Ice berg thermodynamics (melting) + rolling
+      IF( ASSOCIATED(first_berg) )   CALL icb_thm( kt )       ! Ice berg thermodynamics (melting) + rolling
 
       !!----------------------------------------------------------------------
@@ -126 +126 @@
       IF( nn_sample_rate > 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
+          ASSOCIATED(first_berg) )   CALL icb_trj_write( kt )  ! For each berg, record trajectory
 
       ! Gridded diagnostics
@@ -136 +136 @@
       CALL iom_put( "berg_stored_ice"   , berg_grid%stored_ice   (:,:,:) )  ! 'Accumulated ice mass by class', 'kg'
 
-      ! write out mean budgets
-      CALL icb_budget_put()
+      ! store mean budgets
+      CALL icb_dia_put()
 
       ! Dump icebergs to screen
-      if ( nn_verbose_level >= 2 )   CALL print_bergs( 'icb_stp, status', kt )
+      if ( nn_verbose_level >= 2 )   CALL icb_utl_print( 'icb_stp, status', kt )
 
       ! Diagnose budgets
       ll_budget = .FALSE.
       IF( nn_verbose_write > 0 .AND. MOD(kt-1,nn_verbose_write) == 0 )   ll_budget = ln_bergdia
-      CALL icb_budget( ll_budget )
+      CALL icb_dia( ll_budget )
 
       IF( MOD(kt,nn_stock) == 0 ) THEN
-         CALL icebergs_write_restart( kt )
-         IF( nn_sample_rate > 0 )   CALL traj_sync()
+         CALL icb_rst_write( kt )
+         IF( nn_sample_rate > 0 )   CALL icb_trj_sync()
       ENDIF
 
@@ -160 +160 @@
       !!                  ***  ROUTINE icb_end  ***
       !!
-      !! ** Purpose :   deallocate icebergs arrays and 
+      !! ** Purpose :   close iceberg files
       !!
       !!----------------------------------------------------------------------
@@ -184 +184 @@
       DEALLOCATE( nicbfldproc )
 
-      IF( lk_mpp ) CALL dealloc_buffers()
-
       IF (.NOT.ASSOCIATED(berg_grid)) RETURN
 
       ! only write a restart if not done in icb_stp
-      IF( MOD(kt,nn_stock) .NE. 0 ) CALL icebergs_write_restart( kt )
+      IF( MOD(kt,nn_stock) .NE. 0 ) CALL icb_rst_write( kt )
 
       ! finish with trajectories if they were written
-      IF( nn_sample_rate .GT. 0 ) CALL traj_end()
+      IF( nn_sample_rate .GT. 0 ) CALL icb_trj_end()
 
       ! Delete bergs and structures
@@ -198 +196 @@
       DO WHILE (ASSOCIATED(this))
         next=>this%next
-        CALL destroy_iceberg(this)
+        CALL icb_utl_destroy(this)
         this=>next
       END DO
 
-      CALL icb_budget_end()
+      CALL icb_dia_end()
 
       DEALLOCATE(berg_grid%calving)