Changeset 3372 for branches/2012/dev_r3337_NOCS10_ICB/NEMOGCM/NEMO/OPA_SRC/ICB/icbclv.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/icbclv.F90 (modified) (7 diffs)

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

@@ -12 +12 @@
    !!----------------------------------------------------------------------
    !!----------------------------------------------------------------------
-   !!   accumulate_calving :
-   !!   icb_gen            : generate test icebergs
+   !!   icb_clv_flx   : transfer input flux of ice into iceberg classes
+   !!   icb_clv       : calve icebergs from stored ice
    !!----------------------------------------------------------------------
    USE par_oce        ! NEMO parameters
@@ -28 +28 @@
    PRIVATE
 
-   PUBLIC   accumulate_calving  ! routine called in icbrun.F90 module
-   PUBLIC   calve_icebergs      ! routine called in icbrun.F90 module
+   PUBLIC   icb_clv_flx  ! routine called in icbrun.F90 module
+   PUBLIC   icb_clv      ! routine called in icbrun.F90 module
 
    !!----------------------------------------------------------------------
@@ -38 +38 @@
 CONTAINS
 
-   SUBROUTINE accumulate_calving( kt )
+   SUBROUTINE icb_clv_flx( kt )
       !!----------------------------------------------------------------------
-      !!                 ***  ROUTINE accumulate_calving  ***
+      !!                 ***  ROUTINE icb_clv_flx  ***
       !!
       !! ** Purpose :   ?
@@ -95 +95 @@
       berg_grid%tmp(:,:) = berg_dt * berg_grid%calving_hflx(:,:) * e1e2t(:,:) * tmask_i(:,:)
       berg_grid%stored_heat (:,:) = berg_grid%stored_heat (:,:) + berg_grid%tmp(:,:)
-      CALL incoming_budget( kt,  zcalving_used, berg_grid%tmp )
+      CALL icb_dia_income( kt,  zcalving_used, berg_grid%tmp )
       !
-   END SUBROUTINE accumulate_calving
+   END SUBROUTINE icb_clv_flx
 
-   SUBROUTINE calve_icebergs()
+   SUBROUTINE icb_clv()
       !!----------------------------------------------------------------------
-      !!                 ***  ROUTINE calve_icebergs  ***
+      !!                 ***  ROUTINE icb_clv  ***
       !!
-      !! ** Purpose :   This seems to be the routine that takes a stored ice field and calves to the ocean,
-      !!                so I assume that the gridded array stored_ice has only non-zero entries at selected
+      !! ** Purpose :   This routine takes a stored ice field and calves to the ocean,
+      !!                so the gridded array stored_ice has only non-zero entries at selected
       !!                wet points adjacent to known land based calving points
       !!
       !! ** method  : - Look at each grid point and see if there's enough for each size class to calve
       !!                If there is, a new iceberg is calved.  This happens in the order determined by
-      !!                the class definition arrays (largest first?)
+      !!                the class definition arrays (which in the default case is smallest first)
       !!                Note that only the non-overlapping part of the processor where icebergs are allowed
       !!                is considered
@@ -150 +150 @@
                   newpt%heat_density = berg_grid%stored_heat(ji,jj) / berg_grid%stored_ice(ji,jj,jn)   ! This is in J/kg
                   !
-                  CALL increment_kounter()
+                  CALL icb_utl_incr()
                   newberg%number(:) = num_bergs(:)
                   !
-                  CALL add_new_berg_to_list( newberg, newpt )
+                  CALL icb_utl_add( newberg, newpt )
                   !
                   zcalved_to_berg = rn_initial_mass(jn) * rn_mass_scaling(jn)           ! Units of kg
@@ -165 +165 @@
                   icnt = icnt + 1
                   !
-                  CALL calving_budget(ji, jj, jn,  zcalved_to_berg, zheat_to_berg )
+                  CALL icb_dia_calve(ji, jj, jn,  zcalved_to_berg, zheat_to_berg )
                END DO
                icntmax = MAX( icntmax, icnt )
@@ -177 +177 @@
       CALL lbc_lnk( berg_grid%stored_heat, 'T', 1._wp )
       !
-      IF( nn_verbose_level > 0 .AND. icntmax > 1 )   WRITE(numicb,*) 'calve_icebergs: icnt=', icnt,' on', narea
+      IF( nn_verbose_level > 0 .AND. icntmax > 1 )   WRITE(numicb,*) 'icb_clv: icnt=', icnt,' on', narea
       !
-   END SUBROUTINE  calve_icebergs
+   END SUBROUTINE  icb_clv
 
    !!======================================================================