Changeset 4211

Timestamp:

2013-11-15T09:55:10+01:00 (11 years ago)

Author:

cbricaud

Message:

put dev_r4022_MERCATOR5_PAPA1D changes in dev_MERCATOR_2013

Location:

branches/2013/dev_MERCATOR_2013/NEMOGCM

Files:

• CONFIG/C1D_PAPA (copied) (copied from branches/2013/dev_r4022_MERCATOR5_PAPA1D/NEMOGCM/CONFIG/C1D_PAPA)
• NEMO/OPA_SRC/DOM/dom_oce.F90 (modified) (1 diff)
• NEMO/OPA_SRC/DOM/domain.F90 (modified) (2 diffs)
• NEMO/OPA_SRC/DOM/domzgr.F90 (modified) (1 diff)
• NEMO/OPA_SRC/DOM/istate.F90 (modified) (2 diffs)
• NEMO/OPA_SRC/par_C1D_PAPA.h90 (copied) (copied from branches/2013/dev_r4022_MERCATOR5_PAPA1D/NEMOGCM/NEMO/OPA_SRC/par_C1D_PAPA.h90)
• NEMO/OPA_SRC/par_oce.F90 (modified) (1 diff)

branches/2013/dev_MERCATOR_2013/NEMOGCM/NEMO/OPA_SRC/DOM/dom_oce.F90

@@ -30 +30 @@
    !                                              !!* Namelist namdom : time & space domain *
    INTEGER , PUBLIC ::   nn_bathy     =    0       !: = 0/1 ,compute/read the bathymetry file
+   REAL(wp), PUBLIC ::   rn_bathy     =    0.0_wp  !: depth of flat bottom (active if nn_bathy=0; if =0 depth=jpkm1)
    REAL(wp), PUBLIC ::   rn_hmin      =   -3.0_wp  !: minimum ocean depth (>0) or minimum number of ocean levels (<0)
    REAL(wp), PUBLIC ::   rn_e3zps_min =    5.0_wp  !: miminum thickness for partial steps (meters)

branches/2013/dev_MERCATOR_2013/NEMOGCM/NEMO/OPA_SRC/DOM/domain.F90

@@ -124 +124 @@
          &             nn_it000, nn_itend  , nn_date0    , nn_leapy     , nn_istate , nn_stock ,   &
          &             nn_write, ln_dimgnnn, ln_mskland  , ln_clobber   , nn_chunksz
-      NAMELIST/namdom/ nn_bathy , rn_e3zps_min, rn_e3zps_rat, nn_msh    , rn_hmin,   &
-         &             nn_acc   , rn_atfp     , rn_rdt      , rn_rdtmin ,            &
+      NAMELIST/namdom/ nn_bathy, rn_bathy , rn_e3zps_min, rn_e3zps_rat, nn_msh, rn_hmin,   &
+         &             nn_acc   , rn_atfp     , rn_rdt      , rn_rdtmin ,                  &
          &             rn_rdtmax, rn_rdth     , nn_baro     , nn_closea
       NAMELIST/namcla/ nn_cla
@@ -207 +207 @@
          WRITE(numout,*) '   Namelist namdom : space & time domain'
          WRITE(numout,*) '      flag read/compute bathymetry      nn_bathy     = ', nn_bathy
+         WRITE(numout,*) '      Depth (if =0 bathy=jpkm1)         rn_bathy     = ', rn_bathy
          WRITE(numout,*) '      min depth of the ocean    (>0) or    rn_hmin   = ', rn_hmin
          WRITE(numout,*) '      min number of ocean level (<0)       '

branches/2013/dev_MERCATOR_2013/NEMOGCM/NEMO/OPA_SRC/DOM/domzgr.F90

@@ -368 +368 @@
             IF(lwp) WRITE(numout,*)
             IF(lwp) WRITE(numout,*) '         bathymetry field: flat basin'
-            idta(:,:) = jpkm1                            ! before last level
-            zdta(:,:) = gdepw_0(jpk)                     ! last w-point depth
-            h_oce     = gdepw_0(jpk)
+            IF( rn_bathy > 0.01 ) THEN 
+               IF(lwp) WRITE(numout,*) '         Depth = rn_bathy read in namelist'
+               zdta(:,:) = rn_bathy
+               IF( ln_sco ) THEN                                   ! s-coordinate (zsc       ): idta()=jpk
+                  idta(:,:) = jpkm1
+               ELSE                                                ! z-coordinate (zco or zps): step-like topography
+                  idta(:,:) = jpkm1
+                  DO jk = 1, jpkm1
+                     WHERE( gdept_0(jk) < zdta(:,:) .AND. zdta(:,:) <= gdept_0(jk+1) )   idta(:,:) = jk
+                  END DO
+               ENDIF
+            ELSE
+               IF(lwp) WRITE(numout,*) '         Depth = depthw(jpkm1)'
+               idta(:,:) = jpkm1                            ! before last level
+               zdta(:,:) = gdepw_0(jpk)                     ! last w-point depth
+               h_oce     = gdepw_0(jpk)
+            ENDIF
          ELSE                                         ! bump centered in the basin
             IF(lwp) WRITE(numout,*)

branches/2013/dev_MERCATOR_2013/NEMOGCM/NEMO/OPA_SRC/DOM/istate.F90

@@ -180 +180 @@
    END SUBROUTINE istate_t_s
 
-
    SUBROUTINE istate_eel
       !!----------------------------------------------------------------------
@@ -404 +403 @@
 
    END SUBROUTINE istate_gyre
-
 
    SUBROUTINE istate_uvg

branches/2013/dev_MERCATOR_2013/NEMOGCM/NEMO/OPA_SRC/par_oce.F90

@@ -86 +86 @@
    !!---------------------------------------------------------------------
 #             include "par_AMM_12km.h90"
+#elif defined key_c1d_papa
+   !!---------------------------------------------------------------------
+   !!   'key_c1d_papa':                1D conf. based on PAPA station 
+   !!---------------------------------------------------------------------
+#             include "par_C1D_PAPA.h90"
 #else
    !!---------------------------------------------------------------------