Changeset 8235 for branches/UKMO/dev_r5518_couple_chlorophyll/NEMOGCM/NEMO/OPA_SRC/SBC/sbcisf.F90

Timestamp:

2017-06-28T16:48:39+02:00 (7 years ago)

Author:

frrh

Message:

Update branch in line with current head of GO6 package branch at revision 8104.

File:

• branches/UKMO/dev_r5518_couple_chlorophyll/NEMOGCM/NEMO/OPA_SRC/SBC/sbcisf.F90 (modified) (2 diffs)

branches/UKMO/dev_r5518_couple_chlorophyll/NEMOGCM/NEMO/OPA_SRC/SBC/sbcisf.F90

@@ -255 +255 @@
 
             IF( lk_oasis) THEN
-            ! ln_coupled_iceshelf_fluxes uninitialised unless lk_oasis=true
-            IF( ln_coupled_iceshelf_fluxes ) THEN
+            ! nn_coupled_iceshelf_fluxes uninitialised unless lk_oasis=true
+            IF( nn_coupled_iceshelf_fluxes .gt. 0 ) THEN
 
               ! Adjust total iceshelf melt rates so that sum of iceberg calving and iceshelf melting in the northern
@@ -304 +304 @@
 
             IF( lk_oasis) THEN
-            ! ln_coupled_iceshelf_fluxes uninitialised unless lk_oasis=true
-            IF( ln_coupled_iceshelf_fluxes ) THEN
+            ! nn_coupled_iceshelf_fluxes uninitialised unless lk_oasis=true
+            IF( nn_coupled_iceshelf_fluxes .gt. 0 ) THEN
 
               ! Adjust total iceshelf melt rates so that sum of iceberg calving and iceshelf melting in the northern