From 6022b1cb748813eab847de7cb67aeae075a9f8e6 Mon Sep 17 00:00:00 2001
From: jpolton <jelt@noc.ac.uk>
Date: Tue, 21 May 2019 17:59:06 +0100
Subject: [PATCH] updates to fix mismatch with parent and child vertical coords

---
 .../INITIAL_CONDITION/initcd_vosaline.namelist     | 14 +++++++-------
 .../INITIAL_CONDITION/initcd_votemper.namelist     | 14 +++++++-------
 .../namelist_reshape_bilin_initcd_vosaline         |  2 +-
 .../namelist_reshape_bilin_initcd_votemper         |  2 +-
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/NAMELISTS_AND_FORTRAN_FILES/INITIAL_CONDITION/initcd_vosaline.namelist b/NAMELISTS_AND_FORTRAN_FILES/INITIAL_CONDITION/initcd_vosaline.namelist
index 23f7f21..153dbd1 100755
--- a/NAMELISTS_AND_FORTRAN_FILES/INITIAL_CONDITION/initcd_vosaline.namelist
+++ b/NAMELISTS_AND_FORTRAN_FILES/INITIAL_CONDITION/initcd_vosaline.namelist
@@ -99,16 +99,16 @@
 &ninput
 ivect     = 0
 lregin    = T
-cf_in     = './initcd_vosaline.nc'
+cf_in     = './initcd_origz_vosaline.nc'
 cv_in     = 'vosaline'
 cv_t_in   = 'time_counter'
 jt1       = 0
 jt2       = 0
 jplev     = 0
-cf_x_in   = './initcd_vosaline.nc'
+cf_x_in   = './initcd_origz_vosaline.nc'
 cv_lon_in = 'x'
 cv_lat_in = 'y'
-cf_lsm_in = 'sosie_initcd_mask.nc'
+cf_lsm_in = 'initcd_origz_mask.nc'
 cv_lsm_in = 'mask'
 ldrown    = T
 ewper     = -1
@@ -154,10 +154,10 @@ ismooth   = 0
 !! ssig_out     : structure with ROMS s-coordinates parameters on output grid (see above)
 !!
 &n3d
-cf_z_in  = 'initcd_vosaline.nc'
+cf_z_in  = 'initcd_origz_vosaline.nc'
 cv_z_in  = 'gdept'
-cf_z_out = 'initcd_vosaline.nc'
-cv_z_out = 'gdept'
+cf_z_out = 'domain_cfg.nc'
+cv_z_out = 'nav_lev'
 cv_z_out_name = 'gdept'
 ctype_z_in = 'z'
 ctype_z_out = 'z'
@@ -216,7 +216,7 @@ ctype_z_out = 'z'
 !!
 &nhtarget
 lregout    = F
-cf_x_out   = 'initcd_vosaline.nc'
+cf_x_out   = 'initcd_origz_vosaline.nc'
 cv_lon_out = 'x'
 cv_lat_out = 'y'
 cf_lsm_out = ''
diff --git a/NAMELISTS_AND_FORTRAN_FILES/INITIAL_CONDITION/initcd_votemper.namelist b/NAMELISTS_AND_FORTRAN_FILES/INITIAL_CONDITION/initcd_votemper.namelist
index 5026472..e37fb61 100755
--- a/NAMELISTS_AND_FORTRAN_FILES/INITIAL_CONDITION/initcd_votemper.namelist
+++ b/NAMELISTS_AND_FORTRAN_FILES/INITIAL_CONDITION/initcd_votemper.namelist
@@ -99,16 +99,16 @@
 &ninput
 ivect     = 0
 lregin    = T
-cf_in     = './initcd_votemper.nc'
+cf_in     = './initcd_origz_votemper.nc'
 cv_in     = 'votemper'
 cv_t_in   = 'time_counter'
 jt1       = 0
 jt2       = 0
 jplev     = 0
-cf_x_in   = './initcd_votemper.nc'
+cf_x_in   = './initcd_origz_votemper.nc'
 cv_lon_in = 'x'
 cv_lat_in = 'y'
-cf_lsm_in = 'sosie_initcd_mask.nc'
+cf_lsm_in = 'initcd_origz_mask.nc'
 cv_lsm_in = 'mask'
 ldrown    = T
 ewper     = -1
@@ -154,10 +154,10 @@ ismooth   = 0
 !! ssig_out     : structure with ROMS s-coordinates parameters on output grid (see above)
 !!
 &n3d
-cf_z_in  = 'initcd_votemper.nc'
+cf_z_in  = 'initcd_origz_votemper.nc'
 cv_z_in  = 'gdept'
-cf_z_out = 'initcd_votemper.nc'
-cv_z_out = 'gdept'
+cf_z_out = 'domain_cfg.nc'
+cv_z_out = 'nav_lev'
 cv_z_out_name = 'gdept'
 ctype_z_in = 'z'
 ctype_z_out = 'z'
@@ -216,7 +216,7 @@ ctype_z_out = 'z'
 !!
 &nhtarget
 lregout    = F
-cf_x_out   = 'initcd_votemper.nc'
+cf_x_out   = 'initcd_origz_votemper.nc'
 cv_lon_out = 'x'
 cv_lat_out = 'y'
 cf_lsm_out = ''
diff --git a/NAMELISTS_AND_FORTRAN_FILES/INITIAL_CONDITION/namelist_reshape_bilin_initcd_vosaline b/NAMELISTS_AND_FORTRAN_FILES/INITIAL_CONDITION/namelist_reshape_bilin_initcd_vosaline
index 0e467f8..b1202fc 100755
--- a/NAMELISTS_AND_FORTRAN_FILES/INITIAL_CONDITION/namelist_reshape_bilin_initcd_vosaline
+++ b/NAMELISTS_AND_FORTRAN_FILES/INITIAL_CONDITION/namelist_reshape_bilin_initcd_vosaline
@@ -72,7 +72,7 @@
 /
 
 &interp_outputs
-    output_file = "initcd_vosaline.nc"
+    output_file = "initcd_origz_vosaline.nc"
     output_mode = "create"
     output_dims = 'x', 'y', 'z', 'time_counter'
     output_scaling = "vosaline|1.0"
diff --git a/NAMELISTS_AND_FORTRAN_FILES/INITIAL_CONDITION/namelist_reshape_bilin_initcd_votemper b/NAMELISTS_AND_FORTRAN_FILES/INITIAL_CONDITION/namelist_reshape_bilin_initcd_votemper
index 73f4dc0..15589e9 100755
--- a/NAMELISTS_AND_FORTRAN_FILES/INITIAL_CONDITION/namelist_reshape_bilin_initcd_votemper
+++ b/NAMELISTS_AND_FORTRAN_FILES/INITIAL_CONDITION/namelist_reshape_bilin_initcd_votemper
@@ -72,7 +72,7 @@
 /
 
 &interp_outputs
-    output_file = "initcd_votemper.nc"
+    output_file = "initcd_origz_votemper.nc"
     output_mode = "create"
     output_dims = 'x', 'y', 'z', 'time_counter'
     output_scaling = "votemper|1.0"
-- 
GitLab