Merge branch 'develop' into ci/tag-previous-s3-objects

FEBio/FEBioApp.cpp

@@ -257,9 +257,9 @@ bool FEBioApp::ParseCmdLine(int nargs, char* argv[])
 	// set initial configuration file name
 	if (ops.szcnf[0] == 0)
 	{
-		char szpath[1024] = { 0 };
-		febio::get_app_path(szpath, 1023);
-		sprintf(ops.szcnf, "%sfebio.xml", szpath);
+		char szpath[512] = { 0 };
+		febio::get_app_path(szpath, 511);
+		snprintf(ops.szcnf, 512, "%sfebio.xml", szpath);
 	}
 
 	// loop over the arguments
@@ -337,7 +337,7 @@ bool FEBioApp::ParseCmdLine(int nargs, char* argv[])
 			if (szext == 0)
 			{
 				// we assume a default extension of .feb if none is provided
-				sprintf(ops.szfile, "%s.feb", argv[i]);
+				snprintf(ops.szfile, sizeof(ops.szfile), "%s.feb", argv[i]);
 			}
 			else strcpy(ops.szfile, argv[i]);
 			ops.binteractive = false;
@@ -448,7 +448,7 @@ bool FEBioApp::ParseCmdLine(int nargs, char* argv[])
 				if (szext == 0)
 				{
 					// we assume a default extension of .feb if none is provided
-					sprintf(ops.szfile, "%s.feb", sz);
+					snprintf(ops.szfile, sizeof(ops.szfile), "%s.feb", sz);
 				}
 				else
 				{
@@ -494,9 +494,9 @@ bool FEBioApp::ParseCmdLine(int nargs, char* argv[])
 		}
 		else strcpy(szlogbase, szbase);
 
-		if (!blog) sprintf(ops.szlog, "%s.log", szlogbase);
-		if (!bplt) sprintf(ops.szplt, "%s.xplt", szbase);
-		if (!bdmp) sprintf(ops.szdmp, "%s.dmp", szbase);
+		if (!blog) snprintf(ops.szlog, sizeof(ops.szlog), "%s.log", szlogbase);
+		if (!bplt) snprintf(ops.szplt, sizeof(ops.szplt), "%s.xplt", szbase);
+		if (!bdmp) snprintf(ops.szdmp, sizeof(ops.szdmp), "%s.dmp", szbase);
 	}
 	else if (ops.szctrl[0])
 	{
@@ -505,9 +505,9 @@ bool FEBioApp::ParseCmdLine(int nargs, char* argv[])
 		char* ch = strrchr(szbase, '.');
 		if (ch) *ch = 0;
 
-		if (!blog) sprintf(ops.szlog, "%s.log", szbase);
-		if (!bplt) sprintf(ops.szplt, "%s.xplt", szbase);
-		if (!bdmp) sprintf(ops.szdmp, "%s.dmp", szbase);
+		if (!blog) snprintf(ops.szlog, sizeof(ops.szlog), "%s.log", szbase);
+		if (!bplt) snprintf(ops.szplt, sizeof(ops.szplt), "%s.xplt", szbase);
+		if (!bdmp) snprintf(ops.szdmp, sizeof(ops.szdmp), "%s.dmp", szbase);
 	}
 
 	return brun;

FEBio/FEBioCommand.cpp

@@ -305,7 +305,7 @@ int FEBioCmd_Config::run(int nargs, char* argv[])
 	}
 	else if (nargs == 2)
 	{
-		sprintf(ops.szcnf, "%s", argv[1]);
+		snprintf(ops.szcnf, sizeof(ops.szcnf), "%s", argv[1]);
 		feApp->Configure(ops.szcnf);
 	}
 	else return invalid_nr_args();
@@ -510,7 +510,7 @@ int FEBioCmd_svg::run(int nargs, char **argv)
 		strcpy(buf, szfile);
 		char* ch = strrchr(buf, '.');
 		if (ch) *ch = 0;
