Changeset 6584 for branches/2016/dev_v3_6_STABLE_r6506_AGRIF_LIM3/NEMOGCM/NEMO/LIM_SRC_3

Timestamp:

2016-05-20T11:54:18+02:00 (8 years ago)

Author:

clem

Message:

LIM3 and Agrif compatibility

Location:

branches/2016/dev_v3_6_STABLE_r6506_AGRIF_LIM3/NEMOGCM/NEMO/LIM_SRC_3

Files:

• limrhg.F90 (modified) (7 diffs)
• limtrp.F90 (modified) (2 diffs)
• limvar.F90 (modified) (2 diffs)

branches/2016/dev_v3_6_STABLE_r6506_AGRIF_LIM3/NEMOGCM/NEMO/LIM_SRC_3/limrhg.F90

@@ -40 +40 @@
 #if defined key_agrif && defined key_lim2
    USE agrif_lim2_interp
+#endif
+#if defined key_agrif && defined key_lim3
+   USE agrif_lim3_interp
 #endif
 #if defined key_bdy
@@ -174 +177 @@
       CALL agrif_rhg_lim2_load      ! First interpolation of coarse values
 #endif
+#if defined key_agrif && defined key_lim3 
+      CALL agrif_interp_lim3('U')   ! First interpolation of coarse values
+      CALL agrif_interp_lim3('V')   ! First interpolation of coarse values
+#endif
       !
       !------------------------------------------------------------------------------!
@@ -460 +467 @@
             CALL agrif_rhg_lim2( jter, nn_nevp, 'U' )
 #endif
+#if defined key_agrif && defined key_lim3
+            CALL agrif_interp_lim3( 'U' )
+#endif
 #if defined key_bdy
          CALL bdy_ice_lim_dyn( 'U' )
@@ -486 +496 @@
             CALL agrif_rhg_lim2( jter, nn_nevp, 'V' )
 #endif
+#if defined key_agrif && defined key_lim3
+            CALL agrif_interp_lim3( 'V' )
+#endif
 #if defined key_bdy
          CALL bdy_ice_lim_dyn( 'V' )
@@ -513 +526 @@
             CALL agrif_rhg_lim2( jter, nn_nevp, 'V' )
 #endif
+#if defined key_agrif && defined key_lim3
+            CALL agrif_interp_lim3( 'V' )
+#endif
 #if defined key_bdy
          CALL bdy_ice_lim_dyn( 'V' )
@@ -537 +553 @@
 #if defined key_agrif && defined key_lim2
             CALL agrif_rhg_lim2( jter, nn_nevp, 'U' )
+#endif
+#if defined key_agrif && defined key_lim3
+            CALL agrif_interp_lim3( 'U' )
 #endif
 #if defined key_bdy
@@ -576 +595 @@
       CALL agrif_rhg_lim2( nn_nevp , nn_nevp, 'U' )
       CALL agrif_rhg_lim2( nn_nevp , nn_nevp, 'V' )
+#endif
+#if defined key_agrif && defined key_lim3
+      CALL agrif_interp_lim3( 'U' )
+      CALL agrif_interp_lim3( 'V' )
 #endif
 #if defined key_bdy

branches/2016/dev_v3_6_STABLE_r6506_AGRIF_LIM3/NEMOGCM/NEMO/LIM_SRC_3/limtrp.F90

@@ -102 +102 @@
       ENDIF
       
+      CALL lim_var_agg( 1 ) ! integrated values + ato_i
+
       !-------------------------------------!
       !   Advection of sea ice properties   !
@@ -113 +115 @@
       zvsold = v_s
       zsmvold(:,:) = SUM( smv_i(:,:,:), dim=3 )
-      zeiold (:,:) = SUM( SUM( e_i(:,:,1:nlay_i,:), dim=4 ), dim=3 ) 
-      zesold (:,:) = SUM( SUM( e_s(:,:,1:nlay_s,:), dim=4 ), dim=3 ) 
+      zeiold (:,:) = et_i
+      zesold (:,:) = et_s 
 
       !--- Thickness correction init. --- !
-      zatold(:,:) = SUM( a_i(:,:,:), dim=3 )
+      zatold(:,:) = at_i
       DO jl = 1, jpl
          DO jj = 1, jpj

branches/2016/dev_v3_6_STABLE_r6506_AGRIF_LIM3/NEMOGCM/NEMO/LIM_SRC_3/limvar.F90

@@ -89 +89 @@
       vt_s (:,:) = SUM( v_s, dim=3 )
       at_i (:,:) = SUM( a_i, dim=3 )
+      et_s(:,:)  = SUM( SUM( e_s(:,:,:,:), dim=4 ), dim=3 )
+      et_i(:,:)  = SUM( SUM( e_i(:,:,:,:), dim=4 ), dim=3 )
 
       ! open water fraction
@@ -98 +100 @@
 
       IF( kn > 1 ) THEN
-         et_s(:,:)  = SUM( SUM( e_s(:,:,:,:), dim=4 ), dim=3 )  ! snow heat content
-         et_i(:,:)  = SUM( SUM( e_i(:,:,:,:), dim=4 ), dim=3 )  ! ice  heat content
 
          ! mean ice/snow thickness