Changeset 13431 for NEMO

Timestamp:

2020-08-24T14:22:55+02:00 (4 years ago)

Author:

smueller

Message:

Miscellaneous bugfixes in ASM- and SOL-related functionality

Location:

NEMO/branches/NERC/dev_release-3.4_NEMOTAM_consolidated/NEMOGCM/NEMO/OPA_SRC

Files:

• DYN/sshwzv.F90 (modified) (2 diffs)
• IOM/restart.F90 (modified) (2 diffs)
• SOL/solsor.F90 (modified) (3 diffs)
• SOL/solver.F90 (modified) (1 diff)

NEMO/branches/NERC/dev_release-3.4_NEMOTAM_consolidated/NEMOGCM/NEMO/OPA_SRC/DYN/sshwzv.F90

@@ -8 +8 @@
    !!             -   !  2010-05  (K. Mogensen, A. Weaver, M. Martin, D. Lea) Assimilation interface
    !!             -   !  2010-09  (D.Storkey and E.O'Dea) bug fixes for BDY module
+   !!            3.4  !  2012-10  (A. Weaver and K. Mogensen) Fix for direct initialization
    !!----------------------------------------------------------------------
 
@@ -156 +157 @@
       !
       z2dt = 2._wp * rdt                              ! set time step size (Euler/Leapfrog)
-      IF( neuler == 0 .AND. kt == nit000 )   z2dt = rdt
+      IF( neuler == 0 .AND. kt == nit000 ) THEN
+
+         ! Need to update hdivb and rotb for assimilation with direct initialization
+         z2dt = rdt
+         rotb (:,:,:) = rotn (:,:,:)   ! Update before fields
+         hdivb(:,:,:) = hdivn(:,:,:)
+
+      ENDIF
 
       !                                           !------------------------------!

NEMO/branches/NERC/dev_release-3.4_NEMOTAM_consolidated/NEMOGCM/NEMO/OPA_SRC/IOM/restart.F90

@@ -24 +24 @@
    USE trdmld_oce      ! ocean active mixed layer tracers trends variables
    USE domvvl          ! variable volume
+   USE sol_oce         ! gcx,gcb arrays. 
+   USE dynspg_oce      ! pressure gradient schemes
 
    IMPLICIT NONE
@@ -207 +209 @@
       ENDIF
 #endif
+      ! Initialisation of SSH
+      IF (lk_dynspg_flt) THEN          ! Filtered free surface flag
+         ! copied from flt_rst
+         IF(lwp) WRITE(numout,*)'Reading gcx, gcxb for SSH in ASM/OBS.'
+         IF (sol_oce_alloc()/=0) THEN
+            CALL ctl_stop( 'STOP', 'restart : unable to allocate sol_oce arrays' )
+         ENDIF
+         IF( iom_varid( numror, 'gcx' ) > 0 ) THEN
+            ! Caution : extra-hallow
+            ! gcx and gcxb are defined as: DIMENSION(1-jpr2di:jpi+jpr2di,1-jpr2dj:jpj+jpr2dj)
+            CALL iom_get( numror, jpdom_autoglo, 'gcx' , gcx (1:jpi,1:jpj) )
+            CALL iom_get( numror, jpdom_autoglo, 'gcxb', gcxb(1:jpi,1:jpj) )
+            IF( neuler == 0 ) THEN
+               gcxb(:,:) = gcx (:,:)
+            ENDIF
+         ELSE
+            gcx (:,:) = 0.e0
+            gcxb(:,:) = 0.e0
+         ENDIF
+      ENDIF
       !
       IF( neuler == 0 ) THEN                                  ! Euler restart (neuler=0)

NEMO/branches/NERC/dev_release-3.4_NEMOTAM_consolidated/NEMOGCM/NEMO/OPA_SRC/SOL/solsor.F90

@@ -77 +77 @@
       ijpr2d    = MAX( jpr2di , jpr2dj )
       icount = 0
+      gcr=0.
       !                                                       ! ==============
       DO jn = 1, nn_nmax                                      ! Iterative loop 
@@ -139 +140 @@
             CASE ( 1 )                 ! relative precision
                ztab = 0.
-               ztab(:,:) = gcr(2:nlci-1,2:nlcj-1)
+               ztab(2:nlci-1,2:nlcj-1) = gcr(2:nlci-1,2:nlcj-1)
                rnorme = glob_sum( ztab)    ! sum over the global domain
                ! test of convergence
+               res = SQRT( rnorme )
                IF( rnorme < epsr .OR. jn == nn_nmax ) THEN
-                  res = SQRT( rnorme )
                   niter = jn
                   ncut = 999
@@ -150 +151 @@
          
          !****
-         !     IF(lwp)WRITE(numsol,9300) jn, res, sqrt( epsr ) / eps
+            IF(lwp)WRITE(numsol,9300) jn, res, SQRT( epsr ) / eps
 9300     FORMAT('          niter :',i4,' res :',e20.10,' b :',e20.10)
          !****

NEMO/branches/NERC/dev_release-3.4_NEMOTAM_consolidated/NEMOGCM/NEMO/OPA_SRC/SOL/solver.F90

@@ -83 +83 @@
 
       !                              ! allocate solver arrays
-      IF( .NOT. lk_agrif .OR. .NOT. ln_rstart) THEN
+      IF(  ( .NOT. lk_agrif .OR. .NOT. ln_rstart ) .AND. &
+         & ( .NOT. ( lk_dynspg_flt .AND. ln_rstart ) ) ) THEN
          IF( sol_oce_alloc() /= 0 )   CALL ctl_stop( 'STOP', 'solver_init : unable to allocate sol_oce arrays' )
       ENDIF