-		sprintf(szsvg, "%s.svg", buf);
+		snprintf(szsvg, 1024, "%s.svg", buf);
 
 		std::filebuf fb;
 		fb.open(szsvg, std::ios::out);
@@ -547,8 +547,8 @@ int FEBioCmd_out::run(int nargs, char **argv)
 		strcpy(buf, szfile);
 		char* ch = strrchr(buf, '.');
 		if (ch) *ch = 0;
-		sprintf(szK, "%s.out", buf);
-		sprintf(szR, "%s_rhs.out", buf);
+		snprintf(szK, 1024, "%s.out", buf);
+		snprintf(szR, 1024, "%s_rhs.out", buf);
 
 		febio::write_hb(*A, szK, mode);
 		febio::write_vector(R, szR, mode);

FEBio/console.cpp

@@ -93,7 +93,7 @@ void Console::SetTitle(const char* sz, ...)
 		// make the message
 		char sztitle[512];
 		va_start(args, sz);
-		vsprintf(sztitle, sz, args);
+		vsnprintf(sztitle, 512, sz, args);
 		va_end(args);
 
 #ifdef WIN32

FEBio/febio_cb.cpp

@@ -74,9 +74,9 @@ bool update_console_cb(FEModel* pfem, unsigned int nwhen, void* pd)
 
 	char szvers[64] = {0};
 #ifndef NDEBUG
-	sprintf(szvers, "FEBio (DEBUG) %s", szver);
+	snprintf(szvers, 64, "FEBio (DEBUG) %s", szver);
 #else
-	sprintf(szvers, "FEBio %s", szver);
+	snprintf(szvers, 64, "FEBio %s", szver);
 #endif
 
 	// print progress in title bar

FEBioLib/FEBioModel.cpp

@@ -1388,7 +1388,7 @@ void FEBioModel::SerializeIOData(DumpStream &ar)
 			// set the software string
 			const char* szver = febio::getVersionString();
 			char szbuf[256] = { 0 };
-			sprintf(szbuf, "FEBio %s", szver);
+			snprintf(szbuf, 256, "FEBio %s", szver);
 			xplt->SetSoftwareString(szbuf);
 
 			m_plot = xplt;
@@ -1480,7 +1480,7 @@ bool FEBioModel::InitPlotFile()
 		// set the software string
 		const char* szver = febio::getVersionString();
 		char szbuf[256] = { 0 };
-		sprintf(szbuf, "FEBio %s", szver);
+		snprintf(szbuf, 256, "FEBio %s", szver);
 		xplt->SetSoftwareString(szbuf);
 
 		m_plot = xplt;

FEBioLib/LogStream.cpp

@@ -39,7 +39,7 @@ void LogStream::printf(const char* sz, ...)
 	// make the message
 	char sztxt[1024] = { 0 };
 	va_start(args, sz);
-	vsprintf(sztxt, sz, args);
+	vsnprintf(sztxt, 1024, sz, args);
 	va_end(args);
 
 	print(sztxt);

FEBioLib/Logfile.cpp

@@ -101,7 +101,7 @@ void Logfile::printf(const char* sz, ...)
 	// make the message
 	char sztxt[2048] = {0};
 	va_start(args, sz);
-	vsprintf(sztxt, sz, args);
+	vsnprintf(sztxt, 2048, sz, args);
 	va_end(args);
 
 	// print to file
@@ -123,13 +123,13 @@ void Logfile::printbox(const char* sztitle, const char* sz, ...)
 	// make the message
 	char sztxt[1024] = {0};
 	va_start(args, sz);
-	vsprintf(sztxt, sz, args);
+	vsnprintf(sztxt, 1024, sz, args);
 	va_end(args);
 
 	// print the box
 	char szmsg[1024] = {0};
 	char* ch = szmsg;
-	sprintf(szmsg,"\n *************************************************************************\n"); ch += strlen(ch);
+	snprintf(szmsg,1024, "\n *************************************************************************\n"); ch += strlen(ch);
 	// print the title
 	if (sztitle)
 	{
@@ -138,9 +138,9 @@ void Logfile::printbox(const char* sztitle, const char* sz, ...)
 		char right[60] = {0};
 		strncpy(left, sztitle, l/2);
 		strncpy(right, sztitle+l/2, l - l/2);
-		sprintf(ch," * %33s", left); ch += strlen(ch);
-		sprintf(ch,"%-36s *\n", right); ch += strlen(ch);
-//		sprintf(ch," *%71s*\n", ""); ch += strlen(ch);
+		snprintf(ch,1024, " * %33s", left); ch += strlen(ch);
+		snprintf(ch,1024, "%-36s *\n", right); ch += strlen(ch);
+//		snprintf(ch,1024, " *%71s*\n", ""); ch += strlen(ch);
 	}
 
 	// print the message
@@ -162,13 +162,13 @@ void Logfile::printbox(const char* sztitle, const char* sz, ...)
 			if (cn) *cn = '\n';
 			cn = ct + n; 
 		}
-		sprintf(ch," * %-69s *\n", ct); ch += strlen(ch);
+		snprintf(ch,1024," * %-69s *\n", ct); ch += strlen(ch);
 		if (wrap) { ct[n] = tmp; }
 		if (cn) ct = cn+1;
 	}
 	while (cn);
 //	sprintf(ch," *                                                                       *\n"); ch += strlen(ch);
-	sprintf(ch," *************************************************************************\n");
+	snprintf(ch,1024," *************************************************************************\n");
 
 	// print the message
 	printf(szmsg);

FEBioLib/cmdoptions.cpp

@@ -90,7 +90,7 @@ bool febio::ProcessOptionsString(const std::string& s, CMDOPTIONS& ops)
 	{
 		char szpath[1024] = { 0 };
 		febio::get_app_path(szpath, 1023);
-		sprintf(ops.szcnf, "%sfebio.xml", szpath);
+		snprintf(ops.szcnf, 1024, "%sfebio.xml", szpath);
 	}
 
 	// loop over the arguments
@@ -151,7 +151,7 @@ bool febio::ProcessOptionsString(const std::string& s, CMDOPTIONS& ops)
 			if (szext == 0)
 			{
 				// we assume a default extension of .feb if none is provided
-				sprintf(ops.szfile, "%s.feb", sz);
+				snprintf(ops.szfile, 1024, "%s.feb", sz);
 			}
 			else strcpy(ops.szfile, sz);
 			ops.binteractive = false;
@@ -225,7 +225,7 @@ bool febio::ProcessOptionsString(const std::string& s, CMDOPTIONS& ops)
 				if (szext == 0)
 				{
 					// we assume a default extension of .feb if none is provided
-					sprintf(ops.szfile, "%s.feb", sz);
+					snprintf(ops.szfile, sizeof(ops.szfile), "%s.feb", sz);
 				}
 				else
 				{
@@ -271,9 +271,9 @@ bool febio::ProcessOptionsString(const std::string& s, CMDOPTIONS& ops)
 		}
 		else strcpy(szlogbase, szbase);
 
-		if (!blog) sprintf(ops.szlog, "%s.log", szlogbase);
-		if (!bplt) sprintf(ops.szplt, "%s.xplt", szbase);
-		if (!bdmp) sprintf(ops.szdmp, "%s.dmp", szbase);
+		if (!blog) snprintf(ops.szlog, sizeof(ops.szlog), "%s.log", szlogbase);
+		if (!bplt) snprintf(ops.szplt, sizeof(ops.szplt), "%s.xplt", szbase);
+		if (!bdmp) snprintf(ops.szdmp, sizeof(ops.szdmp), "%s.dmp", szbase);
 	}
 	else if (ops.szctrl[0])
 	{
@@ -282,9 +282,9 @@ bool febio::ProcessOptionsString(const std::string& s, CMDOPTIONS& ops)
 		char* ch = strrchr(szbase, '.');
 		if (ch) *ch = 0;
 
-		if (!blog) sprintf(ops.szlog, "%s.log", szbase);
-		if (!bplt) sprintf(ops.szplt, "%s.xplt", szbase);
-		if (!bdmp) sprintf(ops.szdmp, "%s.dmp", szbase);
+		if (!blog) snprintf(ops.szlog, sizeof(ops.szlog), "%s.log", szbase);
+		if (!bplt) snprintf(ops.szplt, sizeof(ops.szplt), "%s.xplt", szbase);
+		if (!bdmp) snprintf(ops.szdmp, sizeof(ops.szdmp), "%s.dmp", szbase);
 	}
 
 	return true;

