Skip to content

Commit

Permalink
Bundle PsychroLib (#27)
Browse files Browse the repository at this point in the history
Bundle PsychroLib in TEB as src/teb/mode_psychrolib.f90 (module mode_psychrolib). Note that we use this to avoid clashes with module psychrolib already used in MinimalDX.
  • Loading branch information
dmey authored Apr 22, 2020
1 parent 8c91ac5 commit 67e4947
Show file tree
Hide file tree
Showing 4 changed files with 1,537 additions and 4 deletions.
1 change: 0 additions & 1 deletion CMakeLists.txt
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
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
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

0 comments on commit 67e4947

Please sign in to comment.