Skip to content

ProjectBuilder Update #65

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
smbanx wants to merge 2 commits into from
Closed

ProjectBuilder Update #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cf55631
fixed dependencies
smbanx Jun 22, 2025
cb67a36
fixed ground
smbanx Jun 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion plugins/energybalance/src/EnergyBalanceModel.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,10 @@ inline void gpuAssert(cudaError_t code, const char *file, int line, bool abort=t
}

__device__ float evaluateEnergyBalance( float T, float R, float Qother, float eps, float Ta, float ea, float pressure, float gH, float gS, uint Nsides, float stomatal_sidedness, float heatcapacity, float surfacehumidity, float dt, float Tprev ){

//! specific heat capacity of air at constant pressure, J mol⁻¹ K⁻¹
const float cp_air_mol = 29.25f;
//! latent heat of vaporization of water at 300 K, J mol⁻¹
const float lambda_mol = 44000.f;
//Outgoing emission flux
float Rout = float(Nsides)*eps*5.67e-8F*T*T*T*T;

Expand Down
6 changes: 2 additions & 4 deletions plugins/plantarchitecture/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ add_library( plantarchitecture STATIC "src/PlantArchitecture.cpp;src/PlantLibrar
set( PLUGIN_INCLUDE_PATHS "${CMAKE_CURRENT_SOURCE_DIR}/include;${PLUGIN_INCLUDE_PATHS}" PARENT_SCOPE )

file(GLOB_RECURSE OBJ_ASSET_FILES "${CMAKE_CURRENT_SOURCE_DIR}/assets/obj/*")
add_custom_target(copy_obj_assets ALL COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_BINARY_DIR}/plugins/plantarchitecture/assets/obj" COMMAND ${CMAKE_COMMAND} -E copy_if_different ${OBJ_ASSET_FILES} "${CMAKE_BINARY_DIR}/plugins/plantarchitecture/assets/obj/" DEPENDS ${OBJ_ASSET_FILES})
add_dependencies(plantarchitecture copy_obj_assets)
file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/assets/obj" DESTINATION "${CMAKE_BINARY_DIR}/plugins/plantarchitecture/assets")
file(GLOB_RECURSE TEXTURE_ASSET_FILES "${CMAKE_CURRENT_SOURCE_DIR}/assets/textures/*")
add_custom_target(copy_texture_assets ALL COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_BINARY_DIR}/plugins/plantarchitecture/assets/textures" COMMAND ${CMAKE_COMMAND} -E copy_if_different ${TEXTURE_ASSET_FILES} "${CMAKE_BINARY_DIR}/plugins/plantarchitecture/assets/textures/" DEPENDS ${TEXTURE_ASSET_FILES})
add_dependencies(plantarchitecture copy_texture_assets)
file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/assets/textures" DESTINATION "${CMAKE_BINARY_DIR}/plugins/plantarchitecture/assets")
1 change: 1 addition & 0 deletions plugins/projectbuilder/src/BuildGeometry.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,6 +364,7 @@ void BuildGeometry(const std::string &xml_input_file, PlantArchitecture *plant_a
// ####### SET UUID GLOBAL DATA ####### //

context_ptr->setGlobalData( "ground_UUIDs", HELIOS_TYPE_UINT, ground_UUIDs.size(), ground_UUIDs.data() );
context_ptr->setPrimitiveData( ground_UUIDs, "object_label", "ground" );
context_ptr->setGlobalData( "leaf_UUIDs", HELIOS_TYPE_UINT, leaf_UUIDs.size(), leaf_UUIDs.data() );
context_ptr->setGlobalData( "petiolule_UUIDs", HELIOS_TYPE_UINT, petiolule_UUIDs.size(), petiolule_UUIDs.data() );
context_ptr->setGlobalData( "petiole_UUIDs", HELIOS_TYPE_UINT, petiole_UUIDs.size(), petiole_UUIDs.data() );
Expand Down
1 change: 1 addition & 0 deletions plugins/radiation/src/RadiationModel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
#include "RadiationModel.h"

#include <string>
#undef max

using namespace helios;

Expand Down