Skip to content

Commit ec9a9f1

Browse files
oehmkebena-nasa
authored andcommitted
Add generation of regrid info string.
1 parent e9a66b9 commit ec9a9f1

File tree

1 file changed

+45
-1
lines changed

1 file changed

+45
-1
lines changed

src/Infrastructure/Mesh/src/ESMCI_Mesh_Regrid_Glue.C

Lines changed: 45 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,8 @@ void CpMeshDataToArray(Grid &grid, int staggerLoc, ESMCI::Mesh &mesh, ESMCI::Arr
8282
void CpMeshElemDataToArray(Grid &grid, int staggerloc, ESMCI::Mesh &mesh, ESMCI::Array &array, MEField<> *dataToArray);
8383
void PutElemAreaIntoArray(Grid &grid, int staggerLoc, ESMCI::Mesh &mesh, ESMCI::Array &array);
8484

85-
85+
void create_regrid_info_str(Array **_src_array,Array **_dst_array, int *regridMethod,
86+
std::string &ristr);
8687

8788
void ESMCI_regrid_create(
8889
Mesh **meshsrcpp, ESMCI::Array **arraysrcpp, ESMCI::PointList **plsrcpp,
@@ -111,6 +112,12 @@ void ESMCI_regrid_create(
111112
Trace __trace(" FTN_X(regrid_test)(ESMCI::Grid **gridsrcpp, ESMCI::Grid **griddstcpp, int*rc");
112113

113114

115+
std::string ristr;
116+
create_regrid_info_str(arraysrcpp, arraydstpp, regridMethod, ristr);
117+
118+
std::cout<<"Regrid Info Str: "<<ristr<<"\n";
119+
120+
114121
ESMCI::Array &srcarray = **arraysrcpp;
115122
ESMCI::Array &dstarray = **arraydstpp;
116123

@@ -123,6 +130,9 @@ void ESMCI_regrid_create(
123130
int has_statusArray=*_has_statusArray;
124131
ESMCI::Array *statusArray=*_statusArray;
125132

133+
134+
135+
126136
#define PROGRESSLOG_off
127137
#define MEMLOG_off
128138

@@ -820,6 +830,40 @@ void ESMCI_regrid_create(
820830
}
821831

822832

833+
/* XMRKX */
834+
void create_regrid_info_str(Array **_src_array,Array **_dst_array, int *regridMethod,
835+
std::string &ristr) {
836+
837+
Array *src_array=*_src_array;
838+
Array *dst_array=*_dst_array;
839+
840+
// Add beginning part
841+
ristr="ESMCI_regrid_create(";
842+
843+
// Add src
844+
ristr=ristr+"src="+src_array->getName()+" ";
845+
846+
// Add dst
847+
ristr=ristr+"dst="+dst_array->getName()+" ";
848+
849+
// Add method
850+
ristr=ristr+"method=";
851+
852+
// Add method name
853+
if (*regridMethod==ESMC_REGRID_METHOD_BILINEAR) ristr=ristr+"bilinear";
854+
else if (*regridMethod==ESMC_REGRID_METHOD_CONSERVE) ristr=ristr+"conserve";
855+
else if (*regridMethod==ESMC_REGRID_METHOD_CONSERVE_2ND) ristr=ristr+"conserve2nd";
856+
else if (*regridMethod==ESMC_REGRID_METHOD_PATCH) ristr=ristr+"patch";
857+
else if (*regridMethod==ESMC_REGRID_METHOD_NEAREST_SRC_TO_DST) ristr=ristr+"neareststod";
858+
else if (*regridMethod==ESMC_REGRID_METHOD_NEAREST_DST_TO_SRC) ristr=ristr+"nearestdtos";
859+
else ristr=ristr+"unknown";
860+
861+
// Add end
862+
ristr=ristr+")";
863+
}
864+
865+
866+
823867
void ESMCI_regrid_getiwts(Grid **gridpp,
824868
Mesh **meshpp, ESMCI::Array **arraypp, int *staggerLoc,
825869
int *rc) {

0 commit comments

Comments
 (0)