Skip to content

Commit b227459

Browse files
committed
Change error handling to follow typical ESMF patterns
1 parent 64ca19c commit b227459

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

src/Infrastructure/IO/src/ESMCI_IO_NetCDF.C

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -643,8 +643,7 @@ void IO_NetCDF::destruct(void) {
643643
ESMC_TypeKind_Flag arrayType = ncToEsmcType(nctype);
644644
if (arrayType == ESMF_NOKIND) {
645645
string errstr = string(": problem converting NetCDF type to ESMF type");
646-
ESMC_LogDefault.Write(errstr, ESMC_LOGMSG_ERROR, ESMC_CONTEXT);
647-
*rc = ESMF_FAILURE;
646+
ESMC_LogDefault.MsgFoundError(ESMC_RC_ARG_VALUE, errstr, ESMC_CONTEXT, rc);
648647
return thisArray;
649648
}
650649

@@ -886,7 +885,7 @@ void IO_NetCDF::destruct(void) {
886885
nc_type ncType = esmcToNcType(esmcType);
887886
if (ncType == NC_UNSPECIFIED) {
888887
string errstr = string(": problem converting ESMF type to NetCDF type");
889-
ESMC_LogDefault.MsgFoundError(ESMF_FAILURE, errstr, ESMC_CONTEXT, &localrc);
888+
ESMC_LogDefault.MsgFoundError(ESMC_RC_ARG_VALUE, errstr, ESMC_CONTEXT, &localrc);
890889
return localrc;
891890
}
892891

@@ -994,7 +993,7 @@ void IO_NetCDF::destruct(void) {
994993

995994
default:
996995
string errstr = string(": unhandled NetCDF type");
997-
ESMC_LogDefault.MsgFoundError(ESMF_FAILURE, errstr, ESMC_CONTEXT, &localrc);
996+
ESMC_LogDefault.MsgFoundError(ESMC_RC_NOT_IMPL, errstr, ESMC_CONTEXT, &localrc);
998997
return localrc;
999998
}
1000999

0 commit comments

Comments
 (0)