Merge pull request #214 from NOC-MSM/213-mixed-z-coords

213 mixed z coords

Author: b-barton

docs/pybdy.md

@@ -830,7 +830,7 @@ Created.
 
 ## pybdy.nemo_bdy_zgrv2.get_bdy_depths(DstCoord, bdy_i, grd)
 
-Depth levels from the nearest neighbour on the source grid.
+Depth levels on the destination grid at bdy points.
 
 > ### Parameters<br>
 

src/pybdy/nemo_bdy_extr_tm3.py

@@ -441,6 +441,8 @@ def __init__(self, setup, SourceCoord, DstCoord, Grid, var_nam, grd, pair):
 
             # Fig not implemented
 
+            sc_z_ch = sc_z[:, jmin:jmax, imin:imax]
+
             if (not isslab) & self.settings["zinterp"]:
                 # Determine vertical weights for the linear interpolation
                 # onto Dst grid
@@ -449,7 +451,7 @@ def __init__(self, setup, SourceCoord, DstCoord, Grid, var_nam, grd, pair):
                     dst_dep[:, chunk],
                     dst_len_z,
                     self.num_bdy_ch[c],
-                    sc_z,
+                    sc_z_ch,
                     sc_z_len,
                     ind,
                     SC.zgr.grid_type == "zco",

src/pybdy/nemo_bdy_zgrv2.py

