Changeset 3609 for branches/2012/dev_NOC_2012_rev3555/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90

Timestamp:

2012-11-19T16:51:17+01:00 (11 years ago)

Author:

acc

Message:

Branch dev_NOC_2012_r3555. #1006. Step 4: Merge in changes from 2012/dev_r3337_NOCS10_ICB (ICeBergs) branch

File:

• branches/2012/dev_NOC_2012_rev3555/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90 (modified) (3 diffs)

branches/2012/dev_NOC_2012_rev3555/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90

@@ -61 +61 @@
    USE diaobs          ! Observation diagnostics       (dia_obs_init routine)
    USE step            ! NEMO time-stepping                 (stp     routine)
+   USE icbini          ! handle bergs, initialisation
+   USE icbstp          ! handle bergs, calving, themodynamics and transport
 #if defined key_oasis3
    USE cpl_oasis3      ! OASIS3 coupling
@@ -161 +163 @@
 #endif
 
-      IF( lk_diaobs ) CALL dia_obs_wri
+      IF( lk_diaobs   )   CALL dia_obs_wri
+      !
+      IF( ln_icebergs )   CALL icb_end( nitend )
        
       !                            !------------------------!
@@ -360 +364 @@
       !                                     ! Misc. options
       IF( nn_cla == 1   )   CALL cla_init       ! Cross Land Advection
+                            CALL icb_init( rdt, nit000)   ! initialise icebergs instance
       
 #if defined key_top