Changeset 12816 for NEMO/branches/2020/r4.0-HEAD_r12713_clem_dan_fixcpl/src/ICE/icedyn_adv_pra.F90

Timestamp:

2020-04-25T14:32:42+02:00 (4 years ago)

Author:

smasson

Message:

Clem's branch: update with trunk, update with UKMO/NEMO_4.0.1_remove_0.1m_snow_test and add default restart for pond and lid

File:

• NEMO/branches/2020/r4.0-HEAD_r12713_clem_dan_fixcpl/src/ICE/icedyn_adv_pra.F90 (modified) (1 diff)

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

@@ -870 +870 @@
             !
             IF( ln_pnd_H12 ) THEN                                    ! melt pond fraction
-               CALL iom_get( numrir, jpdom_autoglo, 'sxap' , sxap  )
-               CALL iom_get( numrir, jpdom_autoglo, 'syap' , syap  )
-               CALL iom_get( numrir, jpdom_autoglo, 'sxxap', sxxap )
-               CALL iom_get( numrir, jpdom_autoglo, 'syyap', syyap )
-               CALL iom_get( numrir, jpdom_autoglo, 'sxyap', sxyap )
-               !                                                     ! melt pond volume
-               CALL iom_get( numrir, jpdom_autoglo, 'sxvp' , sxvp  )
-               CALL iom_get( numrir, jpdom_autoglo, 'syvp' , syvp  )
-               CALL iom_get( numrir, jpdom_autoglo, 'sxxvp', sxxvp )
-               CALL iom_get( numrir, jpdom_autoglo, 'syyvp', syyvp )
-               CALL iom_get( numrir, jpdom_autoglo, 'sxyvp', sxyvp )
-               !
+               IF( iom_varid( numror, 'sxap', ldstop = .FALSE. ) > 0 ) THEN
+                  CALL iom_get( numrir, jpdom_autoglo, 'sxap' , sxap  )
+                  CALL iom_get( numrir, jpdom_autoglo, 'syap' , syap  )
+                  CALL iom_get( numrir, jpdom_autoglo, 'sxxap', sxxap )
+                  CALL iom_get( numrir, jpdom_autoglo, 'syyap', syyap )
+                  CALL iom_get( numrir, jpdom_autoglo, 'sxyap', sxyap )
+                  !                                                     ! melt pond volume
+                  CALL iom_get( numrir, jpdom_autoglo, 'sxvp' , sxvp  )
+                  CALL iom_get( numrir, jpdom_autoglo, 'syvp' , syvp  )
+                  CALL iom_get( numrir, jpdom_autoglo, 'sxxvp', sxxvp )
+                  CALL iom_get( numrir, jpdom_autoglo, 'syyvp', syyvp )
+                  CALL iom_get( numrir, jpdom_autoglo, 'sxyvp', sxyvp )
+               ELSE
+                  sxap = 0._wp ;   syap = 0._wp    ;   sxxap = 0._wp    ;   syyap = 0._wp    ;   sxyap = 0._wp   ! melt pond fraction
+                  sxvp = 0._wp ;   syvp = 0._wp    ;   sxxvp = 0._wp    ;   syyvp = 0._wp    ;   sxyvp = 0._wp   ! melt pond volume
+               ENDIF
+                  !
                IF ( ln_pnd_lids ) THEN                               ! melt pond lid volume
-                  CALL iom_get( numrir, jpdom_autoglo, 'sxvl' , sxvl  )
-                  CALL iom_get( numrir, jpdom_autoglo, 'syvl' , syvl  )
-                  CALL iom_get( numrir, jpdom_autoglo, 'sxxvl', sxxvl )
-                  CALL iom_get( numrir, jpdom_autoglo, 'syyvl', syyvl )
-                  CALL iom_get( numrir, jpdom_autoglo, 'sxyvl', sxyvl )
+                  IF( iom_varid( numror, 'sxvl', ldstop = .FALSE. ) > 0 ) THEN
+                     CALL iom_get( numrir, jpdom_autoglo, 'sxvl' , sxvl  )
+                     CALL iom_get( numrir, jpdom_autoglo, 'syvl' , syvl  )
+                     CALL iom_get( numrir, jpdom_autoglo, 'sxxvl', sxxvl )
+                     CALL iom_get( numrir, jpdom_autoglo, 'syyvl', syyvl )
+                     CALL iom_get( numrir, jpdom_autoglo, 'sxyvl', sxyvl )
+                  ELSE
+                     sxvl = 0._wp; syvl = 0._wp    ;   sxxvl = 0._wp    ;   syyvl = 0._wp    ;   sxyvl = 0._wp   ! melt pond lid volume
+                  ENDIF
                ENDIF
             ENDIF