Merge branch 'develop' of https://github.com/arras-energy/gridlabd in…

…to develop
arras-energy · Mar 19, 2024 · ac47080 · ac47080
2 parents 199992d + da8ae5b
commit ac47080
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/module/pypower/powerplant.cpp b/module/pypower/powerplant.cpp
@@ -42,7 +42,7 @@ powerplant::powerplant(MODULE *module)
 			PT_char256, "naics_description", get_naics_description_offset(),
 				PT_DESCRIPTION, "Powerplant NAICS description",
 
-			PT_int16, "plant_code", get_plant_code(),
+			PT_char32, "plant_code", get_plant_code_offset(),
 				PT_DESCRIPTION, "Generator plant code number",
 
 			PT_set, "generator", get_generator_offset(), 
@@ -176,6 +176,7 @@ int powerplant::init(OBJECT *parent_hdr)
 	PyDict_SetItemString(py_kwargs,"country",PyUnicode_FromString(get_country()));
 	PyDict_SetItemString(py_kwargs,"naics_code",PyUnicode_FromString(get_naics_code()));
 	PyDict_SetItemString(py_kwargs,"naics_description",PyUnicode_FromString(get_naics_description()));
+	PyDict_SetItemString(py_kwargs,"plant_code",PyUnicode_FromString(get_plant_code()));
 	PyDict_SetItemString(py_kwargs,"generator",PyLong_FromLong(get_generator()));
 	PyDict_SetItemString(py_kwargs,"fuel",PyLong_FromLong(get_fuel()));
 	PyDict_SetItemString(py_kwargs,"operating_capacity",PyFloat_FromDouble(get_operating_capacity()));

diff --git a/module/pypower/powerplant.h b/module/pypower/powerplant.h
@@ -11,13 +11,13 @@ class powerplant : public gld_object
 
 public:
 	// published properties
-	GL_STRING(char32,city);
-	GL_STRING(char32,state);
-	GL_STRING(char32,zipcode);
-	GL_STRING(char32,country);
-	GL_STRING(char32,naics_code);
-	GL_STRING(char256,naics_description);
-	GL_ATOMIC(int16,plant_code);
+	GL_ATOMIC(char32,city);
+	GL_ATOMIC(char32,state);
+	GL_ATOMIC(char32,zipcode);
+	GL_ATOMIC(char32,country);
+	GL_ATOMIC(char32,naics_code);
+	GL_ATOMIC(char256,naics_description);
+	GL_ATOMIC(char32,plant_code);
 	GL_ATOMIC(set,generator);
 	GL_ATOMIC(set,fuel);
 	GL_ATOMIC(enumeration,status)