Changeset 13294

Timestamp:

2020-07-10T20:15:20+02:00 (4 years ago)

Author:

smueller

Message:

Overriding of the initial sea-level compensation for non-zero sea-ice/snow mass in nested domains (see ticket #2487)

Location:

NEMO/branches/2020/ticket2487/src

Files:

• ICE/iceistate.F90 (modified) (2 diffs)
• OCE/SBC/sbcice_cice.F90 (modified) (2 diffs)

NEMO/branches/2020/ticket2487/src/ICE/iceistate.F90

@@ -60 +60 @@
    INTEGER , PARAMETER ::   jp_hpd = 9           ! index of pnd depth        (m)
    TYPE(FLD), ALLOCATABLE, DIMENSION(:) ::   si  ! structure of input fields (file informations, fields read)
+   !
+#if defined key_agrif
+   REAL(wp), PUBLIC ::   rsshadj          !: initial mean ssh adjustment due to initial ice+snow mass
+#endif
    !   
    !!----------------------------------------------------------------------
@@ -427 +431 @@
          z1_area = 1.0_wp / glob_sum( 'iceistate', e1e2t(:,:) )
          zsshadj = glob_sum( 'iceistate', e1e2t(:,:) * snwice_mass(:,:) ) * r1_rau0 * z1_area
+#if defined key_agrif
+         ! Override ssh adjustment in nested domains by the root-domain ssh
+         ! adjustment; store the adjustment value in a global module variable to
+         ! make it retrievable in nested domains
+         IF( .NOT. Agrif_Root() ) zsshadj = Agrif_Parent(rsshadj)
+         rsshadj = zsshadj
+#endif
          WRITE(ctmp1,'(A34,F10.6,A32)') 'iceistate:   mean ssh adjusted by ', -1.0_wp * zsshadj, ' m to compensate for the initial'
          CALL ctl_warn( ctmp1,          '             ice+snow mass' )

NEMO/branches/2020/ticket2487/src/OCE/SBC/sbcice_cice.F90

@@ -87 +87 @@
 
    REAL(wp), ALLOCATABLE, SAVE, DIMENSION(:,:,:), PRIVATE ::   png     ! local array used in sbc_cice_ice
+
+#if defined key_agrif
+   REAL(wp), PUBLIC ::   rsshadj    !: initial mean ssh adjustment due to initial ice+snow mass
+#endif
 
    !!----------------------------------------------------------------------
@@ -270 +274 @@
             z1_area = 1.0_wp / glob_sum( 'sbcice_cice', e1e2t(:,:) )
             zsshadj = glob_sum( 'sbcice_cice', e1e2t(:,:) * snwice_mass(:,:) ) * r1_rau0 * z1_area
+#if defined key_agrif
+            ! Override ssh adjustment in nested domains by the root-domain ssh
+            ! adjustment; store the adjustment value in a global module variable to
+            ! make it retrievable in nested domains
+            IF( .NOT. Agrif_Root() ) zsshadj = Agrif_Parent(rsshadj)
+            rsshadj = zsshadj
+#endif
             WRITE(ctmp1,'(A36,F10.6,A24)') 'sbcice_cice:   mean ssh adjusted by ', -1.0_wp * zsshadj, ' m to compensate for the'
             CALL ctl_warn( ctmp1,          '               initial ice+snow mass' )