Changeset 9019 for branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ICB

Timestamp:

2017-12-13T15:58:53+01:00 (6 years ago)

Author:

timgraham

Message:

Merge of dev_CNRS_2017 into branch

Location:

branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ICB

Files:

• icb_oce.F90 (modified) (2 diffs)
• icbtrj.F90 (modified) (2 diffs)
• icbutl.F90 (modified) (3 diffs)

branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ICB/icb_oce.F90

@@ -90 +90 @@
    REAL(wp), PUBLIC, DIMENSION(:,:), ALLOCATABLE ::   ua_e, va_e
    REAL(wp), PUBLIC, DIMENSION(:,:), ALLOCATABLE ::   ssh_e
-#if defined key_lim2 || defined key_lim3 || defined key_cice
+#if defined key_lim3 || defined key_cice
    REAL(wp), PUBLIC, DIMENSION(:,:), ALLOCATABLE ::   ui_e, vi_e
 #endif
@@ -170 +170 @@
       ALLOCATE( uo_e(0:jpi+1,0:jpj+1) , ua_e(0:jpi+1,0:jpj+1) ,   &
          &      vo_e(0:jpi+1,0:jpj+1) , va_e(0:jpi+1,0:jpj+1) ,   &
-#if defined key_lim2 || defined key_lim3 || defined key_cice
+#if defined key_lim3 || defined key_cice
          &      ui_e(0:jpi+1,0:jpj+1) ,                            &
          &      vi_e(0:jpi+1,0:jpj+1) ,                            &

branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ICB/icbtrj.F90

@@ -16 +16 @@
    USE dom_oce        ! NEMO ocean domain
    USE phycst         ! NEMO physical constants
+   USE icb_oce        ! define iceberg arrays
+   USE icbutl         ! iceberg utility routines
+   !
    USE lib_mpp        ! NEMO MPI library, lk_mpp in particular
    USE in_out_manager ! NEMO IO, numout in particular
-   USE ioipsl, ONLY : ju2ymds    ! for calendar
+   USE ioipsl  , ONLY : ju2ymds    ! for calendar
    USE netcdf
-   !
-   USE icb_oce        ! define iceberg arrays
-   USE icbutl         ! iceberg utility routines
 
    IMPLICIT NONE
@@ -58 +58 @@
       !! ** Purpose :   initialise iceberg trajectory output files
       !!----------------------------------------------------------------------
-      INTEGER, INTENT( in )                 :: ktend
-      !
-      INTEGER                               :: iret
-      INTEGER                               :: iyear, imonth, iday
-      REAL(wp)                              :: zfjulday, zsec
-      CHARACTER(len=80)                     :: cl_filename
-      TYPE(iceberg), POINTER                :: this
-      TYPE(point)  , POINTER                :: pt
-      CHARACTER(LEN=20)                     :: cldate_ini, cldate_end
+      INTEGER, INTENT(in) ::   ktend   ! time step index
+      !
+      INTEGER                ::   iret, iyear, imonth, iday
+      REAL(wp)               ::   zfjulday, zsec
+      CHARACTER(len=80)      ::   cl_filename
+      CHARACTER(LEN=20)      ::   cldate_ini, cldate_end
+      TYPE(iceberg), POINTER ::   this
+      TYPE(point)  , POINTER ::   pt
       !!----------------------------------------------------------------------
 

branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ICB/icbutl.F90

@@ -21 +21 @@
    USE icb_oce                             ! define iceberg arrays
    USE sbc_oce                             ! ocean surface boundary conditions
-#if defined key_lim2
-   USE ice_2,         ONLY: u_ice, v_ice   ! LIM-2 ice velocities  (CAUTION in C-grid do not use key_vp option)
-   USE ice_2,         ONLY: hicif          ! LIM-2 ice thickness
-#elif defined key_lim3
-   USE ice,           ONLY: u_ice, v_ice   ! LIM-3 variables  (always in C-grid)
-                                           ! gm  LIM3 case the mean ice thickness (i.e. averaged over categories)
-                                           ! gm            has to be computed somewhere in the ice and accessed here
+#if defined key_lim3
+   USE ice,    ONLY: u_ice, v_ice, hm_i    ! LIM-3 variables
 #endif
 
@@ -85 +80 @@
       CALL lbc_lnk_icb( fr_e, 'T', +1._wp, 1, 1 )
       CALL lbc_lnk_icb( tt_e, 'T', +1._wp, 1, 1 )
-#if defined key_lim2
-      hicth(:,:) = 0._wp ;  hicth(1:jpi,1:jpj) = hicif(:,:)  
-      CALL lbc_lnk_icb(hicth, 'T', +1._wp, 1, 1 )  
-#endif
-
-#if defined key_lim2 || defined key_lim3
+#if defined key_lim3
+      hicth(:,:) = 0._wp ;  hicth(1:jpi,1:jpj) = hm_i (:,:)  
       ui_e(:,:) = 0._wp ;   ui_e(1:jpi, 1:jpj) = u_ice(:,:)
       vi_e(:,:) = 0._wp ;   vi_e(1:jpi, 1:jpj) = v_ice(:,:)
-
+      CALL lbc_lnk_icb(hicth, 'T', +1._wp, 1, 1 )
       CALL lbc_lnk_icb( ui_e, 'U', -1._wp, 1, 1 )
       CALL lbc_lnk_icb( vi_e, 'V', -1._wp, 1, 1 )
@@ -157 +148 @@
       pva  = pva * zmod
 
-#if defined key_lim2 || defined key_lim3
+#if defined key_lim3
       pui = icb_utl_bilin_h( ui_e, pi, pj, 'U' )              ! sea-ice velocities
       pvi = icb_utl_bilin_h( vi_e, pi, pj, 'V' )
-# if defined key_lim3
-      phi = 0._wp                                             ! LIM-3 case (to do)
-# else
       phi = icb_utl_bilin_h(hicth, pi, pj, 'T' )              ! ice thickness
-# endif
 #else
       pui = 0._wp