Skip to content
Snippets Groups Projects
Commit 46a117c3 authored by Moritz Hanke's avatar Moritz Hanke
Browse files

fixes issue in access_core example

parent cf05130b
No related branches found
No related tags found
No related merge requests found
......@@ -199,18 +199,26 @@ CONTAINS
nbr_duplicated_points_ = 0
! read in grid data from SCRIP formated files
read_basic_grid = &
yac_read_scrip_generic_basic_grid_parallel_c( &
TRIM(grid_filename) // c_null_char, &
TRIM(mask_filename) // c_null_char, &
MPI_COMM_WORLD, TRIM(grid_name) // c_null_char, &
INT(0, c_int), TRIM(grid_name) // c_null_char, &
INT(MERGE(1,0, use_ll), c_int), coordinates_idx, &
MERGE( &
duplicated_point_idx_, c_null_ptr, PRESENT(duplicated_point_idx)), &
MERGE( &
orig_point_global_id_, c_null_ptr, PRESENT(orig_point_global_id)), &
nbr_duplicated_points_, point_location)
if (PRESENT(duplicated_point_idx) .AND. PRESENT(orig_point_global_id)) THEN
read_basic_grid = &
yac_read_scrip_generic_basic_grid_parallel_c( &
TRIM(grid_filename) // c_null_char, &
TRIM(mask_filename) // c_null_char, &
MPI_COMM_WORLD, TRIM(grid_name) // c_null_char, &
INT(0, c_int), TRIM(grid_name) // c_null_char, &
INT(MERGE(1,0, use_ll), c_int), coordinates_idx, &
duplicated_point_idx_, orig_point_global_id_, &
nbr_duplicated_points_, point_location)
ELSE
read_basic_grid = &
yac_read_scrip_generic_basic_grid_parallel_c( &
TRIM(grid_filename) // c_null_char, &
TRIM(mask_filename) // c_null_char, &
MPI_COMM_WORLD, TRIM(grid_name) // c_null_char, &
INT(0, c_int), TRIM(grid_name) // c_null_char, &
INT(MERGE(1,0, use_ll), c_int), coordinates_idx, &
c_null_ptr, c_null_ptr, nbr_duplicated_points_, point_location)
END IF
IF (PRESENT(duplicated_point_idx)) &
duplicated_point_idx = duplicated_point_idx_
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment