Skip to content

Commit

Permalink
Complete git conflict resolution from last commit; force double preci…
Browse files Browse the repository at this point in the history 
…sion conversion in calculation of mean air temperature (double iCount)
  • Loading branch information
@smwesten-usgs
smwesten-usgs committed Nov 21, 2019
1 parent f47cbd0 commit 518ad35
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 89 deletions.
4 changes: 2 additions & 2 deletions src/generated/version_control.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ module version_control

#define PLATFORM_NAME EXPAND_AND_QUOTE( Darwin-18.7.0 )
#define GIT_BRANCH_VALUE EXPAND_AND_QUOTE( master )
#define GIT_COMMIT_HASH_VALUE EXPAND_AND_QUOTE( 0dc657d )
#define GIT_COMMITS_ON_BRANCH_VALUE EXPAND_AND_QUOTE( 508 )
#define GIT_COMMIT_HASH_VALUE EXPAND_AND_QUOTE( f47cbd0 )
#define GIT_COMMITS_ON_BRANCH_VALUE EXPAND_AND_QUOTE( 513 )

character (len=20), parameter :: GIT_COMMIT_HASH_STRING = GIT_COMMIT_HASH_VALUE
character (len=30), parameter :: GIT_BRANCH_STRING = GIT_BRANCH_VALUE
Expand Down
20 changes: 7 additions & 13 deletions src/model.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -750,7 +750,7 @@ subroutine model_GetDailyPrecipAndTemperatureValue( pGrd, pConfig, rPrecip, &
call assert(iCount > 0, "Cannot continue -- there are no active cells", &
__FILE__, __LINE__)
! We are ignoring any missing or bogus values in this calculation
rMean = rSum / iCount
rMean = rSum / real(iCount, c_double)

if(pConfig%lHaltIfMissingClimateData) then
call Assert(rMin >= pConfig%rMinValidPrecip,"Precipitation values less than " &
Expand Down Expand Up @@ -906,16 +906,14 @@ subroutine model_UpdateContinuousFrozenGroundIndex( pGrd , pConfig)
! assuming snow depth is 10 times the water content of the snow in inches
rSnowDepthCM = cel%rSnowCover * 10.0_c_float * rCM_PER_INCH

if(cel%rTAvg > rFREEZING) then
cel%rCFGI = max(A*cel%rCFGI - &
(rTAvg_C * exp (-0.4_c_float * 0.5_c_float * rSnowDepthCM)),rZERO)
else ! temperature is below freezing
cel%rCFGI = max(A*cel%rCFGI - &
(rTAvg_C * exp (-0.4_c_float * 0.08_c_float * rSnowDepthCM)),rZERO)
end if
if(cel%rTAvg > rFREEZING) then
cel%rCFGI = max(A*cel%rCFGI - (rTAvg_C * exp (-0.4_c_float * 0.5_c_float * rSnowDepthCM)),rZERO)
else ! temperature is below freezing
cel%rCFGI = max(A*cel%rCFGI - (rTAvg_C * exp (-0.4_c_float * 0.08_c_float * rSnowDepthCM)),rZERO)
end if

end do
end do
end do

!!! *$OMP END DO

Expand Down Expand Up @@ -3655,11 +3653,7 @@ subroutine model_dumpvals(pGrd, pConfig)

cel => pGrd%Cells( DUMP_VARS( idx )%column_num, DUMP_VARS( idx )%row_num )

<<<<<<< HEAD
write( DUMP_VARS( idx )%file_unit, "(i2,',',i2,',',i4,',',5(i12,','),41(g16.9,','),g16.9 )") pConfig%iMonth, &
=======
write( DUMP_VARS( idx )%file_unit, "(i2,',',i2,',',i4,',',5(i12,','),40(g17.9e3,','),g17.9e3 )") pConfig%iMonth, &
>>>>>>> 259c01e0f31d551578d1a54b69d6221ea622614b
pConfig%iDay, &
pConfig%iYear, cel%iLandUse, cel%iLandUseIndex, cel%iSoilGroup, cel%iNumUpslopeConnections, &
cel%iSumUpslopeCells, cel%rTMin, cel%rTMax, cel%rTAvg, &
Expand Down
74 changes: 0 additions & 74 deletions test/unit_tests/fruit.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1560,11 +1560,6 @@ end subroutine assert_eq_2d_double_in_range_
subroutine assert_eq_complex_(var1, var2, message)

complex(kind(1.0D0)), intent (in) :: var1, var2
<<<<<<< HEAD:test/unit_tests/fruit.F90

=======

>>>>>>> 259c01e0f31d551578d1a54b69d6221ea622614b:test/unit_tests/fruit.f90
character(len = *), intent (in), optional :: message

if ((real (var1) < real (var2)) .or. &
Expand All @@ -1584,11 +1579,7 @@ end subroutine assert_eq_complex_
subroutine assert_eq_complex_in_range_(var1, var2, delta, message)

complex(kind(1.0D0)), intent (in) :: var1, var2
<<<<<<< HEAD:test/unit_tests/fruit.F90
real (c_double), intent (in) :: delta
=======
double precision, intent (in) :: delta
>>>>>>> 259c01e0f31d551578d1a54b69d6221ea622614b:test/unit_tests/fruit.f90
character(len = *), intent (in), optional :: message

if (abs(var1 - var2) > delta) then
Expand All @@ -1603,17 +1594,10 @@ end subroutine assert_eq_complex_in_range_

!------ 1d_complex ------
subroutine assert_eq_1d_complex_(var1, var2, n, message)
<<<<<<< HEAD:test/unit_tests/fruit.F90
integer (c_int), intent (in) :: n
integer (c_int) :: i
complex(kind(1.0D0)), intent (in) :: var1(n), var2(n)

=======
integer, intent (in) :: n
integer :: i
complex(kind(1.0D0)), intent (in) :: var1(n), var2(n)

>>>>>>> 259c01e0f31d551578d1a54b69d6221ea622614b:test/unit_tests/fruit.f90
character(len = *), intent (in), optional :: message
do i = 1, n
if ((real (var1(i)) < real (var2(i))) .or. &
Expand All @@ -1631,17 +1615,10 @@ end subroutine assert_eq_1d_complex_

!------ 1d_complex ------
subroutine assert_eq_1d_complex_in_range_(var1, var2, n, delta, message)
<<<<<<< HEAD:test/unit_tests/fruit.F90
integer (c_int), intent (in) :: n
integer (c_int) :: i
complex(kind(1.0D0)), intent (in) :: var1(n), var2(n)
real (c_double), intent (in) :: delta
=======
integer, intent (in) :: n
integer :: i
complex(kind(1.0D0)), intent (in) :: var1(n), var2(n)
double precision, intent (in) :: delta
>>>>>>> 259c01e0f31d551578d1a54b69d6221ea622614b:test/unit_tests/fruit.f90
character(len = *), intent (in), optional :: message
do i = 1, n
if (abs(var1(i) - var2(i)) > delta) then
Expand All @@ -1656,17 +1633,10 @@ end subroutine assert_eq_1d_complex_in_range_

!------ 2d_complex ------
subroutine assert_eq_2d_complex_(var1, var2, n, m, message)
<<<<<<< HEAD:test/unit_tests/fruit.F90
integer (c_int), intent (in) :: n, m
integer (c_int) :: i, j
complex(kind(1.0D0)), intent (in) :: var1(n, m), var2(n, m)

=======
integer, intent (in) :: n, m
integer :: i, j
complex(kind(1.0D0)), intent (in) :: var1(n, m), var2(n, m)

>>>>>>> 259c01e0f31d551578d1a54b69d6221ea622614b:test/unit_tests/fruit.f90
character(len = *), intent (in), optional :: message
do j = 1, m
do i = 1, n
Expand All @@ -1686,17 +1656,10 @@ end subroutine assert_eq_2d_complex_

!------ 2d_complex ------
subroutine assert_eq_2d_complex_in_range_(var1, var2, n, m, delta, message)
<<<<<<< HEAD:test/unit_tests/fruit.F90
integer (c_int), intent (in) :: n, m
integer (c_int) :: i, j
complex(kind(1.0D0)), intent (in) :: var1(n, m), var2(n, m)
real (c_double), intent (in) :: delta
=======
integer, intent (in) :: n, m
integer :: i, j
complex(kind(1.0D0)), intent (in) :: var1(n, m), var2(n, m)
double precision, intent (in) :: delta
>>>>>>> 259c01e0f31d551578d1a54b69d6221ea622614b:test/unit_tests/fruit.f90
character(len = *), intent (in), optional :: message
do j = 1, m
do i = 1, n
Expand Down Expand Up @@ -2226,11 +2189,6 @@ end subroutine assert_not_equals_2d_double_in_range_
subroutine assert_not_equals_complex_(var1, var2, message)

complex(kind(1.0D0)), intent (in) :: var1, var2
<<<<<<< HEAD:test/unit_tests/fruit.F90

=======

>>>>>>> 259c01e0f31d551578d1a54b69d6221ea622614b:test/unit_tests/fruit.f90
character(len = *), intent (in), optional :: message
logical :: same_so_far

Expand All @@ -2256,11 +2214,7 @@ end subroutine assert_not_equals_complex_
subroutine assert_not_equals_complex_in_range_(var1, var2, delta, message)

complex(kind(1.0D0)), intent (in) :: var1, var2
<<<<<<< HEAD:test/unit_tests/fruit.F90
real (c_double), intent (in) :: delta
=======
double precision, intent (in) :: delta
>>>>>>> 259c01e0f31d551578d1a54b69d6221ea622614b:test/unit_tests/fruit.f90
character(len = *), intent (in), optional :: message
logical :: same_so_far

Expand All @@ -2281,17 +2235,10 @@ end subroutine assert_not_equals_complex_in_range_

!------ 1d_complex ------
subroutine assert_not_equals_1d_complex_(var1, var2, n, message)
<<<<<<< HEAD:test/unit_tests/fruit.F90
integer (c_int), intent (in) :: n
integer (c_int) :: i
complex(kind(1.0D0)), intent (in) :: var1(n), var2(n)

=======
integer, intent (in) :: n
integer :: i
complex(kind(1.0D0)), intent (in) :: var1(n), var2(n)

>>>>>>> 259c01e0f31d551578d1a54b69d6221ea622614b:test/unit_tests/fruit.f90
character(len = *), intent (in), optional :: message
logical :: same_so_far

Expand All @@ -2315,17 +2262,10 @@ end subroutine assert_not_equals_1d_complex_

!------ 1d_complex ------
subroutine assert_not_equals_1d_complex_in_range_(var1, var2, n, delta, message)
<<<<<<< HEAD:test/unit_tests/fruit.F90
integer (c_int), intent (in) :: n
integer (c_int) :: i
complex(kind(1.0D0)), intent (in) :: var1(n), var2(n)
real (c_double), intent (in) :: delta
=======
integer, intent (in) :: n
integer :: i
complex(kind(1.0D0)), intent (in) :: var1(n), var2(n)
double precision, intent (in) :: delta
>>>>>>> 259c01e0f31d551578d1a54b69d6221ea622614b:test/unit_tests/fruit.f90
character(len = *), intent (in), optional :: message
logical :: same_so_far

Expand All @@ -2346,17 +2286,10 @@ end subroutine assert_not_equals_1d_complex_in_range_

!------ 2d_complex ------
subroutine assert_not_equals_2d_complex_(var1, var2, n, m, message)
<<<<<<< HEAD:test/unit_tests/fruit.F90
integer (c_int), intent (in) :: n, m
integer (c_int) :: i, j
complex(kind(1.0D0)), intent (in) :: var1(n, m), var2(n, m)

=======
integer, intent (in) :: n, m
integer :: i, j
complex(kind(1.0D0)), intent (in) :: var1(n, m), var2(n, m)

>>>>>>> 259c01e0f31d551578d1a54b69d6221ea622614b:test/unit_tests/fruit.f90
character(len = *), intent (in), optional :: message
logical :: same_so_far

Expand All @@ -2382,17 +2315,10 @@ end subroutine assert_not_equals_2d_complex_

!------ 2d_complex ------
subroutine assert_not_equals_2d_complex_in_range_(var1, var2, n, m, delta, message)
<<<<<<< HEAD:test/unit_tests/fruit.F90
integer (c_int), intent (in) :: n, m
integer (c_int) :: i, j
complex(kind(1.0D0)), intent (in) :: var1(n, m), var2(n, m)
real (c_double), intent (in) :: delta
=======
integer, intent (in) :: n, m
integer :: i, j
complex(kind(1.0D0)), intent (in) :: var1(n, m), var2(n, m)
double precision, intent (in) :: delta
>>>>>>> 259c01e0f31d551578d1a54b69d6221ea622614b:test/unit_tests/fruit.f90
character(len = *), intent (in), optional :: message
logical :: same_so_far

Expand Down

0 comments on commit 518ad35

Please sign in to comment.