Changeset 12725 for NEMO/branches/2020/r4.0-HEAD_r12713_clem_dan_fixcpl/src/ICE/icerst.F90

Timestamp:

2020-04-09T15:48:28+02:00 (4 years ago)

Author:

clem

Message:

fix previous revision. Make sure a_ip and a_ip_eff are correct

File:

• NEMO/branches/2020/r4.0-HEAD_r12713_clem_dan_fixcpl/src/ICE/icerst.F90 (modified) (2 diffs)

NEMO/branches/2020/r4.0-HEAD_r12713_clem_dan_fixcpl/src/ICE/icerst.F90

@@ -251 +251 @@
             v_ip(:,:,:) = 0._wp
          ENDIF
-         a_ip_eff(:,:,:) = a_ip(:,:,:)
          ! melt pond lids
-         id5 = iom_varid( numrir, 'v_il' , ldstop = .FALSE. )
-         IF( id5 > 0 ) THEN
+         id3 = iom_varid( numrir, 'v_il' , ldstop = .FALSE. )
+         IF( id3 > 0 ) THEN
             CALL iom_get( numrir, jpdom_autoglo, 'v_il', v_il)
          ELSE
@@ -262 +261 @@
          ! fields needed for Met Office (Jules) coupling
          IF( ln_cpl ) THEN
-            id3 = iom_varid( numrir, 'cnd_ice' , ldstop = .FALSE. )
-            id4 = iom_varid( numrir, 't1_ice'  , ldstop = .FALSE. )
-            IF( id3 > 0 .AND. id4 > 0 ) THEN         ! fields exist
+            id4 = iom_varid( numrir, 'cnd_ice' , ldstop = .FALSE. )
+            id5 = iom_varid( numrir, 't1_ice'  , ldstop = .FALSE. )
+            IF( id4 > 0 .AND. id5 > 0 ) THEN         ! fields exist
                CALL iom_get( numrir, jpdom_autoglo, 'cnd_ice', cnd_ice )
                CALL iom_get( numrir, jpdom_autoglo, 't1_ice' , t1_ice  )