Changeset 575 for trunk/NEMO/OPA_SRC/DYN/dynspg_exp.F90

Timestamp:

2006-11-14T09:04:20+01:00 (17 years ago)

Author:

opalod

Message:

nemo_v1_bugfix_079: CT : - add the creation of restart file (saving sshn & sshb) when using the explicit surface pressure option

• light modifications in the way to read/write restart files in dynspg_* and associated _jki_ modules (key_mpp_omp removed)

File:

• trunk/NEMO/OPA_SRC/DYN/dynspg_exp.F90 (modified) (6 diffs)

trunk/NEMO/OPA_SRC/DYN/dynspg_exp.F90

@@ -4 +4 @@
    !! Ocean dynamics:  surface pressure gradient trend
    !!======================================================================
-#if ( defined key_dynspg_exp && ! defined key_mpp_omp ) ||   defined key_esopa
+#if defined key_dynspg_exp   ||   defined key_esopa
    !!----------------------------------------------------------------------
    !!   'key_dynspg_exp'           free sfce cst vol. without filter nor ts
-   !!   NOT 'key_mpp_omp'                          k-j-i loop (vector opt.)
    !!----------------------------------------------------------------------
    !!   dyn_spg_exp  : update the momentum trend with the surface 
    !!                      pressure gradient in the free surface constant  
    !!                      volume case with vector optimization
+   !!   exp_rst      : read/write the explicit restart fields in the ocean restart file
    !!----------------------------------------------------------------------
    !! * Modules used
@@ -25 +25 @@
    USE lbclnk          ! ocean lateral boundary conditions (or mpp link)
    USE prtctl          ! Print control
+   USE iom             ! I/O library
+   USE restart         ! only for lrst_oce
 
    IMPLICIT NONE
@@ -31 +33 @@
    !! * Accessibility
    PUBLIC dyn_spg_exp  ! routine called by step.F90
+   PUBLIC exp_rst      ! routine called j-k-i subroutine
 
    !! * Substitutions
@@ -101 +104 @@
          spgu(:,:) = 0.e0                     ! surface pressure gradient (i-direction)
          spgv(:,:) = 0.e0                     ! surface pressure gradient (j-direction)
+
+         CALL exp_rst( nit000, 'READ' )       ! read or initialize the following fields:
+         !                                    ! sshb, sshn
+
       ENDIF
 
@@ -185 +192 @@
       ! Boundary conditions on sshn
       IF( .NOT. lk_obc ) CALL lbc_lnk( sshn, 'T', 1. )
+
+      ! write filtered free surface arrays in restart file
+      ! --------------------------------------------------
+      IF( lrst_oce )   CALL exp_rst( kt, 'WRITE' )
  
       IF(ln_ctl) THEN         ! print sum trends (used for debugging)
@@ -192 +203 @@
    END SUBROUTINE dyn_spg_exp
 
+   SUBROUTINE exp_rst( kt, cdrw )
+      !!---------------------------------------------------------------------
+      !!                   ***  ROUTINE exp_rst  ***
+      !!
+      !! ** Purpose : Read or write explicit arrays in restart file
+      !!----------------------------------------------------------------------
+      INTEGER         , INTENT(in) ::   kt         ! ocean time-step
+      CHARACTER(len=*), INTENT(in) ::   cdrw       ! "READ"/"WRITE" flag
+      !
+      !!----------------------------------------------------------------------
+      !
+      IF( TRIM(cdrw) == 'READ' ) THEN
+         IF( iom_varid( numror, 'sshn' ) > 0 ) THEN
+            CALL iom_get( numror, jpdom_local, 'sshb'  , sshb(:,:)   )
+            CALL iom_get( numror, jpdom_local, 'sshn'  , sshn(:,:)   )
+            IF( neuler == 0 ) sshb(:,:) = sshn(:,:)
+         ELSE
+            IF( nn_rstssh == 1 ) THEN  
+               sshb(:,:) = 0.e0
+               sshn(:,:) = 0.e0
+            ENDIF
+         ENDIF
+      ELSEIF( TRIM(cdrw) == 'WRITE' ) THEN
+         CALL iom_rstput( kt, nitrst, numrow, 'sshb'  , sshb  (:,:) )
+         CALL iom_rstput( kt, nitrst, numrow, 'sshn'  , sshn  (:,:) )
+      ENDIF
+      !
+   END SUBROUTINE exp_rst
 #else
    !!----------------------------------------------------------------------