Added code and cmake rules to allow source to compile into shared lib…

…rary

 - This built successfully on Linux.
 - There are CMake rules added that should be cleaned.
 - The library wont compile on Linux because I added a unistd.h; need to figure out how to best chdir on Windows
[#80310170]

CMakeLists.txt

@@ -33,6 +33,7 @@ set(CPACK_PACKAGE_CONTACT "Kyle Benne <[email protected]>")
 option( BUILD_PACKAGE "Build package" OFF )
 option( BUILD_TESTING "Build testing targets" OFF )
 option( BUILD_FORTRAN "Build Fortran stuff" OFF )
+option( MAKE_ENERGYPLUS_LIBRARY "Make EnergyPlus into a shared library instead of an executable" OFF )
 
 if( BUILD_TESTING )
   option( ENABLE_REGRESSION_TESTING "Enable Regression Tests" OFF )
@@ -122,6 +123,11 @@ if( BUILD_FORTRAN )
   cmake_add_fortran_subdirectory(src/ConvertESOMTR PROJECT ConvertESOMTR NO_EXTERNAL_INSTALL )
 endif()
 
+if ( MAKE_ENERGYPLUS_LIBRARY )
+  ADD_DEFINITIONS( " -DMAKE_ENERGYPLUS_LIBRARY " )
+  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
+endif()
+
 configure_file( idd/Energy+.idd.in "${CMAKE_BINARY_DIR}/Energy+.idd" )
 
 if( BUILD_PACKAGE )

src/EnergyPlus/CMakeLists.txt

@@ -517,9 +517,14 @@ SET( SRC
 )
 
 ADD_LIBRARY(EnergyPlusLib STATIC ${SRC})
-ADD_EXECUTABLE(EnergyPlus main.cc main.hh)
+if ( MAKE_ENERGYPLUS_LIBRARY )
+  ADD_LIBRARY(EnergyPlus SHARED main.cc main.hh)
+  ADD_DEFINITIONS( " -DMAKE_ENERGYPLUS_LIBRARY " )
+  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
+else()
+  ADD_EXECUTABLE(EnergyPlus main.cc main.hh)
+endif()
 
-#TARGET_LINK_LIBRARIES( EnergyPlus DElight )
 TARGET_LINK_LIBRARIES( EnergyPlus EnergyPlusLib objexx sqlite bcvtb epexpat epfmiimport )
 
 if(CMAKE_HOST_UNIX)

src/EnergyPlus/DataGlobals.cc

@@ -5,6 +5,8 @@
 #include <DataGlobals.hh>
 #include <DataPrecisionGlobals.hh>
 
+#include <string>
+
 namespace EnergyPlus {
 
 namespace DataGlobals {
@@ -172,6 +174,14 @@ namespace DataGlobals {
 	bool ShowDecayCurvesInEIO( false ); // true if the Radiant to Convective Decay Curves should appear in the EIO file
 	bool AnySlabsInModel ( false ); // true if there are any zone-coupled ground domains in the input file
 
+	bool IsDLL( false ); // set to true if running as a DLL
+	bool IsProgressCallback( false ); // set to true if a progress callback function is to be called (only if running as a DLL)
+	bool IsMessageCallback( false ); // set to true if a message callback function is to be called (only if running as a DLL)
+	bool IsProgramFatalCallback( false ); // set to true if a program fatal callback function is to be called (only if running as a DLL)
+	int Progress( 0 ); // current progress (0-100)
+	void ( *fProgressPtr )( int );
+	void ( *fMessagePtr )( std::string );
+
 	//     NOTICE
 	//     Copyright © 1996-2014 The Board of Trustees of the University of Illinois
 	//     and The Regents of the University of California through Ernest Orlando Lawrence

src/EnergyPlus/DataGlobals.hh

@@ -149,6 +149,14 @@ namespace DataGlobals {
 	extern bool ShowDecayCurvesInEIO; // true if the Radiant to Convective Decay Curves should appear in the EIO file
 	extern bool AnySlabsInModel; // true if there are any zone-coupled ground domains in the input file
 
+	extern bool IsDLL;
+	extern bool IsProgressCallback;
+	extern bool IsMessageCallback;
+	extern bool IsProgramFatalCallback;
+	extern int Progress; 
+	extern void ( *fProgressPtr )( int );
+	extern void ( *fMessagePtr )( std::string );
+
 } // DataGlobals
 
 } // EnergyPlus

src/EnergyPlus/DisplayRoutines.cc

@@ -8,6 +8,7 @@
 #include <DisplayRoutines.hh>
 #include <DataGlobals.hh>
 #include <DataSystemVariables.hh>
+#include <sstream>
 
 namespace EnergyPlus {
 
@@ -32,6 +33,9 @@ DisplayString( std::string const & String ) // String to be displayed
 
 	// Using/Aliasing
 	using DataGlobals::KickOffSimulation;
+	using DataGlobals::IsDLL;
+	using DataGlobals::IsMessageCallback;
+	using DataGlobals::fMessagePtr;
 	using DataSystemVariables::DeveloperFlag;
 
 	// Locals
@@ -48,6 +52,11 @@ DisplayString( std::string const & String ) // String to be displayed
 	// SUBROUTINE LOCAL VARIABLE DECLARATIONS:
 	// na
 
+	if (IsDLL && IsMessageCallback)
+	{
+		fMessagePtr(String);
+	}
+
 	if ( KickOffSimulation && ! DeveloperFlag ) return;
 	std::cout << String << '\n';
 
@@ -79,7 +88,10 @@ DisplayNumberAndString(
 	// Using/Aliasing
 	using DataGlobals::KickOffSimulation;
 	using DataSystemVariables::DeveloperFlag;
-
+	using DataGlobals::IsDLL;
+	using DataGlobals::IsMessageCallback;
+	using DataGlobals::fMessagePtr;
+
 	// Locals
 	// SUBROUTINE ARGUMENT DEFINITIONS:
 
@@ -92,7 +104,13 @@ DisplayNumberAndString(
 	// na
 
 	// SUBROUTINE LOCAL VARIABLE DECLARATIONS:
-
+	if (IsDLL && IsMessageCallback)
+	{
+		std::stringstream sstm;
+		sstm << String << " " << Number;
+		fMessagePtr( sstm.str() );
+	}
+
 	if ( KickOffSimulation && ! DeveloperFlag ) return;
 	std::cout << String << ' ' << Number << '\n';
 }
@@ -122,6 +140,9 @@ DisplaySimDaysProgress( // This doesn't do anything!
 
 	// Using/Aliasing
 	using DataGlobals::KickOffSimulation;
+	using DataGlobals::IsDLL;
+	using DataGlobals::IsProgressCallback;
+	using DataGlobals::fProgressPtr;
 	using DataSystemVariables::DeveloperFlag;
 
 	// Locals
@@ -139,6 +160,11 @@ DisplaySimDaysProgress( // This doesn't do anything!
 	// SUBROUTINE LOCAL VARIABLE DECLARATIONS:
 	static int percent( 0 ); // Current percent progress
 
+	if (IsDLL && IsProgressCallback)
+	{
+		fProgressPtr( percent );
+	}
+
 	if ( KickOffSimulation && ! DeveloperFlag ) return;
 	if ( TotalSimDays > 0 ) {
 		percent = nint( ( CurrentSimDay / TotalSimDays ) * 100.0 );

src/EnergyPlus/main.cc

@@ -29,8 +29,17 @@
 #include <SimulationManager.hh>
 #include <UtilityRoutines.hh>
 
+#ifdef __unix__
+#include <unistd.h>
+#endif
+
+#ifdef MAKE_ENERGYPLUS_LIBRARY
+void
+EnergyPlusPgm( std::string filepath )
+#else
 int
 main()
+#endif
 {
 	// Using/Aliasing
 	using namespace EnergyPlus;
@@ -241,6 +250,10 @@ main()
 	int iostatus;
 	bool FileExists;
 
+#ifdef MAKE_ENERGYPLUS_LIBRARY
+	IsDLL = true;
+#endif
+
 	//                           INITIALIZE VARIABLES
 	Time_Start = epElapsedTime();
 #ifdef EP_Detailed_Timings
@@ -372,6 +385,12 @@ main()
 		gio::write( LFN, EPlusiniFormat ) << "program" << ProgramPath;
 		gio::close( LFN );
 	}
+
+#ifdef MAKE_ENERGYPLUS_LIBRARY
+	int status = chdir(filepath.c_str());
+	ProgramPath = filepath + pathChar;
+#endif
+
 	TestAllPaths = true;
 
 	DisplayString( "EnergyPlus Starting" );
@@ -403,6 +422,26 @@ main()
 	EndEnergyPlus();
 }
 
+#ifdef MAKE_ENERGYPLUS_LIBRARY
+void StoreProgressCallback( void ( *f )( int ) )
+{
+	using namespace EnergyPlus::DataGlobals;
+	//using DataGlobals::IsProgressCallback;
+	//using DataGlobals::fProgressPtr;
+	IsProgressCallback = true;
+	fProgressPtr = f;
+}
+void StoreMessageCallback( void ( *f )( std::string ) )
+{
+	using namespace EnergyPlus::DataGlobals;
+	//using DataGlobals::IsMessageCallback;
+	//using DataGlobals::fMessagePtr;
+	IsMessageCallback = true;
+	fMessagePtr = f;
+}
+#endif
+
+
 void
 CreateCurrentDateTimeString( std::string & CurrentDateTimeString )
 {

src/EnergyPlus/main.hh

@@ -21,5 +21,13 @@
 		std::string & DataOut // Output from the retrieval
 	);
 
+#ifdef MAKE_ENERGYPLUS_LIBRARY
+	void
+	StoreProgressCallback( void ( *f )( int ) );
+
+	void
+	StoreMessageCallback( void ( *f )( std::string ) );
+
+#endif
 
 #endif

third_party/ObjexxFCL/CMakeLists.txt

@@ -4,6 +4,10 @@ if(MSVC)
   ADD_DEFINITIONS("-Za") # Disables MS language extensions
 endif()
 
+if ( MAKE_ENERGYPLUS_LIBRARY )
+  ADD_DEFINITIONS( " -DMAKE_ENERGYPLUS_LIBRARY " )
+  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
+endif()
 
 set(src
   src/ObjexxFCL/array.iterator.hh

third_party/SQLite/CMakeLists.txt

@@ -12,5 +12,10 @@ SET(SRC
   sqlite3.c
 ) 
 
+if ( MAKE_ENERGYPLUS_LIBRARY )
+  ADD_DEFINITIONS( " -DMAKE_ENERGYPLUS_LIBRARY -fPIC" )
+  #SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
+endif()
+
 ADD_LIBRARY( sqlite ${SRC} )