@@ -136,7 +136,7 @@ def get_bdy_depths_old(bdy_t, bdy_u, bdy_v, DstCoord, settings):
 
 def get_bdy_depths(DstCoord, bdy_i, grd):
     """
-    Depth levels from the nearest neighbour on the source grid.
+    Depth levels on the destination grid at bdy points.
 
     Parameters
     ----------

tests/data/namelist_zz_end_to_end.bdy

@@ -9,24 +9,6 @@
 !!
 !!>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 
-!------------------------------------------------------------------------------
-!   vertical coordinate
-!------------------------------------------------------------------------------
-   ln_zco      = .false.   !  z-coordinate - full    steps   (T/F)
-   ln_zps      = .true.    !  z-coordinate - partial steps   (T/F)
-   ln_sco      = .false.   !  s- or hybrid z-s-coordinate    (T/F)
-   rn_hmin     =   -10     !  min depth of the ocean (>0) or
-                           !  min number of ocean level (<0)
-
-!------------------------------------------------------------------------------
-!   s-coordinate or hybrid z-s-coordinate
-!------------------------------------------------------------------------------
-   rn_sbot_min =   10.     !  minimum depth of s-bottom surface (>0) (m)
-   rn_sbot_max = 7000.     !  maximum depth of s-bottom surface
-                           !  (= ocean depth) (>0) (m)
-   ln_s_sigma  = .false.   !  hybrid s-sigma coordinates
-   rn_hc       =  150.0    !  critical depth with s-sigma
-
 !------------------------------------------------------------------------------
 !  grid information
 !------------------------------------------------------------------------------
@@ -81,24 +63,25 @@
     clname(7)      = 'M4'
     ln_trans       = .true.               !  interpolate transport rather than
                                           !  velocities
-	! location of TPXO7.2 data
-	sn_tide_grid_7p2   = './inputs/tpxo7.2/grid_tpxo7.2.nc'
-	sn_tide_h          = './inputs/tpxo7.2/h_tpxo7.2.nc'
-	sn_tide_u          = './inputs/tpxo7.2/u_tpxo7.2.nc'
-	! location of TPXO9v5 data: single constituents per file
-	sn_tide_grid_9p5   = './inputs/TPXO9_atlas_v5_nc/grid_tpxo9_atlas_30_v5.nc'
-	sn_tide_dir        = './inputs/TPXO9_atlas_v5_nc/'
-	! location of FES2014 data
-	sn_tide_fes        = './inputs/FES2014/'
+    ! location of TPXO7.2 data
+    sn_tide_grid_7p2   = './inputs/tpxo7.2/grid_tpxo7.2.nc'
+    sn_tide_h          = './inputs/tpxo7.2/h_tpxo7.2.nc'
+    sn_tide_u          = './inputs/tpxo7.2/u_tpxo7.2.nc'
+    ! location of TPXO9v5 data: single constituents per file
+    sn_tide_grid_9p5   = './inputs/TPXO9_atlas_v5_nc/grid_tpxo9_atlas_30_v5.nc'
+    sn_tide_dir        = './inputs/TPXO9_atlas_v5_nc/'
+    ! location of FES2014 data
+    sn_tide_fes        = './inputs/FES2014/'
 
 !------------------------------------------------------------------------------
 !  Time information for output
 !------------------------------------------------------------------------------
     sn_date_start   = '1979-11-01'    !  dst output date start YYYY-MM-DD
     sn_date_end     = '1979-12-01'    !  dst output date end YYYY-MM-DD
     sn_dst_calendar = 'gregorian'     !  output calendar format
-    sn_date_origin  = '1960-01-01'    !  reference for time counter YYYY-MM-DD    ln_time_interpolation = .true. !  set to false to use parent frequency and calender
-                                   !  for monthly only
+    sn_date_origin  = '1960-01-01'    !  reference for time counter YYYY-MM-DD
+    ln_time_interpolation = .true. !  set to false to use parent
+                                   !  calender for monthly frequency only
 
 !------------------------------------------------------------------------------
 !  Additional parameters
@@ -107,11 +90,9 @@
     rn_r0   = 0.041666666         !  decorrelation distance use in gauss
                                   !  smoothing onto dst points. Need to
                                   !  make this a funct. of dlon
-    sn_history  = 'Benchmarking test case'
-                                  !  history for netcdf file
     ln_nemo3p4  = .true.          !  else presume v3.2 or v3.3
     nn_alpha    = 0               !  Euler rotation angle
     nn_beta     = 0               !  Euler rotation angle
     nn_gamma    = 0               !  Euler rotation angle
-	rn_mask_max_depth = 100.0     !  Maximum depth to be ignored for the mask
-	rn_mask_shelfbreak_dist = 20000.0 !  Distance from the shelf break
+    rn_mask_max_depth = 100.0     !  Maximum depth to be ignored for the mask
+    rn_mask_shelfbreak_dist = 20000.0 !  Distance from the shelf break

tests/test_zz_end_to_end.py

@@ -185,14 +185,14 @@ def test_sco_sco():
         "Shape_temp": (30, 15, 1, 1584),
         "Shape_ssh": (30, 1, 1584),
         "Shape_mask": (60, 50),
-        "Mean_temp": 18.50259017944336,
-        "Mean_sal": 34.17912292480469,
+        "Mean_temp": 18.054542541503906,
+        "Mean_sal": 34.12153625488281,
         "Sum_unmask": 665280,
         "Sum_mask": 47520,
         "Shape_u": (30, 15, 1, 1566),
         "Shape_v": (30, 15, 1, 1566),
-        "Mean_u": 0.8442354202270508,
-        "Mean_v": 0.832240879535675,
+        "Mean_u": 0.7764930725097656,
+        "Mean_v": 0.7688539624214172,
     }
 
     assert summary_grid == test_grid, "May need to update regression values."
@@ -265,14 +265,14 @@ def test_sco_zco():
         "Shape_temp": (30, 25, 1, 1584),
         "Shape_ssh": (30, 1, 1584),
         "Shape_mask": (60, 50),
-        "Mean_temp": 18.56098747253418,
-        "Mean_sal": 34.14830780029297,
+        "Mean_temp": 18.122085571289062,
+        "Mean_sal": 34.09104537963867,
         "Sum_unmask": 447510,
         "Sum_mask": 740490,
         "Shape_u": (30, 25, 1, 1566),
         "Shape_v": (30, 25, 1, 1566),
-        "Mean_u": 0.8378004431724548,
-        "Mean_v": 0.8349438905715942,
+        "Mean_u": 0.7675425410270691,
+        "Mean_v": 0.7679993510246277,
     }
 
     assert summary_grid == test_grid, "May need to update regression values."