FEBioLib/hello.cpp

@@ -36,7 +36,7 @@ int febio::Hello(LogStream& log)
 {
 	char szversion[128] = { 0 };
 	char* szvernum = getVersionString();
-	sprintf(szversion, "  version %s\n", szvernum);
+	snprintf(szversion, 128, "  version %s\n", szvernum);
 
 	log.print("===========================================================================\n");
 	log.print("         ________    _________   _______       __     _________            \n");
@@ -62,4 +62,4 @@ int febio::Hello(LogStream& log)
 
 	return 0;
 }
-
+

FEBioLib/input.cpp

@@ -54,7 +54,7 @@ void FEBioModel::print_parameter(FEParam& p, int level)
 {
 	char sz[512] = {0};
 	int l = (int)strlen(p.name()) + 2*level;
-	sprintf(sz, "\t%*s %.*s", l, p.name(), 50-l, "..................................................");
+	snprintf(sz, 512, "\t%*s %.*s", l, p.name(), 50-l, "..................................................");
 	if (p.dim() == 1)
 	{
 		switch (p.type())

FEBioLib/version.cpp

@@ -32,10 +32,10 @@ char* febio::getVersionString()
     static char version[32];
 
 #ifndef DEVCOMMIT
-    sprintf(version, "%d.%d.%d", VERSION, SUBVERSION, SUBSUBVERSION);
+    snprintf(version, 32, "%d.%d.%d", VERSION, SUBVERSION, SUBSUBVERSION);
 #else
-    sprintf(version, "%d.%d.%d.%s", VERSION, SUBVERSION, SUBSUBVERSION, DEVCOMMIT);
+    snprintf(version, 32, "%d.%d.%d.%s", VERSION, SUBVERSION, SUBSUBVERSION, DEVCOMMIT);
 #endif
 
     return version;
-}
+}

FEBioMech/FEBioMechModule.cpp

@@ -176,6 +176,7 @@ SOFTWARE.*/
 #include "FETractionLoad.h"
 #include "FESurfaceForceUniform.h"
 #include "FEBearingLoad.h"
+#include "FEIdealGasPressure.h"
 #include "FEGenericBodyForce.h"
 #include "FECentrifugalBodyForce.h"
 #include "FEPointBodyForce.h"
@@ -634,8 +635,9 @@ void FEBioMech::InitModule()
 	// classes derived from FESurfaceLoad
 	REGISTER_FECORE_CLASS(FEPressureLoad, "pressure");
 	REGISTER_FECORE_CLASS(FETractionLoad, "traction");
-    REGISTER_FECORE_CLASS(FESurfaceForceUniform, "force");
-    REGISTER_FECORE_CLASS(FEBearingLoad, "bearing load");
+	REGISTER_FECORE_CLASS(FESurfaceForceUniform, "force");
+	REGISTER_FECORE_CLASS(FEBearingLoad, "bearing load");
+	REGISTER_FECORE_CLASS(FEIdealGasPressure, "ideal gas pressure");
 
 	//-----------------------------------------------------------------------------
 	// classes derived from FEBodyForce
@@ -863,6 +865,7 @@ void FEBioMech::InitModule()
     REGISTER_FECORE_CLASS(FEPlotGrowthRightHencky, "growth right Hencky");
     REGISTER_FECORE_CLASS(FEPlotGrowthLeftHencky, "growth left Hencky");
     REGISTER_FECORE_CLASS(FEPlotGrowthRelativeVolume, "growth relative volume");
