Skip to content
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

Jump to bottom

Bundle PsychroLib #27

Merged
merged 6 commits into from
Apr 22, 2020
Merged

Bundle PsychroLib #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
21e515e
bundle psychrolib
dmey Apr 22, 2020
a123e25
remove static building onyl
dmey Apr 22, 2020
80f3940
cmake fix
dmey Apr 22, 2020
21e9a83
compile minimaldx from master from now
dmey Apr 22, 2020
4119045
Merge remote-tracking branch 'origin/master' into dmey/psychrolib
dmey Apr 22, 2020
c97b4b5
add LE
dmey Apr 22, 2020
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
1 change: 0 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ set(src_driver
src/driver/ol_time_interp_atm.F90
src/driver/open_close_bin_asc_forc.F90
src/driver/read_surf_atm.F90

src/driver/modd_wrf_teb_driver.F90
)

Expand Down
29 changes: 28 additions & 1 deletion ThirdPartyNotices.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ This project incorporates components from the projects listed below.
The original copyright notices and the licenses are included below:

1. MC2 (Mesoscale Compressible Community) model
2. psychrometrics/psychrolib version 2.5.0 (https://github.com/psychrometrics/psychrolib)

%% MC2 (Mesoscale Compressible Community) model NOTICES AND INFORMATION BEGIN HERE
=========================================
Expand All @@ -32,4 +33,30 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
=========================================
END OF MC2 (Mesoscale Compressible Community) model NOTICES AND INFORMATION
END OF MC2 (Mesoscale Compressible Community) model NOTICES AND INFORMATION

%% psychrometrics/psychrolib NOTICES AND INFORMATION BEGIN HERE
=========================================
The MIT License (MIT)

Copyright (c) 2018-2020 The PsychroLib Contributors.

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
=========================================
END OF psychrometrics/psychrolib NOTICES AND INFORMATION
7 changes: 5 additions & 2 deletions src/teb/bem.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ SUBROUTINE BEM(BOP, T, B, DMT, PTSTEP, PSUNTIME, KDAY, PPS, PRHOA, PT_CAN, &
USE MODD_CSTS, ONLY : XTT
!
use MinimalDXCoolingDriver, only: SimMinimalDXCooling
use psychrolib, only: GetHumRatioFromSpecificHum, GetSpecificHumFromHumRatio
use mode_psychrolib, only: SetUnitSystem, SI, GetHumRatioFromSpecificHum, GetSpecificHumFromHumRatio
!
IMPLICIT NONE
!
Expand Down Expand Up @@ -272,7 +272,10 @@ SUBROUTINE BEM(BOP, T, B, DMT, PTSTEP, PSUNTIME, KDAY, PPS, PRHOA, PT_CAN, &
!
! Local variable used for the coupling with MinimalDX
REAL :: OutdoorHumRatio, InletHumRatio, OutletHumRatio, OutdoorTDryBulb, InletTDryBulb, OutletTemperature

!
! Psychrolib: use International System of Units
call SetUnitSystem(SI)
!
!!REAL :: ZEXPL = 0.5 !explicit coefficient for internal temperature evol.
!!REAL :: ZIMPL = 0.5 !implicit coef..
!
Expand Down
Loading