diff --git a/src/core_ocean/mode_init/mpas_ocn_init_hurricane.F b/src/core_ocean/mode_init/mpas_ocn_init_hurricane.F index 6b07d815b8..88b6124c1c 100644 --- a/src/core_ocean/mode_init/mpas_ocn_init_hurricane.F +++ b/src/core_ocean/mode_init/mpas_ocn_init_hurricane.F @@ -324,16 +324,8 @@ subroutine ocn_init_setup_hurricane(domain, iErr)!{{{ end if end do - ! shift coordinates to accomodate wetting and drying - do k = 1, nVertLevels - refBottomDepth(k) = refBottomDepth(k) - globalMinBottomDepth - end do - do iCell = 1, nCellsSolve - bottomDepth(iCell) = bottomDepth(iCell) - globalMinBottomDepth - ssh(iCell) = ssh(iCell) + globalMinBottomDepth - ! make sure depth is thick enough via ssh = TOTAL_DEPTH - bottomDepth ssh(iCell) = - bottomDepth(iCell) + & max(ssh(iCell) + bottomDepth(iCell), & diff --git a/testing_and_setup/compass/ocean/hurricane/USDEQU120at30cr10rr2WD/build_mesh/config_base_mesh.xml b/testing_and_setup/compass/ocean/hurricane/USDEQU120at30cr10rr2WD/build_mesh/config_base_mesh.xml new file mode 100755 index 0000000000..de249353da --- /dev/null +++ b/testing_and_setup/compass/ocean/hurricane/USDEQU120at30cr10rr2WD/build_mesh/config_base_mesh.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + jigsaw_to_MPAS.build_mesh + + + 10.0 + + + diff --git a/testing_and_setup/compass/ocean/hurricane/USDEQU120at30cr10rr2WD/build_mesh/config_culled_mesh.xml b/testing_and_setup/compass/ocean/hurricane/USDEQU120at30cr10rr2WD/build_mesh/config_culled_mesh.xml new file mode 100644 index 0000000000..355c59a252 --- /dev/null +++ b/testing_and_setup/compass/ocean/hurricane/USDEQU120at30cr10rr2WD/build_mesh/config_culled_mesh.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + jigsaw_to_MPAS.inject_bathymetry + culled_mesh.nc + + + --ignore_time + -l + maxEdges=0 + allOnCells + culled_mesh.nc + culled_mesh_vtk + + + diff --git a/testing_and_setup/compass/ocean/hurricane/USDEQU120at30cr10rr2WD/build_mesh/config_driver_init.xml b/testing_and_setup/compass/ocean/hurricane/USDEQU120at30cr10rr2WD/build_mesh/config_driver_init.xml new file mode 100644 index 0000000000..5b34eec160 --- /dev/null +++ b/testing_and_setup/compass/ocean/hurricane/USDEQU120at30cr10rr2WD/build_mesh/config_driver_init.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/testing_and_setup/compass/ocean/hurricane/USDEQU120at30cr10rr2WD/build_mesh/define_base_mesh.py b/testing_and_setup/compass/ocean/hurricane/USDEQU120at30cr10rr2WD/build_mesh/define_base_mesh.py new file mode 100755 index 0000000000..ffd75cf45d --- /dev/null +++ b/testing_and_setup/compass/ocean/hurricane/USDEQU120at30cr10rr2WD/build_mesh/define_base_mesh.py @@ -0,0 +1,54 @@ +#!/usr/bin/env python + +import numpy as np +import jigsaw_to_MPAS.coastal_tools as ct + +def cellWidthVsLatLon(): + km = 1000.0 + + params = ct.default_params + + print("****QU 120 background mesh and enhanced Atlantic (30km)****") + params["mesh_type"] = "QU" + params["dx_max_global"] = 120.0 * km + params["region_box"] = ct.Atlantic + params["restrict_box"] = ct.Atlantic_restrict + params["plot_box"] = ct.Western_Atlantic + params["dx_min_coastal"] = 30.0 * km + params["trans_width"] = 5000.0 * km + params["trans_start"] = 500.0 * km + + cell_width, lon, lat = ct.coastal_refined_mesh(params) + + print("****Northeast refinement (10km)***") + params["region_box"] = ct.Delaware_Bay + params["plot_box"] = ct.Western_Atlantic + params["dx_min_coastal"] = 10.0 * km + params["trans_width"] = 600.0 * km + params["trans_start"] = 400.0 * km + + cell_width, lon, lat = ct.coastal_refined_mesh( + params, cell_width, lon, lat) + + print("****Delaware regional refinement (5km)****") + params["region_box"] = ct.Delaware_Region + params["plot_box"] = ct.Delaware + params["dx_min_coastal"] = 5.0 * km + params["trans_width"] = 175.0 * km + params["trans_start"] = 75.0 * km + + cell_width, lon, lat = ct.coastal_refined_mesh( + params, cell_width, lon, lat) + + print("****Delaware Bay high-resolution (2km)****") + params["region_box"] = ct.Delaware_Bay + params["plot_box"] = ct.Delaware + params["restrict_box"] = ct.Delaware_restrict + params["dx_min_coastal"] = 2.0 * km + params["trans_width"] = 100.0 * km + params["trans_start"] = 17.0 * km + + cell_width, lon, lat = ct.coastal_refined_mesh( + params, cell_width, lon, lat) + + return cell_width / 1000, lon, lat diff --git a/testing_and_setup/compass/ocean/hurricane/USDEQU120at30cr10rr2WD/sandy/config_driver.xml b/testing_and_setup/compass/ocean/hurricane/USDEQU120at30cr10rr2WD/sandy/config_driver.xml new file mode 100644 index 0000000000..2bbc9940c7 --- /dev/null +++ b/testing_and_setup/compass/ocean/hurricane/USDEQU120at30cr10rr2WD/sandy/config_driver.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/testing_and_setup/compass/ocean/hurricane/USDEQU120at30cr10rr2WD/sandy/config_forward_RK4.xml b/testing_and_setup/compass/ocean/hurricane/USDEQU120at30cr10rr2WD/sandy/config_forward_RK4.xml new file mode 100644 index 0000000000..ca1772b126 --- /dev/null +++ b/testing_and_setup/compass/ocean/hurricane/USDEQU120at30cr10rr2WD/sandy/config_forward_RK4.xml @@ -0,0 +1,39 @@ + + + + + + + + + +