Skip to content

Commit

Permalink
Merge pull request #292 from ThomasNeumann2/dev/iow
Browse files Browse the repository at this point in the history 
Additional option "on_grid" for make_topog
  • Loading branch information
@rem1776
rem1776 authored May 29, 2024
2 parents 9059e37 + 6b4d2fb commit d946bda
Show file tree
Hide file tree
Showing 4 changed files with 38 additions and 12 deletions.
2 changes: 2 additions & 0 deletions tools/make_topog/CHANGELOG
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,6 @@

2017-03-18 Seth Underwood <[email protected]>
* Changed Makefile to match new build system
2024-02-10 TN
* added option --on_grid => skip the call auf regridding function

18 changes: 14 additions & 4 deletions tools/make_topog/make_topog.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ char *usage[] = {
" [--fill_shallow] [--deepen_shallow] [--smooth_topo_allow_deepening] ",
" [--dome_slope #] [--dome_bottom #], [--dome_embayment_west #] ",
" [--dome_embayment_east # [--dome_embayment_south #] ",
" [--dome_embayment_depth #] [--vgrid_file vgrid_file] ",
" [--dome_embayment_depth #] [--vgrid_file vgrid_file] [--on_grid] ",
" [--flat_bottom] [--full_cell] [--fill_isolated_cells #] ",
" [--dont_change_landmask] [--kmt_min #] [--dont_adjust_topo ] ",
" [--fraction_full_cell #] [--dont_open_very_this_cell ] [--min_thickness #] ",
Expand All @@ -69,7 +69,7 @@ char *usage[] = {
" --fill_first_row --filter_topog ",
" --round_shallow] --fill_shallow --deepen_shallow] ",
" --smooth_topo_allow_deepening --vgrid_file ",
" --full_cell --dont_fill_isolated_cells ",
" --full_cell --dont_fill_isolated_cells --on_grid ",
" --dont_change_landmask --kmt_min --dont_adjust_topo ",
" --fraction_full_cell --dont_open_very_this_cell ",
" --min_thickness are optional arguments. ",
Expand Down Expand Up @@ -240,7 +240,11 @@ char *usage[] = {
" ",
" --rotate_poly Set to calculate polar polygon areas by caculating the ",
" area of a copy of the polygon, with the copy being ",
" rotated far away from the pole. ",
" rotated far away from the pole. ",
" ",
" --on_grid Assume that the topography is already on the model ",
" grid. This prevents interpolation which especially ",
" on fine grain resolution smears out the topography. ",
" ",
" --help Print out this message and then exit. ",
" ",
Expand Down Expand Up @@ -316,6 +320,7 @@ int main(int argc, char* argv[])
double min_thickness = 0.1;
int my_topog_type;
int use_great_circle_algorithm=0;
int on_grid=0;
int cyclic_x, cyclic_y, tripolar_grid;
int errflg = (argc == 1);
int option_index, i, c;
Expand Down Expand Up @@ -375,6 +380,7 @@ int main(int argc, char* argv[])
{"rotate_poly", no_argument, NULL, 'z'},
{"help", no_argument, NULL, 'h'},
{"verbose", no_argument, NULL, 'V'},
{"on_grid", no_argument, NULL, 'W'},
{0, 0, 0, 0},
};

Expand Down Expand Up @@ -527,6 +533,9 @@ int main(int argc, char* argv[])
case 'V':
verbose = 1;
break;
case 'W':
on_grid=1;
break;
case '?':
errflg++;
break;
Expand Down Expand Up @@ -618,6 +627,7 @@ int main(int argc, char* argv[])
if(dont_change_landmask) printf("NOTE from make_topog ==> not change land/sea mask when filling isolated cells\n");
if(open_very_this_cell) printf("NOTE from make_topog ==> open this cell\n");
if(adjust_topo) printf("NOTE from make_topog ==> adjust topography\n");
if(on_grid) printf("NOTE from make_topog ==> topography is on model grid\n");
printf("\n\n ************************************************************\n\n");
}
}
Expand Down Expand Up @@ -814,7 +824,7 @@ int main(int argc, char* argv[])
smooth_topo_allow_deepening, round_shallow, fill_shallow,
deepen_shallow, full_cell, flat_bottom, adjust_topo,
fill_isolated_cells, dont_change_landmask, kmt_min, min_thickness, open_very_this_cell,
fraction_full_cell, depth, num_levels, domain, verbose, use_great_circle_algorithm );
fraction_full_cell, depth, num_levels, domain, verbose, use_great_circle_algorithm, on_grid );
break;
case BOX_CHANNEL:
create_box_channel_topog(nx[n], ny[n], bottom_depth,
Expand Down
27 changes: 20 additions & 7 deletions tools/make_topog/topog.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,8 @@ void create_realistic_topog(int nx_dst, int ny_dst, const double *x_dst, const d
int deepen_shallow, int full_cell, int flat_bottom, int adjust_topo,
int fill_isolated_cells, int dont_change_landmask, int kmt_min, double min_thickness,
int open_very_this_cell, double fraction_full_cell, double *depth,
int *num_levels, domain2D domain, int debug, int use_great_circle_algorithm )
int *num_levels, domain2D domain, int debug, int use_great_circle_algorithm,
int on_grid )
{
char xname[128], yname[128];
int nx_src, ny_src, nxp_src, nyp_src, i, j, count, n;
Expand Down Expand Up @@ -497,13 +498,24 @@ void create_realistic_topog(int nx_dst, int ny_dst, const double *x_dst, const d
mask_src[i] = 1.0;
}
}
if(on_grid) {
printf("We do no topography interpolation!\n");
for(i=0; i<nx_src*ny_now; i++) {
if(depth_src[i] == missing)
depth[i] = 0.0;
else
depth[i] = depth_src[i];
}
}
else {

if(use_great_circle_algorithm)
conserve_interp_great_circle(nx_src, ny_now, nx_dst, ny_dst, x_src, y_src,
x_out, y_out, mask_src, depth_src, depth );
else
conserve_interp(nx_src, ny_now, nx_dst, ny_dst, x_src, y_src,
x_out, y_out, mask_src, depth_src, depth );
if(use_great_circle_algorithm)
conserve_interp_great_circle(nx_src, ny_now, nx_dst, ny_dst, x_src, y_src,
x_out, y_out, mask_src, depth_src, depth );
else
conserve_interp(nx_src, ny_now, nx_dst, ny_dst, x_src, y_src,
x_out, y_out, mask_src, depth_src, depth );
}

