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

fix(ArrayReaders): Fix issue reading binary 2d arrays #41

Merged
merged 11 commits into from
Sep 18, 2018
Merged

fix(ArrayReaders): Fix issue reading binary 2d arrays #41

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
57732dd
Initial changes to address #36. Still need to test and perform clean up.
jdhughes-usgs Aug 27, 2018
5d6a1c8
Updates to OBS to deallocate internal members with gfortran-8. Clean
jdhughes-usgs Aug 28, 2018
eb92fc0
Cleanup of variable definitions. Still more cleaning required.
jdhughes-usgs Aug 28, 2018
2b473cc
Fixed compile issue with mf5to6...added contiguous to vectors/arrays
jdhughes-usgs Aug 29, 2018
38f24a8
Proposed fix for denormal results occurring with gfortran-8 and
jdhughes-usgs Aug 29, 2018
76ae1b4
Proposed fix for denormal results occurring with gfortran-8 and
jdhughes-usgs Aug 29, 2018
8ec3f2e
Additional cleanup of variable definitions. Modified .travis.yml to
jdhughes-usgs Aug 29, 2018
5045800
docs(ReleaseNotes): Updated release notes
jdhughes-usgs Aug 30, 2018
2d81938
docs: updates and additions
jdhughes-usgs Aug 30, 2018
6cb6077
Merge branch 'develop' of github.com:MODFLOW-USGS/modflow6 into develop
jdhughes-usgs Sep 18, 2018
447b97c
fix(ArrayReaders): Fix issue reading binary 2d arrays
jdhughes-usgs Sep 18, 2018
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
Prev Previous commit
Next Next commit
Proposed fix for denormal results occurring with gfortran-8 and 
test016_Keating_disu_250. (2)
  • Loading branch information
@jdhughes-usgs
jdhughes-usgs committed Aug 29, 2018
commit 76ae1b42a82603a3598c1c16e12e51034124734d
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

## Automated Testing Status on Travis-CI

### Version 6.0.3 develop — build 9
### Version 6.0.3 develop — build 10
[![Build Status](https://travis-ci.org/MODFLOW-USGS/modflow6.svg?branch=develop)](https://travis-ci.org/MODFLOW-USGS/modflow6)

## Introduction
Expand Down
18 changes: 9 additions & 9 deletions code.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
[
{
"status": "Release Candidate",
"languages": [
"Fortran2008"
],
"downloadURL": "https://code.usgs.gov/usgs/modflow/modflow6/archive/master.zip",
"repositoryURL": "https://code.usgs.gov/usgs/modflow/modflow6.git",
"laborHours": -1,
"disclaimerURL": "https://code.usgs.gov/usgs/modflow/modflow6/blob/master/DISCLAIMER.md",
"description": "MODFLOW is the USGS's modular hydrologic model. MODFLOW is considered an international standard for simulating and predicting groundwater conditions and groundwater/surface-water interactions.",
"tags": [
"MODFLOW",
"groundwater model"
],
"name": "modflow6",
"downloadURL": "https://code.usgs.gov/usgs/modflow/modflow6/archive/master.zip",
"vcs": "git",
"languages": [
"Fortran2008"
],
"contact": {
"name": "Christian D. Langevin",
"email": "[email protected]"
},
"vcs": "git",
"version": "6.0.3.9",
"laborHours": -1,
"version": "6.0.3.10",
"date": {
"metadataLastUpdated": "2018-08-29"
},
Expand All @@ -33,6 +33,6 @@
"usageType": "openSource"
},
"homepageURL": "https://code.usgs.gov/usgs/modflow/modflow6/",
"disclaimerURL": "https://code.usgs.gov/usgs/modflow/modflow6/blob/master/DISCLAIMER.md"
"name": "modflow6"
}
]
2 changes: 1 addition & 1 deletion doc/version.tex
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
\newcommand{\modflowversion}{mf6.0.3.9}
\newcommand{\modflowversion}{mf6.0.3.10}
\newcommand{\modflowdate}{August 29, 2018}
\newcommand{\currentmodflowversion}{Version \modflowversion---\modflowdate}
4 changes: 3 additions & 1 deletion src/Solution/NumericalSolution.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,9 +351,11 @@ subroutine allocate_arrays(this)
call mem_allocate(this%convdvmax, this%convnmod, 0, 'CONVDVMAX', this%name)
call mem_allocate(this%convdrmax, this%convnmod, 0, 'CONVDRMAX', this%name)
!
! -- initialize
! -- initialize allocated arrays
do i = 1, this%neq
this%x(i) = DZERO
this%xtemp(i) = DZERO
this%dxold(i) = DZERO
this%active(i) = 1 !default is active
enddo
!
Expand Down
2 changes: 1 addition & 1 deletion src/Utilities/version.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module VersionModule
public
! -- modflow 6 version
integer(I4B), parameter :: IDEVELOPMODE = 1
character(len=40), parameter :: VERSION = '6.0.3.9 08/29/2018'
character(len=40), parameter :: VERSION = '6.0.3.10 08/29/2018'
character(len=10), parameter :: MFVNAM = ' 6'
character(len=*), parameter :: MFTITLE = &
'U.S. GEOLOGICAL SURVEY MODULAR HYDROLOGIC MODEL'
Expand Down
6 changes: 3 additions & 3 deletions version.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# MODFLOW 6 version file automatically created using...pre-commit.py
# created on...August 29, 2018 14:56:02
# created on...August 29, 2018 15:10:18

# add some comments on how this version file
# should be manually updated and used

major = 6
minor = 0
micro = 3
build = 9
commit = 110
build = 10
commit = 111