Changes for Linux suggested by Marco Manzan

MITSustainableDesignLab · Jan 9, 2018 · ff95d3d · ff95d3d
1 parent 50f9201
commit ff95d3d
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 13 deletions.
diff --git a/src/daysim/CMakeLists.txt b/src/daysim/CMakeLists.txt
@@ -6,40 +6,40 @@ include_directories(${CMAKE_SOURCE_DIR}/common)
 add_library(daysim_common fropen.c parse.c read_in_header.c nrutil.c numerical.c sun.c "${VERSION_FILE}")
 
 add_executable(gen_reindl gen_reindl.c)
-target_link_libraries(gen_reindl rtrad daysim_common)
+target_link_libraries(gen_reindl daysim_common rtrad)
 
 add_executable(gencumulativesky gendiscretesky.cpp climateFile.cpp cPerezSkyModel.cpp cSkyVault.cpp cSun.cpp)
-target_link_libraries(gencumulativesky rtrad daysim_common)
+target_link_libraries(gencumulativesky daysim_common rtrad)
 
 add_executable(ds_el_lighting ds_el_lighting.c allocate_memory.c analysis_data.c daylightfactor.c get_illuminances.c lightswitch.c simulation_assumptions.c BlindModel.c occ_func.c)
-target_link_libraries(ds_el_lighting rtrad daysim_common)
+target_link_libraries(ds_el_lighting daysim_common rtrad)
 
 add_executable(ds_illum ds_illum.c calculate_Perez.c shadow_testing.c calculate_sky_patches.c check_direct_sunlight.c)
-target_link_libraries(ds_illum rtrad daysim_common)
+target_link_libraries(ds_illum daysim_common rtrad)
 
 add_executable(gen_dc gen_dc.c write_dds_files.c calculate_sky_patches_gen_dc.c)
-target_link_libraries(gen_dc rtrad daysim_common)
+target_link_libraries(gen_dc daysim_common rtrad)
 
 add_executable(ds_shortterm ds_shortterm.c clearsky_models.c 60min_file.c read_in.c skartveit.c)
-target_link_libraries(ds_shortterm rtrad daysim_common)
+target_link_libraries(ds_shortterm daysim_common rtrad)
 
 add_executable(gen_dgp_profile gen_dgp_profile.c)
-target_link_libraries(gen_dgp_profile rtrad daysim_common)
+target_link_libraries(gen_dgp_profile daysim_common rtrad)
 
 add_executable(gen_directsunlight gen_directsunlight.c)
-target_link_libraries(gen_directsunlight rtrad daysim_common)
+target_link_libraries(gen_directsunlight daysim_common rtrad)
 
 add_executable(gen_single_office gen_single_office.c)
-target_link_libraries(gen_single_office rtrad daysim_common)
+target_link_libraries(gen_single_office daysim_common rtrad)
 
 add_executable(radfiles2daysim radfiles2daysim.c)
-target_link_libraries(radfiles2daysim rtrad daysim_common)
+target_link_libraries(radfiles2daysim daysim_common rtrad)
 
 add_executable(rotate_scene rotate_scene.c)
-target_link_libraries(rotate_scene rtrad daysim_common)
+target_link_libraries(rotate_scene daysim_common rtrad)
 
 add_executable(scale_dc scale_dc.c)
-target_link_libraries(scale_dc rtrad daysim_common)
+target_link_libraries(scale_dc daysim_common rtrad)
 
 #install(TARGETS gen_reindl gencumulativesky ds_el_lighting ds_illum ds_shortterm gen_dc gen_dgp_profile gen_directsunlight gen_single_office radfiles2daysim rotate_scene scale_dc RUNTIME DESTINATION bin)
 
diff --git a/src/daysim/cSkyVault.h b/src/daysim/cSkyVault.h
@@ -1,5 +1,5 @@
 #include "cPerezSkyModel.h"
-#include "ClimateFile.h"
+#include "climateFile.h"
 #include "ds_constants.h"
 
 /////////////////////////////////////////////

diff --git a/src/daysim/get_illuminances.c b/src/daysim/get_illuminances.c
@@ -140,6 +140,7 @@ void get_daylight_illuminances( )
 			}			
 		}	
 	}
+	return;
 memerr:
 	error(SYSTEM, "out of memory in get_daylight_illuminances");
 }