diff --git a/src/sbml/packages/spatial/extension/SpatialExtension.cpp b/src/sbml/packages/spatial/extension/SpatialExtension.cpp index 7ccab59b07..636bca0a3b 100644 --- a/src/sbml/packages/spatial/extension/SpatialExtension.cpp +++ b/src/sbml/packages/spatial/extension/SpatialExtension.cpp @@ -465,10 +465,7 @@ SpatialExtension::init() static const char* SBML_BOUNDARY_KIND_STRINGS[] = { - "Robin_valueCoefficient" -, "Robin_inwardNormalGradientCoefficient" -, "Robin_sum" -, "Neumann" + "Neumann" , "Dirichlet" , "invalid BoundaryKind value" }; @@ -481,7 +478,7 @@ LIBSBML_EXTERN const char* BoundaryKind_toString(BoundaryKind_t bk) { - int min = SPATIAL_BOUNDARYKIND_ROBIN_VALUE_COEFFICIENT; + int min = SPATIAL_BOUNDARYKIND_NEUMANN; int max = SPATIAL_BOUNDARYKIND_INVALID; if (bk < min || bk > max) @@ -533,7 +530,7 @@ LIBSBML_EXTERN int BoundaryKind_isValid(BoundaryKind_t bk) { - int min = SPATIAL_BOUNDARYKIND_ROBIN_VALUE_COEFFICIENT; + int min = SPATIAL_BOUNDARYKIND_NEUMANN; int max = SPATIAL_BOUNDARYKIND_INVALID; if (bk < min || bk >= max) diff --git a/src/sbml/packages/spatial/extension/SpatialExtension.h b/src/sbml/packages/spatial/extension/SpatialExtension.h index 6b80fca653..684fdebb3c 100644 --- a/src/sbml/packages/spatial/extension/SpatialExtension.h +++ b/src/sbml/packages/spatial/extension/SpatialExtension.h @@ -434,10 +434,7 @@ typedef enum */ typedef enum { - SPATIAL_BOUNDARYKIND_ROBIN_VALUE_COEFFICIENT /*!< The spatial boundarykind is @c "Robin_valueCoefficient". */ -, SPATIAL_BOUNDARYKIND_ROBIN_INWARD_NORMAL_GRADIENT_COEFFICIENT /*!< The spatial boundarykind is @c "Robin_inwardNormalGradientCoefficient". */ -, SPATIAL_BOUNDARYKIND_ROBIN_SUM /*!< The spatial boundarykind is @c "Robin_sum". */ -, SPATIAL_BOUNDARYKIND_NEUMANN /*!< The spatial boundarykind is @c "Neumann". */ + SPATIAL_BOUNDARYKIND_NEUMANN /*!< The spatial boundarykind is @c "Neumann". */ , SPATIAL_BOUNDARYKIND_DIRICHLET /*!< The spatial boundarykind is @c "Dirichlet". */ , SPATIAL_BOUNDARYKIND_INVALID /*!< Invalid BoundaryKind value. */ } BoundaryKind_t; @@ -449,9 +446,6 @@ typedef enum * @param bk the #BoundaryKind_t enumeration value to convert. * * @return A string corresponding to the given type: - * "Robin_valueCoefficient", - * "Robin_inwardNormalGradientCoefficient", - * "Robin_sum", * "Neumann", * "Dirichlet", * or @c NULL if the value is @sbmlconstant{SPATIAL_BOUNDARYKIND_INVALID, @@ -485,9 +479,9 @@ BoundaryKind_parse(const char* code); * @sbmlconstant{SPATIAL_BOUNDARYKIND_INVALID, BoundaryKind_t} if no match is * found. * - * @note The matching is case-sensitive: "Robin_valueCoefficient" will return - * @sbmlconstant{SPATIAL_BOUNDARYKIND_ROBIN_VALUE_COEFFICIENT, BoundaryKind_t}, - * but "Robin_valueCoefficient" will return + * @note The matching is case-sensitive: "Neumann" will return + * @sbmlconstant{SPATIAL_BOUNDARYKIND_NEUMANN, BoundaryKind_t}, + * but "neumann" will return * @sbmlconstant{SPATIAL_BOUNDARYKIND_INVALID, BoundaryKind_t}. * * @if conly @@ -506,10 +500,6 @@ BoundaryKind_fromString(const char* code); * @param bk the #BoundaryKind_t enumeration to query. * * @return @c 1 (true) if the #BoundaryKind_t is - * @sbmlconstant{SPATIAL_BOUNDARYKIND_ROBIN_VALUE_COEFFICIENT, BoundaryKind_t}, - * @sbmlconstant{SPATIAL_BOUNDARYKIND_ROBIN_INWARD_NORMAL_GRADIENT_COEFFICIENT, - * BoundaryKind_t}, - * @sbmlconstant{SPATIAL_BOUNDARYKIND_ROBIN_SUM, BoundaryKind_t}, * @sbmlconstant{SPATIAL_BOUNDARYKIND_NEUMANN, BoundaryKind_t}, or * @sbmlconstant{SPATIAL_BOUNDARYKIND_DIRICHLET, BoundaryKind_t}; * @c 0 (false) otherwise (including @@ -531,16 +521,13 @@ BoundaryKind_isValid(BoundaryKind_t bk); * @param code the string to query. * * @return @c 1 (true) if the string is - * "Robin_valueCoefficient", - * "Robin_inwardNormalGradientCoefficient", - * "Robin_sum", * "Neumann", * "Dirichlet", or * "invalid BoundaryKind value"; * @c 0 (false) otherwise. * - * @note The matching is case-sensitive: "Robin_valueCoefficient" will return - * @c 1 (true), but "Robin_valueCoefficient" will return @c 0 (false). + * @note The matching is case-sensitive: "Neumann" will return + * @c 1 (true), but "neumann" will return @c 0 (false). * * @if conly * @memberof Spatial_t diff --git a/src/sbml/packages/spatial/sbml/BoundaryCondition.h b/src/sbml/packages/spatial/sbml/BoundaryCondition.h index d86fd3cb8d..1c2fe022ac 100644 --- a/src/sbml/packages/spatial/sbml/BoundaryCondition.h +++ b/src/sbml/packages/spatial/sbml/BoundaryCondition.h @@ -62,12 +62,6 @@ * Level 3 Version 1 Spatial specification, the following are the * allowable values for "type": *