Changeset 5945 for branches/NERC/dev_r5589_is_oce_cpl/NEMOGCM/NEMO/OPA_SRC/DYN/divcur.F90

Timestamp:

2015-11-29T20:44:49+01:00 (8 years ago)

Author:

mathiot

Message:

ice sheet coupling: changes based on reviewer comments

File:

• branches/NERC/dev_r5589_is_oce_cpl/NEMOGCM/NEMO/OPA_SRC/DYN/divcur.F90 (modified) (2 diffs)

branches/NERC/dev_r5589_is_oce_cpl/NEMOGCM/NEMO/OPA_SRC/DYN/divcur.F90

@@ -29 +29 @@
    USE sbcrnf          ! river runoff 
    USE sbcisf          ! ice shelf 
-   USE iscplhsb       ! ice sheet / ocean coupling
+   USE iscplhsb        ! ice sheet / ocean coupling
    USE iscplini        !
    USE cla             ! cross land advection             (cla_div routine)
@@ -329 +329 @@
       !                                                ! ===============
 
-      IF( ln_rnf      )   CALL sbc_rnf_div( hdivn )                            ! runoffs (update hdivn field)
-      IF( ln_divisf .AND. (nn_isf .GT. 0) )   CALL sbc_isf_div  ( hdivn )      ! ice shelf (update hdivn field)
-      IF( ln_iscpl  .AND. ln_hsb )            CALL iscpl_div( hdivn )      ! ice shelf (update hdivn field)
+      IF( ln_rnf      )   CALL sbc_rnf_div( hdivn )                            ! runoffs            (update hdivn field)
+      IF( ln_divisf .AND. (nn_isf >  0)   )   CALL sbc_isf_div( hdivn )        ! ice shelf          (update hdivn field)
+      IF( ln_iscpl  .AND. ln_hsb          )   CALL iscpl_div( hdivn )          ! ice shelf coupling (update hdivn field)
       IF( nn_cla == 1 )   CALL cla_div    ( kt )             ! Cross Land Advection (update hdivn field)
       !