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.

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

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

Merged
merged 11 commits into from
Sep 18, 2018
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
docs(ReleaseNotes): Updated release notes
Added section for current release and added header for 6.0.3 version
changes.
  • Loading branch information
jdhughes-usgs committed Aug 30, 2018
commit 50458007f726a2510bd4b2b48f4c376e12accaf1
4 changes: 2 additions & 2 deletions README.md
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 11
### Version 6.0.3 develop — build 12
[![Build Status](https://travis-ci.org/MODFLOW-USGS/modflow6.svg?branch=develop)](https://travis-ci.org/MODFLOW-USGS/modflow6)

## Introduction
Expand All @@ -31,7 +31,7 @@ MODFLOW 6 is the latest core version of MODFLOW. It synthesizes many of the capa

#### ***Software/Code citation for MODFLOW 6:***

[Langevin, C.D., Hughes, J.D., Banta, E.R., Provost, A.M., Niswonger, R.G., and Panday, Sorab, 2018, MODFLOW 6 Modular Hydrologic Model version 6.0.3 — develop: U.S. Geological Survey Software Release, 29 August 2018, https://doi.org/10.5066/F76Q1VQV](https://doi.org/10.5066/F76Q1VQV)
[Langevin, C.D., Hughes, J.D., Banta, E.R., Provost, A.M., Niswonger, R.G., and Panday, Sorab, 2018, MODFLOW 6 Modular Hydrologic Model version 6.0.3 — develop: U.S. Geological Survey Software Release, 30 August 2018, https://doi.org/10.5066/F76Q1VQV](https://doi.org/10.5066/F76Q1VQV)


## Instructions for building definition files for new packages
Expand Down
18 changes: 9 additions & 9 deletions code.json
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
[
{
"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",
"name": "modflow6",
"tags": [
"MODFLOW",
"groundwater model"
],
"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.",
"languages": [
"Fortran2008"
],
"contact": {
"name": "Christian D. Langevin",
"email": "[email protected]"
},
"downloadURL": "https://code.usgs.gov/usgs/modflow/modflow6/archive/master.zip",
"vcs": "git",
"laborHours": -1,
"version": "6.0.3.11",
"version": "6.0.3.12",
"date": {
"metadataLastUpdated": "2018-08-29"
"metadataLastUpdated": "2018-08-30"
},
"organization": "U.S. Geological Survey",
"permissions": {
Expand All @@ -33,6 +33,6 @@
"usageType": "openSource"
},
"homepageURL": "https://code.usgs.gov/usgs/modflow/modflow6/",
"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."
"name": "modflow6"
}
]
32 changes: 31 additions & 1 deletion doc/ReleaseNotes/ReleaseNotes.tex
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@

% -------------------------------------------------
\section{Introduction}
This document describes MODFLOW 6 Version \modflowversion. This distribution is packaged for personal computers using the Microsoft Windows 7 operating system, although it may run on other versions of Windows. The executable file was compiled for 64-bit Windows operating systems and should run on most personal computers.
This document describes MODFLOW 6 Version \modflowversion. This distribution is packaged for personal computers using the Microsoft Windows 7 and 10 operating systems, although it may run on other versions of Windows. The executable file was compiled for 64-bit Windows operating systems and should run on most personal computers.

Version numbers for MODFLOW 6 will follow a major.minor.revision format. The major number will be increased when there are substantial new changes that may break backward compatibility. The minor number will be increased when important, but relatively minor new functionality is added. The revision number will be added when errors are corrected in either the program or input files.

Expand All @@ -118,6 +118,36 @@ \section{History}

\item \currentmodflowversion

\underline{BASIC FUNCTIONALITY}
\begin{itemize}
\item Addressed issue with pointing contiguous pointer vectors/arrays to non-contiguous pointer vectors/arrays that caused code compilation failure with gfortran-8. A consequence of addressing this issue is that all pointer vectors/arrays that are allocated or pointed to using the memory manager must be defined to be contiguous.
\item -
\item -
\end{itemize}

\underline{STRESS PACKAGES}
\begin{itemize}
\item -
\item -
\item -
\end{itemize}

\underline{ADVANCED STRESS PACKAGES}
\begin{itemize}
\item -
\item -
\item -
\end{itemize}

\underline{SOLUTION}
\begin{itemize}
\item -
\item -
\item -
\end{itemize}

\item Version mf6.0.3--Aug. 9, 2018

\underline{BASIC FUNCTIONALITY}
\begin{itemize}
\item Fixed issues with observations specified using boundnames that are enclosed in quotes. Previously, the closing quote was retained on a boundname enclosed in quotes and resulted in an error (the erroneous observation boundname could not be found in the package).
Expand Down
4 changes: 2 additions & 2 deletions doc/version.tex
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
\newcommand{\modflowversion}{mf6.0.3.11}
\newcommand{\modflowdate}{August 29, 2018}
\newcommand{\modflowversion}{mf6.0.3.12}
\newcommand{\modflowdate}{August 30, 2018}
\newcommand{\currentmodflowversion}{Version \modflowversion---\modflowdate}
2 changes: 1 addition & 1 deletion src/Utilities/version.f90
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.11 08/29/2018'
character(len=40), parameter :: VERSION = '6.0.3.12 08/30/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
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 17:37:44
# created on...August 30, 2018 10:31:23

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

major = 6
minor = 0
micro = 3
build = 11
commit = 112
build = 12
commit = 113