Changeset 13334 for NEMO/branches/2020/dev_r13312_AGRIF-03-04_jchanut_vinterp_tstep/src/NST/agrif_user.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/NST/agrif_user.F90 (modified) (3 diffs)

NEMO/branches/2020/dev_r13312_AGRIF-03-04_jchanut_vinterp_tstep/src/NST/agrif_user.F90

@@ -40 +40 @@
       !    
    END SUBROUTINE Agrif_initvalues
-
-   
-   SUBROUTINE Agrif_Istate( Kbb, Kmm, Kaa )
-      !!----------------------------------------------------------------------
-      !!                 *** ROUTINE agrif_istate ***
-      !!----------------------------------------------------------------------
-      USE domvvl
-      USE domain
-      USE par_oce
-      USE agrif_oce
-      USE agrif_oce_interp
-      USE oce
-      USE lib_mpp
-      USE lbclnk
-      !
-      IMPLICIT NONE
-      !
-      INTEGER, INTENT(in)  :: Kbb, Kmm, Kaa
-      INTEGER :: jn
-      !!----------------------------------------------------------------------
-      IF(lwp) WRITE(numout,*) ' '
-      IF(lwp) WRITE(numout,*) 'AGRIF: interp child initial state from parent'
-      IF(lwp) WRITE(numout,*) ' '
-
-      l_ini_child           = .TRUE.
-      Agrif_SpecialValue    = 0.0_wp
-      Agrif_UseSpecialValue = .TRUE.
-      uu(:,:,:,:) = 0.0_wp   ;   vv(:,:,:,:) = 0.0_wp   ;   ts(:,:,:,:,:) = 0.0_wp
-       
-      Krhs_a = Kbb   ;   Kmm_a = Kbb
-
-      ! Brutal fix to pas 1x1 refinment. 
-  !    IF(Agrif_Irhox() == 1) THEN
-  !       CALL Agrif_Init_Variable(tsini_id, procname=agrif_initts)
-  !    ELSE
-      CALL Agrif_Init_Variable(tsini_id, procname=interptsn)
-
-  !    ENDIF
-! just for VORTEX because Parent velocities can actually be exactly zero
-!      Agrif_UseSpecialValue = .FALSE.
-      Agrif_UseSpecialValue = ln_spc_dyn
-      use_sign_north = .TRUE.
-      sign_north = -1.
-      CALL Agrif_Init_Variable(uini_id , procname=interpun )
-      CALL Agrif_Init_Variable(vini_id , procname=interpvn )
-      use_sign_north = .FALSE.
-
-      Agrif_UseSpecialValue = .FALSE.
-      l_ini_child           = .FALSE.
-
-      Krhs_a = Kaa   ;   Kmm_a = Kmm
-
-      DO jn = 1, jpts
-         ts(:,:,:,jn,Kbb) = ts(:,:,:,jn,Kbb)*tmask(:,:,:)
-      END DO
-      uu(:,:,:,Kbb) = uu(:,:,:,Kbb) * umask(:,:,:)     
-      vv(:,:,:,Kbb) = vv(:,:,:,Kbb) * vmask(:,:,:) 
-
-
-      CALL lbc_lnk_multi( 'agrif_istate', uu(:,:,:  ,Kbb), 'U', -1.0_wp , vv(:,:,:,Kbb), 'V', -1.0_wp )
-      CALL lbc_lnk(       'agrif_istate', ts(:,:,:,:,Kbb), 'T',  1.0_wp )
-
-   END SUBROUTINE Agrif_Istate
 
    
@@ -285 +222 @@
       mbkv_parent(:,:) = MAX( NINT( zk(:,:) ), 1 )   
 
-      IF ( ln_init_chfrpar ) THEN 
-         CALL Agrif_Init_Variable(sshini_id, procname=agrif_initssh)
-         CALL lbc_lnk( 'Agrif_Init_Domain', ssh(:,:,Kbb), 'T', 1. )
-         DO jk = 1, jpk
-               e3t(:,:,jk,Kbb) =  e3t_0(:,:,jk) * ( ht_0(:,:) + ssh(:,:,Kbb)  ) &
-                        &             / ( ht_0(:,:) + 1._wp - ssmask(:,:) ) * tmask(:,:,jk)   &
-                        &              + e3t_0(:,:,jk) * ( 1._wp - tmask(:,:,jk) )
-         END DO
-      ENDIF
 
       ! check if masks and bathymetries match
@@ -904 +832 @@
          &   'agrif_nemo_init: Agrif children requires jpjglo == nbcellsy + 2 + 2*nn_hls + nbghostcells_y_s + nbghostcells_y_n' )
       IF( ln_use_jattr )   CALL ctl_stop( 'STOP', 'agrif_nemo_init:Agrif children requires ln_use_jattr = .false. ' )
+      !
       !
    END SUBROUTINE agrif_nemo_init