Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
mpim-sw
cdo
Commits
9ac46931
Commit
9ac46931
authored
Nov 07, 2017
by
Uwe Schulzweida
Browse files
find_ij_weights: changed type of return value to bool.
parent
273cfaf8
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/remap.h
View file @
9ac46931
...
...
@@ -231,7 +231,7 @@ int grid_search(remapgrid_t *src_grid, size_t *restrict src_add, double *restric
const
double
*
restrict
src_center_lat
,
const
double
*
restrict
src_center_lon
,
const
restr_t
*
restrict
src_grid_bound_box
,
const
size_t
*
restrict
src_bin_add
);
int
find_ij_weights
(
double
plon
,
double
plat
,
double
*
restrict
src_lats
,
double
*
restrict
src_lons
,
double
*
ig
,
double
*
jg
);
bool
find_ij_weights
(
double
plon
,
double
plat
,
double
*
restrict
src_lats
,
double
*
restrict
src_lons
,
double
*
ig
,
double
*
jg
);
int
rect_grid_search
(
size_t
*
ii
,
size_t
*
jj
,
double
x
,
double
y
,
size_t
nxm
,
size_t
nym
,
const
double
*
restrict
xm
,
const
double
*
restrict
ym
);
void
remapgrid_get_lonlat
(
remapgrid_t
*
grid
,
size_t
cell_add
,
double
*
plon
,
double
*
plat
);
...
...
src/remap_bilinear_scrip.cc
View file @
9ac46931
...
...
@@ -12,9 +12,9 @@
/* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! */
int
find_ij_weights
(
double
plon
,
double
plat
,
double
*
restrict
src_lats
,
double
*
restrict
src_lons
,
double
*
ig
,
double
*
jg
)
bool
find_ij_weights
(
double
plon
,
double
plat
,
double
*
restrict
src_lats
,
double
*
restrict
src_lons
,
double
*
ig
,
double
*
jg
)
{
int
lfound
=
0
;
bool
lfound
=
false
;
long
iter
;
/* iteration counters */
double
deli
,
delj
;
/* corrections to iw,jw */
double
dthp
,
dphp
;
/* difference between point and sw corner */
...
...
@@ -77,7 +77,7 @@ int find_ij_weights(double plon, double plat, double *restrict src_lats, double
*
ig
=
iguess
;
*
jg
=
jguess
;
if
(
iter
<
remap_max_iter
)
lfound
=
1
;
if
(
iter
<
remap_max_iter
)
lfound
=
true
;
return
lfound
;
}
...
...
@@ -123,16 +123,16 @@ void bilinear_warning(double plon, double plat, double iw, double jw, size_t* sr
if
(
cdoVerbose
)
{
cdoPrint
(
"Point coords: %g %g"
,
plat
,
plon
);
cdoPrint
(
"Src grid lats: %g %g %g %g"
,
src_lats
[
0
],
src_lats
[
1
],
src_lats
[
2
],
src_lats
[
3
]);
cdoPrint
(
"Src grid lons: %g %g %g %g"
,
src_lons
[
0
],
src_lons
[
1
],
src_lons
[
2
],
src_lons
[
3
]);
cdoPrint
(
"Point coords: %g %g"
,
plat
*
RAD2DEG
,
plon
*
RAD2DEG
);
cdoPrint
(
"Src grid lats: %g %g %g %g"
,
src_lats
[
0
]
*
RAD2DEG
,
src_lats
[
1
]
*
RAD2DEG
,
src_lats
[
2
]
*
RAD2DEG
,
src_lats
[
3
]
*
RAD2DEG
);
cdoPrint
(
"Src grid lons: %g %g %g %g"
,
src_lons
[
0
]
*
RAD2DEG
,
src_lons
[
1
]
*
RAD2DEG
,
src_lons
[
2
]
*
RAD2DEG
,
src_lons
[
3
]
*
RAD2DEG
);
cdoPrint
(
"Src grid addresses: %zu %zu %zu %zu"
,
src_add
[
0
],
src_add
[
1
],
src_add
[
2
],
src_add
[
3
]);
cdoPrint
(
"Src grid lats: %g %g %g %g"
,
src_grid
->
cell_center_lat
[
src_add
[
0
]],
src_grid
->
cell_center_lat
[
src_add
[
1
]],
src_grid
->
cell_center_lat
[
src_add
[
2
]],
src_grid
->
cell_center_lat
[
src_add
[
3
]]);
src_grid
->
cell_center_lat
[
src_add
[
0
]]
*
RAD2DEG
,
src_grid
->
cell_center_lat
[
src_add
[
1
]]
*
RAD2DEG
,
src_grid
->
cell_center_lat
[
src_add
[
2
]]
*
RAD2DEG
,
src_grid
->
cell_center_lat
[
src_add
[
3
]]
*
RAD2DEG
);
cdoPrint
(
"Src grid lons: %g %g %g %g"
,
src_grid
->
cell_center_lon
[
src_add
[
0
]],
src_grid
->
cell_center_lon
[
src_add
[
1
]],
src_grid
->
cell_center_lon
[
src_add
[
2
]],
src_grid
->
cell_center_lon
[
src_add
[
3
]]);
src_grid
->
cell_center_lon
[
src_add
[
0
]]
*
RAD2DEG
,
src_grid
->
cell_center_lon
[
src_add
[
1
]]
*
RAD2DEG
,
src_grid
->
cell_center_lon
[
src_add
[
2
]]
*
RAD2DEG
,
src_grid
->
cell_center_lon
[
src_add
[
3
]]
*
RAD2DEG
);
cdoPrint
(
"Current iw,jw : %g %g"
,
iw
,
jw
);
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment