Changeset 3609 for branches/2012/dev_NOC_2012_rev3555/NEMOGCM/NEMO/OPA_SRC/SBC

Timestamp:

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

Author:

acc

Message:

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

Location:

branches/2012/dev_NOC_2012_rev3555/NEMOGCM/NEMO/OPA_SRC/SBC

Files:

• sbc_oce.F90 (modified) (1 diff)
• sbcmod.F90 (modified) (2 diffs)

branches/2012/dev_NOC_2012_rev3555/NEMOGCM/NEMO/OPA_SRC/SBC/sbc_oce.F90

@@ -39 +39 @@
    LOGICAL , PUBLIC ::   ln_ssr      = .FALSE.   !: Sea Surface restoring on SST and/or SSS      
    LOGICAL , PUBLIC ::   ln_apr_dyn  = .FALSE.   !: Atmospheric pressure forcing used on dynamics (ocean & ice)
+   LOGICAL , PUBLIC ::   ln_icebergs = .FALSE.   !: Icebergs
    INTEGER , PUBLIC ::   nn_ice      = 0         !: flag on ice in the surface boundary condition (=0/1/2/3)
    INTEGER , PUBLIC ::   nn_fwb      = 0         !: FreshWater Budget: 

branches/2012/dev_NOC_2012_rev3555/NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90

@@ -43 +43 @@
    USE bdy_par          ! for lk_bdy
    USE bdyice_lim2      ! unstructured open boundary data  (bdy_ice_lim_2 routine)
+   USE icbstp           ! Icebergs!
 
    USE prtctl           ! Print control                    (prt_ctl routine)
@@ -290 +291 @@
       CASE(  4 )   ;       CALL sbc_ice_cice ( kt, nsbc )            ! CICE ice model
       END SELECT                                              
+
+      IF( ln_icebergs )    CALL icb_stp( kt )                   ! compute icebergs
 
       IF( ln_rnf       )   CALL sbc_rnf( kt )                   ! add runoffs to fresh water fluxes