From ea373e5f56a33f0b002de65b94a96996a812cd3a Mon Sep 17 00:00:00 2001 From: Micael Oliveira Date: Thu, 8 Sep 2022 12:12:22 +1000 Subject: [PATCH 1/3] Update topogtools to latest version. --- topogtools | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/topogtools b/topogtools index cca23d9..d2f40eb 160000 --- a/topogtools +++ b/topogtools @@ -1 +1 @@ -Subproject commit cca23d9d187b0b15914f57a329dbcfedb671f0c8 +Subproject commit d2f40eba969d74586d8ec0069252413cde0830ef From 25000fe60bbfb9c3137aefcaaac585fa4d083e7b Mon Sep 17 00:00:00 2001 From: Micael Oliveira Date: Wed, 7 Sep 2022 16:05:43 +1000 Subject: [PATCH 2/3] Reorganize make_topog.sh script and include several new steps to fix the land mask in the antarctic region. --- make_topog.sh | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/make_topog.sh b/make_topog.sh index a922def..fe28555 100755 --- a/make_topog.sh +++ b/make_topog.sh @@ -26,7 +26,7 @@ cd topogtools ./build.sh cd - -./topogtools/editTopo.py --overwrite --nogui --apply ocean_mask_edits.txt --output ocean_mask.nc ocean_mask_original.nc mask # see https://github.com/COSIMA/access-om2/issues/210 +# Creation of topography file ./topogtools/float_vgrid # this overwrites ocean_vgrid.nc # ./topogtools/gen_topo # generates topog_new.nc; takes about 2 hours at 0.25 deg, so must be run via qsub of this script ./topogtools/editTopo.py --overwrite --nogui --apply topog_edits.txt --output topog_new_edited.nc topog_new.nc @@ -34,6 +34,14 @@ cd - cp topog_new_edited_deseas.nc topog_new_edited_deseas_partialcell.nc ./topogtools/do_partial_cells topog_new_edited_deseas_partialcell.nc 1.0 0.2 # this overwrites its input, so we make copy in prev line ./topogtools/min_max_depth topog_new_edited_deseas_partialcell.nc topog_new_edited_deseas_partialcell_mindepth.nc 4 # can produce non-advective cells + +# Creation of land mask file +./topogtools/topog2mask.py topog_new.nc dummy.nc ocean_mask_gebco.nc 0.5 # Creates new mask for the GEBCO 2014 topography +./topogtools/combine_masks.py ocean_mask_original.nc ocean_mask_gebco.nc ocean_hgrid.nc ocean_mask_fixed.nc -60 # Combine new mask with original one, taking the new one for the antarctic region +./topogtools/editTopo.py --overwrite --nogui --apply ocean_mask_edits.txt --output ocean_mask_fixed_edited.nc ocean_mask_fixed.nc mask # see https://github.com/COSIMA/access-om2/issues/210 +./topogtools/fix_nonadvective_mask.py ocean_mask_fixed_edited.nc ocean_mask.nc # automatically fix non-advective cells + +# Application of the land mask and fixing of nonadvective cells ./topogtools/apply_mask.py topog_new_edited_deseas_partialcell_mindepth.nc ocean_mask.nc topog_new_edited_deseas_partialcell_mindepth_masked.nc # applies ocean_mask.nc ./topogtools/fix_nonadvective_mosaic topog_new_edited_deseas_partialcell_mindepth_masked.nc topog_new_edited_deseas_partialcell_mindepth_masked_fixnonadvective.nc # automatically fix non-advective cells ./topogtools/check_nonadvective_mosaic topog_new_edited_deseas_partialcell_mindepth_masked_fixnonadvective.nc From 9be6ea47763b3e0ba0d6dd82361bb6b3efa2758f Mon Sep 17 00:00:00 2001 From: Micael Oliveira Date: Thu, 8 Sep 2022 14:33:13 +1000 Subject: [PATCH 3/3] Mask one point to avoid a non-advective egde. --- ocean_mask_edits.txt | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/ocean_mask_edits.txt b/ocean_mask_edits.txt index d109528..b5b3844 100644 --- a/ocean_mask_edits.txt +++ b/ocean_mask_edits.txt @@ -15,3 +15,12 @@ editTopo.py edits file version 1 246 741 0.0 1.0 # Open choked channel west of Sakhalin (Strait of Tartary) 818 1079 1.0 0.0 # Canadian Arctic: remove non-advective cell 893 737 0.0 1.0 # Open choked channel west of Newfoundland (Strait of Belle Isle) +# +# created: Thu Sep 8 14:25:30 2022 +# by: mo1833 +# via: ./topogtools/editTopo.py ocean_mask_fixed.nc mask +# +# Remove 1 non-advective edge by removing an island on the Antarctic coast. +# +# i j old new + 850 135 0.0 1.0