Skip to content

c_update_domains use of c_fms_utils methods #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mlee03 merged 8 commits into from
Apr 11, 2025
Merged

c_update_domains use of c_fms_utils methods #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
bef4520
Changes to use single pointer for maskmap in define_domains
fmalatino Mar 27, 2025
7a620c6
Removing comments
fmalatino Mar 27, 2025
95f878a
Updated c_update_domains to use c_fms_utils
fmalatino Mar 30, 2025
96820d6
Merge branch 'main' into use_utils
fmalatino Mar 30, 2025
f817295
Fixing macro name for c_update_domains 4d int
fmalatino Mar 30, 2025
c44fd95
Removed stdio header inclusion from test_update_domains
fmalatino Mar 30, 2025
8221e9b
Added back in check for tile_count in update_domains
fmalatino Mar 31, 2025
3640a01
Adding access to other dimensions and datatypes for update_domains in…
fmalatino Mar 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ DOCS = docs
endif

# Make targets will be run in each subdirectory. Order is significant.
SUBDIRS = c_fms \
c_fms_utils \
SUBDIRS = c_fms_utils \
c_fms \
c_constants \
c_data_override \
c_diag_manager \
Expand Down
2 changes: 2 additions & 0 deletions c_fms/c_fms.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@ module c_fms_mod
use FMS, only : NORTH, NORTH_EAST, EAST, SOUTH_EAST, CORNER, CENTER
use FMS, only : SOUTH, SOUTH_WEST, WEST, NORTH_WEST
use FMS, only : CYCLIC_GLOBAL_DOMAIN

use c_fms_utils_mod, only : cFMS_pointer_to_array, cFMS_array_to_pointer

use iso_c_binding

