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

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

@@ -12 +12 @@
    !!----------------------------------------------------------------------
    !!----------------------------------------------------------------------
-   !!   icb_init      : initialise icebergs
-   !!   icb_gen       : generate test icebergs
-   !!   icb_nam       : read iceberg namelist
+   !!   icb_init     : initialise icebergs
+   !!   icb_ini_gen  : generate test icebergs
+   !!   icb_nam      : read iceberg namelist
    !!----------------------------------------------------------------------
    USE dom_oce        ! ocean domain
@@ -34 +34 @@
 
    PUBLIC   icb_init  ! routine called in nemogcm.F90 module
-   PUBLIC   icb_gen   ! routine called in icbclv.F90 module
 
    CHARACTER(len=100) ::   cn_dir = './'   ! Root directory for location of icb files
@@ -244 +243 @@
 
       IF( .NOT.ln_rstart ) THEN
-         IF( nn_test_icebergs > 0 )   CALL icb_gen()
+         IF( nn_test_icebergs > 0 )   CALL icb_ini_gen()
       ELSE
          IF( nn_test_icebergs > 0 ) THEN
-            CALL icb_gen()
+            CALL icb_ini_gen()
          ELSE
-            CALL icebergs_read_restart()
-             l_restarted_bergs = .TRUE.
-         ENDIF
-      ENDIF
-      !
-      IF( nn_sample_rate .GT. 0 ) CALL traj_init( nitend )
-      !
-      CALL icb_budget_init()
-      !
-      IF( nn_verbose_level >= 2 )   CALL print_bergs('icb_init, initial status', nit000-1)
+            CALL icb_rst_read()
+            l_restarted_bergs = .TRUE.
+         ENDIF
+      ENDIF
+      !
+      IF( nn_sample_rate .GT. 0 ) CALL icb_trj_init( nitend )
+      !
+      CALL icb_dia_init()
+      !
+      IF( nn_verbose_level >= 2 )   CALL icb_utl_print('icb_init, initial status', nit000-1)
       !
    END SUBROUTINE icb_init
 
-   SUBROUTINE icb_gen()
-      !!----------------------------------------------------------------------
-      !!                  ***  ROUTINE icb_gen  ***
+   SUBROUTINE icb_ini_gen()
+      !!----------------------------------------------------------------------
+      !!                  ***  ROUTINE icb_ini_gen  ***
       !!
       !! ** Purpose :   iceberg generation
       !!
-      !! ** Method  : - blah blah
+      !! ** Method  : - at each grid point of the test box supplied in the namelist
+      !!                generate an iceberg in one class determined by the value of
+      !!                parameter nn_test_icebergs
       !!----------------------------------------------------------------------
       INTEGER                         ::   ji, jj, ibergs
@@ -301 +302 @@
                localpt%xi = REAL( nimpp+ji-1, wp )
                localpt%yj = REAL( njmpp+jj-1, wp )
-               localpt%lon = bilin(glamt, localpt%xi, localpt%yj, 'T', 0, 0 )
-               localpt%lat = bilin(gphit, localpt%xi, localpt%yj, 'T', 0, 0 )
+               localpt%lon = icb_utl_bilin(glamt, localpt%xi, localpt%yj, 'T', 0, 0 )
+               localpt%lat = icb_utl_bilin(gphit, localpt%xi, localpt%yj, 'T', 0, 0 )
                localpt%mass      = rn_initial_mass     (iberg)
                localpt%thickness = rn_initial_thickness(iberg)
@@ -313 +314 @@
                localpt%uvel = 0._wp
                localpt%vvel = 0._wp
-               CALL increment_kounter()
+               CALL icb_utl_incr()
                localberg%number(:) = num_bergs(:)
-               call add_new_berg_to_list(localberg, localpt)
+               call icb_utl_add(localberg, localpt)
             ENDIF
          END DO
       END DO
       !
-      ibergs = count_bergs()
+      ibergs = icb_utl_count()
       IF( lk_mpp ) CALL mpp_sum(ibergs)
-      WRITE(numicb,'(a,i6,a)') 'diamonds, icb_gen: ',ibergs,' were generated'
-      !
-   END SUBROUTINE icb_gen
+      WRITE(numicb,'(a,i6,a)') 'diamonds, icb_ini_gen: ',ibergs,' were generated'
+      !
+   END SUBROUTINE icb_ini_gen
 
    SUBROUTINE icb_nam
@@ -381 +382 @@
       IF( zfact < 1._wp ) THEN
          IF( zfact <= 0._wp ) THEN
-            CALL ctl_stop( 'icb_init: sum of berg distribution equal to zero' )
+            CALL ctl_stop( 'icb_nam: sum of berg distribution equal to zero' )
          ELSE
             rn_distribution(:) = rn_distribution(:) / zfact
-            CALL ctl_warn( 'icb_init: sum of berg input distribution not equal to one and so RESCALED' )
+            CALL ctl_warn( 'icb_nam: sum of berg input distribution not equal to one and so RESCALED' )
          ENDIF
       ENDIF