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

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/OPA_SRC

Files:

• SBC/sbccpl.F90 (modified) (1 diff)
• SBC/sbcice_lim.F90 (modified) (6 diffs)
• nemogcm.F90 (modified) (1 diff)

branches/2016/dev_v3_6_STABLE_r6506_AGRIF_LIM3/NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90

@@ -1567 +1567 @@
 
       ! --- heat flux associated with emp (W/m2) --- !
-      zqemp_oce(:,:) = -      zevap(:,:)                   * p_frld(:,:)      *   zcptn(:,:)   &      ! evap
-         &             + ( ztprecip(:,:) - zsprecip(:,:) )                    *   zcptn(:,:)   &      ! liquid precip
-         &             +   zsprecip(:,:)                   * ( 1._wp - zsnw ) * ( zcptn(:,:) - lfus ) ! solid precip over ocean
+      zqemp_oce(:,:) = -      zevap(:,:)                   * p_frld(:,:)      *   zcptn(:,:)   &       ! evap
+         &             + ( ztprecip(:,:) - zsprecip(:,:) )                    *   zcptn(:,:)   &       ! liquid precip
+         &             +   zsprecip(:,:)                   * ( 1._wp - zsnw ) * ( zcptn(:,:) - lfus )  ! solid precip over ocean + snow melting
 !      zqemp_ice(:,:) = -   frcv(jpr_ievp)%z3(:,:,1)        * zicefr(:,:)      *   zcptn(:,:)   &      ! ice evap
 !         &             +   zsprecip(:,:)                   * zsnw             * ( zcptn(:,:) - lfus ) ! solid precip over ice
       zqemp_ice(:,:) =      zsprecip(:,:)                   * zsnw             * ( zcptn(:,:) - lfus ) ! solid precip over ice (only)
-                                                                                                       ! qevap_ice=0 since we consider Tice=0°C
+                                                                                                       ! qevap_ice=0 since we consider Tice=0degC
       
-      ! --- heat content of precip over ice in J/m3 (to be used in 1D-thermo) --- !
+      ! --- enthalpy of snow precip over ice in J/m3 (to be used in 1D-thermo) --- !
       zqprec_ice(:,:) = rhosn * ( zcptn(:,:) - lfus )
 
       ! --- heat content of evap over ice in W/m2 (to be used in 1D-thermo) --- !
       DO jl = 1, jpl
-         zqevap_ice(:,:,jl) = 0._wp ! should be -evap * ( ( Tice - rt0 ) * cpic ) but we do not have Tice, so we consider Tice=0°C
+         zqevap_ice(:,:,jl) = 0._wp ! should be -evap * ( ( Tice - rt0 ) * cpic ) but we do not have Tice, so we consider Tice=0degC
       END DO
 

branches/2016/dev_v3_6_STABLE_r6506_AGRIF_LIM3/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_lim.F90

@@ -66 +66 @@
    USE bdyice_lim       ! unstructured open boundary data  (bdy_ice_lim routine)
 #endif
+# if defined key_agrif
+   USE agrif_ice
+   USE agrif_lim3_update
+   USE agrif_lim3_interp
+# endif
 
    IMPLICIT NONE
@@ -119 +124 @@
       !-----------------------!
       IF( MOD( kt-1, nn_fsbc ) == 0 ) THEN
+
+# if defined key_agrif
+         IF( .NOT. Agrif_Root() ) THEN
+            lim_nbstep = MOD( lim_nbstep, Agrif_irhot() * Agrif_Parent(nn_fsbc) / nn_fsbc ) + 1
+         ENDIF
+# endif
 
          ! mean surface ocean current at ice velocity point (C-grid dynamics :  U- & V-points as the ocean)
@@ -162 +173 @@
                                       CALL lim_rst_opn( kt )   ! Open Ice restart file
          !
+#if defined key_agrif
+          IF( .NOT. Agrif_Root() )    CALL agrif_interp_lim3('T')
+#endif
          ! --- zap this if no ice dynamics --- !
          IF( .NOT. lk_c1d .AND. ln_limdyn ) THEN
@@ -178 +192 @@
          ENDIF
          ! ---
+#if defined key_agrif
+          IF( .NOT. Agrif_Root() )    CALL agrif_interp_lim3('T')
+#endif
 #if defined key_bdy
-         IF( ln_limthd )              CALL bdy_ice_lim( kt )   ! bdy ice thermo 
+         IF( ln_limthd )              CALL bdy_ice_lim( kt )   ! -- bdy ice thermo 
          IF( ln_icectl )              CALL lim_prt( kt, iiceprt, jiceprt, 1, ' - ice thermo bdy - ' )
 #endif
@@ -237 +254 @@
          IF( ln_limthd )              CALL lim_update2( kt )    ! -- Corrections
          ! ---
+# if defined key_agrif
+         IF( .NOT. Agrif_Root() )     CALL agrif_update_lim3( kt )
+# endif
                                       CALL lim_var_glo2eqv      ! necessary calls (at least for coupling)
                                       CALL lim_var_agg( 2 )     ! necessary calls (at least for coupling)
@@ -345 +365 @@
       !
       IF( nstock == 0 )   nstock = nlast + 1
+      !
+# if defined key_agrif
+      IF( .NOT. Agrif_Root() )   CALL Agrif_InitValues_cont_lim3
+# endif
       !
    END SUBROUTINE sbc_lim_init

branches/2016/dev_v3_6_STABLE_r6506_AGRIF_LIM3/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90

@@ -133 +133 @@
 # endif
 # if defined key_lim2
-      CALL Agrif_Declare_Var_lim2  !  "      "   "   "      "  LIM
+      CALL Agrif_Declare_Var_lim2  !  "      "   "   "      "  LIM2
+# endif
+# if defined key_lim3
+      CALL Agrif_Declare_Var_lim3  !  "      "   "   "      "  LIM3
 # endif
 #endif