Changeset 13334 for NEMO/branches/2020/dev_r13312_AGRIF-03-04_jchanut_vinterp_tstep/src/ICE/iceistate.F90

Timestamp:

2020-07-22T16:20:32+02:00 (4 years ago)

Author:

jchanut

Message:

finish bypassing ocean/ice initialization with AGRIF, #2222, #2129

File:

• NEMO/branches/2020/dev_r13312_AGRIF-03-04_jchanut_vinterp_tstep/src/ICE/iceistate.F90 (modified) (3 diffs)

NEMO/branches/2020/dev_r13312_AGRIF-03-04_jchanut_vinterp_tstep/src/ICE/iceistate.F90

@@ -33 +33 @@
    USE fldread        ! read input fields
 
-# if defined key_agrif
-   USE agrif_oce
-   USE agrif_ice
-   USE agrif_ice_interp 
-# endif   
+   USE agrif_oce      ! initial state interpolation
+   USE agrif_ice_interp   
 
    IMPLICIT NONE
@@ -177 +174 @@
 
       IF( ln_iceini ) THEN
-         !                             !---------------!
-         
-         IF( Agrif_Root() ) THEN
-
+        
+#if defined key_agrif
+         IF ( ( Agrif_Root() ).OR.(.NOT.ln_init_chfrpar ) ) THEN
+#endif
+            !                             !---------------!
             IF( ln_iceini_file )THEN      ! Read a file   !
                !                          !---------------!
@@ -376 +374 @@
             t1_ice(:,:,:) = t_i (:,:,1,:)
             !
-         
-#if  defined key_agrif
+#if defined key_agrif
          ELSE
- 
-            Agrif_SpecialValue    = -9999.
-            Agrif_UseSpecialValue = .TRUE.
-            CALL Agrif_init_variable(tra_iceini_id,procname=interp_tra_ice)
-            use_sign_north = .TRUE.
-            sign_north = -1.
-            CALL Agrif_init_variable(u_iceini_id  ,procname=interp_u_ice)
-            CALL Agrif_init_variable(v_iceini_id  ,procname=interp_v_ice)
-            Agrif_SpecialValue    = 0._wp
-            use_sign_north = .FALSE.
-            Agrif_UseSpecialValue = .FALSE.
-        ! lbc ???? 
-   ! Here we know : a_i, v_i, v_s, sv_i, oa_i, a_ip, v_ip, t_su, e_s, e_i
-            CALL ice_var_glo2eqv
-            CALL ice_var_zapsmall
-            CALL ice_var_agg(2)
-
-            ! Melt ponds
-            WHERE( a_i > epsi10 )
-               a_ip_frac(:,:,:) = a_ip(:,:,:) / a_i(:,:,:)
-            ELSEWHERE
-               a_ip_frac(:,:,:) = 0._wp
-            END WHERE
-            WHERE( a_ip > 0._wp )       ! ???????    
-               h_ip(:,:,:) = v_ip(:,:,:) / a_ip(:,:,:)
-            ELSEWHERE
-               h_ip(:,:,:) = 0._wp
-            END WHERE   
-
-            tn_ice(:,:,:) = t_su(:,:,:)
-            t1_ice(:,:,:) = t_i (:,:,1,:)
+            CALL  agrif_istate_ice        
+         ENDIF
 #endif
-          ENDIF ! Agrif_Root
       ENDIF ! ln_iceini
       !