Changeset 2431 for branches/nemo_v3_3_beta/NEMOGCM/NEMO/OFF_SRC

Timestamp:

2010-11-25T13:45:32+01:00 (14 years ago)

Author:

cetlod

Message:

Improve the Offline together with the 1D vertical configuration

Location:

branches/nemo_v3_3_beta/NEMOGCM/NEMO/OFF_SRC

Files:

• domain.F90 (modified) (2 diffs)
• domrea.F90 (modified) (2 diffs)
• opa.F90 (modified) (2 diffs)

branches/nemo_v3_3_beta/NEMOGCM/NEMO/OFF_SRC/domain.F90

@@ -222 +222 @@
       ENDIF
 
-      n_cla = nn_cla                ! conversion DOCTOR names into model names (this should disappear soon)
-
-      IF( lk_mpp_rep .AND. n_cla /= 0 )   CALL ctl_stop( ' Reproductibility tests (nbit_cmp=1) require n_cla = 0' )
+      IF( lk_mpp_rep .AND. nn_cla /= 0 )   CALL ctl_stop( ' Reproductibility tests (nbit_cmp=1) require n_cla = 0' )
       !
    END SUBROUTINE dom_nam
@@ -268 +266 @@
       IF( ln_sco ) ioptio = ioptio + 1
       IF ( ioptio /= 1 )   CALL ctl_stop( ' none or several vertical coordinate options used' )
-
-      IF( nprint == 1 .AND. lwp )   THEN
-         WRITE(numout,*) ' MIN val mbathy ', MINVAL( mbathy(:,:) ), ' MAX ', MAXVAL( mbathy(:,:) )
-         WRITE(numout,*) ' MIN val depth t ', MINVAL( fsdept(:,:,:) ),   &
-            &                   ' w ',   MINVAL( fsdepw(:,:,:) ), '3w ', MINVAL( fsde3w(:,:,:) )
-         WRITE(numout,*) ' MIN val e3    t ', MINVAL( fse3t(:,:,:) ), ' f ', MINVAL( fse3f(:,:,:) ),  &
-            &                   ' u ',   MINVAL( fse3u(:,:,:) ), ' u ', MINVAL( fse3v(:,:,:) ),  &
-            &                   ' w ',   MINVAL( fse3w(:,:,:) )
-
-         WRITE(numout,*) ' MAX val depth t ', MAXVAL( fsdept(:,:,:) ),   &
-            &                   ' w ',   MAXVAL( fsdepw(:,:,:) ), '3w ', MAXVAL( fsde3w(:,:,:) )
-         WRITE(numout,*) ' MAX val e3    t ', MAXVAL( fse3t(:,:,:) ), ' f ', MAXVAL( fse3f(:,:,:) ),  &
-            &                   ' u ',   MAXVAL( fse3u(:,:,:) ), ' u ', MAXVAL( fse3v(:,:,:) ),  &
-            &                   ' w ',   MAXVAL( fse3w(:,:,:) )
-      ENDIF
 
    END SUBROUTINE dom_zgr

branches/nemo_v3_3_beta/NEMOGCM/NEMO/OFF_SRC/domrea.F90

@@ -86 +86 @@
          inum4                      ! 'mesh_zgr.nc'  file
  
-      REAL(wp), DIMENSION(jpi,jpj) :: &
-         zprt
-      INTEGER :: ik
+      REAL(wp), DIMENSION(jpi,jpj) :: zprt
+      REAL(wp) ::   zrefdep         ! depth of the reference level (~10m)
+      INTEGER  :: ik
       !!----------------------------------------------------------------------
 
@@ -260 +260 @@
          ENDIF
 
+!!gm BUG in s-coordinate this does not work!
+      ! deepest/shallowest W level Above/Below ~10m
+      zrefdep = 10. - ( 0.1*MINVAL(e3w_0) )                          ! ref. depth with tolerance (10% of minimum layer thickness)
+      nlb10 = MINLOC( gdepw_0, mask = gdepw_0 > zrefdep, dim = 1 )   ! shallowest W level Below ~10m
+      nla10 = nlb10 - 1                                              ! deepest    W level Above ~10m
+!!gm end bug
 
       ! Control printing : Grid informations (if not restart)

branches/nemo_v3_3_beta/NEMOGCM/NEMO/OFF_SRC/opa.F90

@@ -38 +38 @@
    USE dtadyn          ! Lecture and interpolation of the dynamical fields
    USE stpctl          ! time stepping control            (stp_ctl routine)
+
+   USE c1d             ! 1D configuration
 
    USE iom
@@ -335 +337 @@
          END SELECT
       ENDIF
+      !
+      IF( lk_c1d .AND. .NOT. lk_iomput )  &
+        CALL ctl_stop( ' The 1D vertical configuration must be used in conjunction',   &
+            &          ' with the IOM Input/Output manager. Compile with key_iomput enabled' )
+      !
 
    END SUBROUTINE opa_flg