Changeset 11385 for NEMO/branches/2019/dev_r10984_HPC-13_IRRMANN_BDY_optimization/src/ICE/icerst.F90

Timestamp:

2019-08-01T14:05:25+02:00 (5 years ago)

Author:

clem

Message:

remove key_floats from the code and replace it by a logical ln_floats

File:

• NEMO/branches/2019/dev_r10984_HPC-13_IRRMANN_BDY_optimization/src/ICE/icerst.F90 (modified) (4 diffs)

NEMO/branches/2019/dev_r10984_HPC-13_IRRMANN_BDY_optimization/src/ICE/icerst.F90

@@ -123 +123 @@
       CALL iom_rstput( iter, nitrst, numriw, 'v_s' , v_s  )
       CALL iom_rstput( iter, nitrst, numriw, 'sv_i', sv_i )
-      CALL iom_rstput( iter, nitrst, numriw, 'oa_i', oa_i )
       CALL iom_rstput( iter, nitrst, numriw, 'a_i' , a_i  )
       CALL iom_rstput( iter, nitrst, numriw, 't_su', t_su )
+      ! ice age
+      CALL iom_rstput( iter, nitrst, numriw, 'oa_i', oa_i )
       ! Melt ponds
       CALL iom_rstput( iter, nitrst, numriw, 'a_ip', a_ip )
@@ -144 +145 @@
       END DO
       ! ice velocity
-      CALL iom_rstput( iter, nitrst, numriw, 'u_ice', u_ice ) ! u_ice
-      CALL iom_rstput( iter, nitrst, numriw, 'v_ice', v_ice ) ! v_ice
+      CALL iom_rstput( iter, nitrst, numriw, 'u_ice', u_ice )
+      CALL iom_rstput( iter, nitrst, numriw, 'v_ice', v_ice )
       ! fields needed for Met Office (Jules) coupling
       IF( ln_cpl ) THEN
@@ -171 +172 @@
       INTEGER           ::   jk
       LOGICAL           ::   llok
-      INTEGER           ::   id1            ! local integer
+      INTEGER           ::   id1, id2            ! local integer
       CHARACTER(len=25) ::   znam
       CHARACTER(len=2)  ::   zchar, zchar1
@@ -205 +206 @@
       CALL iom_get( numrir, jpdom_autoglo, 'v_s' , v_s  )
       CALL iom_get( numrir, jpdom_autoglo, 'sv_i', sv_i )
-      CALL iom_get( numrir, jpdom_autoglo, 'oa_i', oa_i )
       CALL iom_get( numrir, jpdom_autoglo, 'a_i' , a_i  )
       CALL iom_get( numrir, jpdom_autoglo, 't_su', t_su )
+      ! ice age
+      id1 = iom_varid( numrir, 'oa_i' , ldstop = .FALSE. )
+      IF( id1 > 0 ) THEN                       ! fields exist
+         CALL iom_get( numrir, jpdom_autoglo, 'oa_i', oa_i )
+      ELSE                                     ! start from rest
+         IF(lwp) WRITE(numout,*) '   ==>>   previous run without ice age output then set it to zero'
+         oa_i(:,:,:) = 0._wp
+      ENDIF
       ! Melt ponds
-      id1 = iom_varid( numrir, 'a_ip' , ldstop = .FALSE. )
-      IF( id1 > 0 ) THEN                       ! fields exist (melt ponds)
+      id2 = iom_varid( numrir, 'a_ip' , ldstop = .FALSE. )
+      IF( id2 > 0 ) THEN                       ! fields exist
          CALL iom_get( numrir, jpdom_autoglo, 'a_ip' , a_ip )
          CALL iom_get( numrir, jpdom_autoglo, 'v_ip' , v_ip )