+    REGISTER_FECORE_CLASS(FEPlotIdealGasPressure, "ideal gas pressure");
 
 	// beam variables
 	REGISTER_FECORE_CLASS(FEPlotBeamStress      , "beam stress");

FEBioMech/FEBioMechPlot.cpp

@@ -72,6 +72,7 @@ SOFTWARE.*/
 #include <FECore/FEElement.h>
 #include <FEBioMech/FEElasticBeamDomain.h>
 #include <FEBioMech/FEElasticBeamMaterial.h>
+#include "FEIdealGasPressure.h"
 
 //=============================================================================
 //                            N O D E   D A T A
@@ -1407,8 +1408,8 @@ bool FEPlotDensity::Save(FEDomain &dom, FEDataStream& a)
 	if (dom.Class() == FE_DOMAIN_SOLID)
 	{
 		FESolidDomain& bd = static_cast<FESolidDomain&>(dom);
-		FEElasticMaterial* em = dynamic_cast<FEElasticMaterial*>(bd.GetMaterial());
-		if (em == 0) return false;
+		FEElasticMaterial* em = bd.GetMaterial()->ExtractProperty<FEElasticMaterial>();
+        if (em == 0) return false;
 
 		FERemodelingElasticMaterial* rm = dynamic_cast<FERemodelingElasticMaterial*>(em);
 		if (rm)
@@ -1426,7 +1427,7 @@ bool FEPlotDensity::Save(FEDomain &dom, FEDataStream& a)
 	}
 	else if (dom.Class() == FE_DOMAIN_SHELL)
 	{
-		FEElasticMaterial* em = dynamic_cast<FEElasticMaterial*>(dom.GetMaterial());
+        FEElasticMaterial* em = dom.GetMaterial()->ExtractProperty<FEElasticMaterial>();
 		if (em == 0) return false;
 		FEDensity dens(em);
 		writeAverageElementValue<double>(dom, a, dens);
@@ -4660,3 +4661,33 @@ bool FEPlotGrowthRelativeVolume::Save(FEDomain &dom, FEDataStream& a)
     return true;
 }
 
+
+bool FEPlotIdealGasPressure::Init()
+{
+	FEModel* fem = GetFEModel();
+	if (fem == nullptr) return false;
+
+	for (int i = 0; i < fem->ModelLoads(); ++i)
+	{
+		m_load = dynamic_cast<FEIdealGasPressure*>(fem->ModelLoad(i));
+		if (m_load) return true;
+	}
+	return (m_load != nullptr);
+}
+
+bool FEPlotIdealGasPressure::Save(FESurface& surf, FEDataStream& a)
+{
+	if (m_binit == false)
+	{
+		if (!Init()) return false;
+		m_binit = true;
+	}
+	if (m_load == nullptr) return false;
+
+	if (m_load->GetSurface().GetFacetSet() == surf.GetFacetSet())
+	{
+		a << m_load->GetCurrentPressure();
+		return true;
+	}
+	else return false;
+}

FEBioMech/FEBioMechPlot.h

@@ -1415,3 +1415,17 @@ class FEPlotBeamCurvature : public FEPlotDomainData
 	FEPlotBeamCurvature(FEModel* pfem) : FEPlotDomainData(pfem, PLT_VEC3F, FMT_ITEM) {}
 	bool Save(FEDomain& dom, FEDataStream& a);
 };
+
+// plot the current pressure value of the FEIdealGasPressure load
+class FEIdealGasPressure;
+class FEPlotIdealGasPressure : public FEPlotSurfaceData
+{
+public:
+	FEPlotIdealGasPressure(FEModel* fem) : FEPlotSurfaceData(fem, PLT_FLOAT, FMT_REGION) {}
+	bool Save(FESurface& surf, FEDataStream& a) override;
+
+private:
+	bool Init() override;
+	bool m_binit = false;
+	FEIdealGasPressure* m_load = nullptr;
+};