if (filter_topog) filter_topo(nx_dst, ny_dst, num_filter_pass, smooth_topo_allow_deepening, depth, domain);
if(debug) show_deepest(nk, zw, depth, domain);
Expand All @@ -515,6 +527,7 @@ void create_realistic_topog(int nx_dst, int ny_dst, const double *x_dst, const d
depth[i] = 0.0;
}
}

if(vgrid_file) process_topo(nk, depth, num_levels, zw, tripolar_grid, cyclic_x, cyclic_y,
full_cell, flat_bottom, adjust_topo, fill_isolated_cells, min_thickness,
open_very_this_cell, fraction_full_cell, round_shallow, deepen_shallow, fill_shallow,
Expand Down
3 changes: 2 additions & 1 deletion tools/make_topog/topog.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@ void create_realistic_topog(int nx_dst, int ny_dst, const double *x_dst, const d
int deepen_shallow, int full_cell, int flat_bottom, int adjust_topo,
int fill_isolated_cells, int dont_change_landmask, int kmt_min, double min_thickness,
int open_very_this_cell, double fraction_full_cell, double *depth,
int *num_levels, domain2D domain, int debug, int great_circle_algorithm );
int *num_levels, domain2D domain, int debug, int great_circle_algorithm,
int on_grid );

void create_box_channel_topog(int nx, int ny, double basin_depth,
double jwest_south, double jwest_north, double jeast_south,
Expand Down

0 comments on commit d946bda

Please sign in to comment.