Expand Down
44 changes: 44 additions & 0 deletions c_fms/c_fms.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,52 @@ extern void cFMS_set_data_domain(int *domain_id, int *xbegin, int *xend, int *yb
extern void cFMS_set_global_domain(int *domain_id, int *xbegin, int *xend, int *ybegin, int *yend,
int *xsize, int *ysize, int *tile_count);

extern void cFMS_update_domains_double_2d(int *field_shape, double *field, int *domain_id, int *flags, int *complete,
Copy link
Copy Markdown
Owner

@mlee03 mlee03 Apr 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cdouble and cfloat. I'm going to have a PR that will touch this, so I can make the changes then.

int *position, int *whalo, int *ehalo, int *shalo, int *nhalo,
char *name, int *tile_count);

extern void cFMS_update_domains_double_3d(int *field_shape, double *field, int *domain_id, int *flags, int *complete,
int *position, int *whalo, int *ehalo, int *shalo, int *nhalo,
char *name, int *tile_count);

extern void cFMS_update_domains_double_4d(int *field_shape, double *field, int *domain_id, int *flags, int *complete,
int *position, int *whalo, int *ehalo, int *shalo, int *nhalo,
char *name, int *tile_count);

extern void cFMS_update_domains_double_5d(int *field_shape, double *field, int *domain_id, int *flags, int *complete,
int *position, int *whalo, int *ehalo, int *shalo, int *nhalo,
char *name, int *tile_count);

extern void cFMS_update_domains_float_2d(int *field_shape, float *field, int *domain_id, int *flags, int *complete,
int *position, int *whalo, int *ehalo, int *shalo, int *nhalo,
char *name, int *tile_count);

extern void cFMS_update_domains_float_3d(int *field_shape, float *field, int *domain_id, int *flags, int *complete,
int *position, int *whalo, int *ehalo, int *shalo, int *nhalo,
char *name, int *tile_count);

extern void cFMS_update_domains_float_4d(int *field_shape, float *field, int *domain_id, int *flags, int *complete,
int *position, int *whalo, int *ehalo, int *shalo, int *nhalo,
char *name, int *tile_count);

extern void cFMS_update_domains_float_5d(int *field_shape, float *field, int *domain_id, int *flags, int *complete,
int *position, int *whalo, int *ehalo, int *shalo, int *nhalo,
char *name, int *tile_count);

extern void cFMS_update_domains_int_2d(int *field_shape, int *field, int *domain_id, int *flags, int *complete,
int *position, int *whalo, int *ehalo, int *shalo, int *nhalo,
char *name, int *tile_count);

extern void cFMS_update_domains_int_3d(int *field_shape, int *field, int *domain_id, int *flags, int *complete,
int *position, int *whalo, int *ehalo, int *shalo, int *nhalo,
char *name, int *tile_count);

extern void cFMS_update_domains_int_4d(int *field_shape, int *field, int *domain_id, int *flags, int *complete,
int *position, int *whalo, int *ehalo, int *shalo, int *nhalo,
char *name, int *tile_count);

extern void cFMS_update_domains_int_5d(int *field_shape, int *field, int *domain_id, int *flags, int *complete,
int *position, int *whalo, int *ehalo, int *shalo, int *nhalo,
char *name, int *tile_count);

#endif
4 changes: 2 additions & 2 deletions c_fms/include/c_update_domains.fh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@
#undef CFMS_UPDATE_DOMAINS_SHAPE_CF_
#undef CFMS_UPDATE_DOMAINS_SHAPE_F_
#undef CFMS_UPDATE_DOMAINS_RESHAPE_ORDER_
#define CFMS_UPDATE_DOMAINS_SUB_NAME_ cFMS_update_domains_cfloat_4d
#define CFMS_UPDATE_DOMAINS_BINDC_ "cFMS_update_domains_cfloat_4d"
#define CFMS_UPDATE_DOMAINS_SUB_NAME_ cFMS_update_domains_int_4d
#define CFMS_UPDATE_DOMAINS_BINDC_ "cFMS_update_domains_int_4d"
#define CFMS_UPDATE_DOMAINS_FIELD_TYPE_ integer
#define CFMS_UPDATE_DOMAINS_FIELD_NDIM_ 4
#define CFMS_UPDATE_DOMAINS_FIELD_POINTER_ :,:,:,:
Expand Down
18 changes: 8 additions & 10 deletions c_fms/include/c_update_domains.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ subroutine CFMS_UPDATE_DOMAINS_SUB_NAME_(field_shape, field, domain_id, flags, c

implicit none
integer, intent(in) :: field_shape(CFMS_UPDATE_DOMAINS_FIELD_NDIM_)
type(c_ptr), intent(inout) :: field
type(c_ptr), intent(in), value :: field
integer, intent(in), optional :: domain_id
integer, intent(in), optional :: flags
logical, intent(in), optional :: complete
Expand All @@ -12,25 +12,23 @@ subroutine CFMS_UPDATE_DOMAINS_SUB_NAME_(field_shape, field, domain_id, flags, c
character(c_char), intent(in), optional :: name_c(NAME_LENGTH)
integer, intent(inout), optional :: tile_count

CFMS_UPDATE_DOMAINS_FIELD_TYPE_, pointer :: field_cf(CFMS_UPDATE_DOMAINS_FIELD_POINTER_)
CFMS_UPDATE_DOMAINS_FIELD_TYPE_ :: field_f(CFMS_UPDATE_DOMAINS_SHAPE_F_)
CFMS_UPDATE_DOMAINS_FIELD_TYPE_, allocatable :: field_f(CFMS_UPDATE_DOMAINS_FIELD_POINTER_)
character(len=NAME_LENGTH) :: name_f

if(present(name_c)) name_f = fms_string_utils_c2f_string(name_c)
if(present(tile_count)) tile_count = tile_count + 1

call c_f_pointer(field, field_cf, (/CFMS_UPDATE_DOMAINS_SHAPE_CF_/))

if(CFMS_UPDATE_DOMAINS_FIELD_NDIM_>1) &
field_f = reshape(field_cf, shape=(/CFMS_UPDATE_DOMAINS_SHAPE_F_/), order=CFMS_UPDATE_DOMAINS_RESHAPE_ORDER_)
allocate(field_f(CFMS_UPDATE_DOMAINS_SHAPE_F_))
call cFMS_pointer_to_array(field, field_shape, field_f)

call cFMS_set_current_domain(domain_id)
call fms_mpp_domains_update_domains(field=field_f, domain=current_domain, flags=flags, complete=complete, &
position=position, whalo=whalo, ehalo=ehalo, shalo=shalo, nhalo=nhalo, name=name_f, tile_count=tile_count)

if(CFMS_UPDATE_DOMAINS_FIELD_NDIM_>1) &
field_cf = reshape(field_f, shape=(/CFMS_UPDATE_DOMAINS_SHAPE_CF_/), order=CFMS_UPDATE_DOMAINS_RESHAPE_ORDER_)
call cFMS_array_to_pointer(field_f, field_shape, field)

deallocate(field_f)

if(present(tile_count)) tile_count = tile_count - 1

end subroutine CFMS_UPDATE_DOMAINS_SUB_NAME_
21 changes: 10 additions & 11 deletions test_cfms/c_fms/test_update_domains.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ void test_float2d(int *domain_id)
// (89)(99)(29)(39)(49)(59)(69)(79) (49)(59)(69)(79)(89)(99)(29)(39)
// (88)(98)(28)(38)(48)(58)(68)(78) (48)(58)(68)(78)(88)(98)(28)(38)

float answers_t[4][8][8] = {
double answers_t[4][8][8] = {
{ {88, 98, 28, 38, 48, 58, 68, 78},
{89, 99, 29, 39, 49, 59, 69, 79},
{82, 92, 22, 32, 42, 52, 62, 72},
Expand Down Expand Up @@ -144,8 +144,9 @@ void test_float2d(int *domain_id)
{49, 59, 69, 79, 89, 99, 29, 39},
{42, 52, 62, 72, 82, 92, 22, 23},
{43, 53, 63, 73, 83, 93, 23, 33}} };


float **global, **idata, *blob_global, *blob_idata;
double **global, *idata, *blob_global, *blob_idata;

int xdatasize=(WHALO+NX+EHALO);
int ydatasize=(SHALO+NY+NHALO);
Expand Down Expand Up @@ -177,32 +178,30 @@ void test_float2d(int *domain_id)
x_is_global, y_is_global, tile_count, position, &whalo, &shalo);

//allocate global array
blob_global = (float *)calloc(xdatasize*ydatasize, sizeof(float));
global = (float **)calloc(ydatasize, sizeof(float *));
for(int i=0; i<ydatasize; i++) global[i] = blob_global+i*NX;
blob_global = (double *)calloc(xdatasize*ydatasize, sizeof(double));
global = (double **)calloc(ydatasize, sizeof(double *));
for(int i=0; i<ydatasize; i++) global[i] = blob_global+i*NX;

// allocate array for the ith data domain
blob_idata = (float *)malloc(xsize_d*ysize_d*sizeof(float));
idata = (float **)malloc(xsize_d*sizeof(float *));
for(int ix=0 ; ix<xsize_d; ix++) idata[ix] = blob_idata+ix*ysize_d;
idata = (double *)calloc(xsize_d*ysize_d,sizeof(double));

for(int ix=0 ; ix<NX; ix++) for(int iy=0 ; iy<NY; iy++) global[WHALO+ix][SHALO+iy] = (iy+SHALO)*10+(ix+WHALO);

for(int ix=0; ix<xsize_c; ix++) for(int iy=0; iy<ysize_c; iy++) idata[WHALO+ix][SHALO+iy] = global[isc+ix][jsc+iy];
for(int ix=0; ix<xsize_c; ix++) for(int iy=0; iy<ysize_c; iy++) idata[ysize_d*(ix + WHALO) + iy + SHALO] = global[isc+ix][jsc+iy];

int field_shape[2] = {xsize_d, ysize_d};
int *flags = NULL;
int *complete = NULL;
char *name = NULL;

cFMS_update_domains_float_2d(field_shape, idata, domain_id, flags, complete, position,
cFMS_update_domains_double_2d(field_shape, idata, domain_id, flags, complete, position,
&whalo, &ehalo, &shalo, &nhalo, name, tile_count);

int ipe = cFMS_pe();
for(int ix=0 ; ix<xsize_d; ix++) {
for(int iy=0 ; iy<ysize_d; iy++) {
if( ipe == 0 ) {
if( idata[ix][iy] != answers_t[ipe][ix][iy] ) cFMS_error(FATAL, "data domain did not update correctly!");
if( idata[ysize_d*ix+iy] != answers_t[ipe][ix][iy] ) cFMS_error(FATAL, "data domain did not update correctly!");
}
}
}
Expand Down