Skip to content

Commit

Permalink
Merge pull request #3 from Goddard-Fortran-Ecosystem/develop
Browse files Browse the repository at this point in the history
Minor fixes
  • Loading branch information
tclune authored Apr 6, 2020
2 parents ead639e + 2373d8b commit 938d4c6
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 25 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 3.8)

project (YAFYAML
VERSION 0.2
VERSION 0.3.0
LANGUAGES Fortran)

# Most users of this software do not (should not?) have permissions to
Expand Down
7 changes: 6 additions & 1 deletion ChangeLog.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,16 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [Unreleased]

## Changed
## Added
## Fixed

## [0.3.0] - 2020-4-06

## Fixed
- varous missing checks on return status
- eliminated some debug print statements

## [0.2.2] - 2020-03-16

## Fixed
Expand Down
7 changes: 0 additions & 7 deletions YAFAMLConfig-version.cmake.in

This file was deleted.

3 changes: 2 additions & 1 deletion src/Configuration.F90
Original file line number Diff line number Diff line change
Expand Up @@ -367,6 +367,7 @@ subroutine get_config_at_selector(this, config, ARG_LIST, unused, default, rc)


call this%get_node_at_selector(node, ARG_LIST, rc=status)
__VERIFY__(status)

if (.not. associated(node) .and. .not.present(default)) then
node => None
Expand All @@ -386,8 +387,8 @@ subroutine get_config_at_selector(this, config, ARG_LIST, unused, default, rc)
end select
end if

!!$ VERIFY(status)

__RETURN__(SUCCESS)
end subroutine get_config_at_selector


Expand Down
15 changes: 0 additions & 15 deletions src/get_value.inc
Original file line number Diff line number Diff line change
Expand Up @@ -95,21 +95,6 @@ subroutine NAME_(TYPE_NAME)(this, value, ARG_LIST, unusable, default, is_present
class default
if (present(is_present)) is_present = .true.
if (present(default)) value = default
#ifdef _INTEGER_
print*,'integer'
#endif
#ifdef _REAL_
print*,'real'
#endif
#ifdef _LOGICAL_
print*,'logical'
#endif
#ifdef _STRING_VECTOR_
print*,'string vector'
#endif
#ifdef STRING
print*,'string'
#endif
__FAIL__(INCONSISTENT_TYPE)
end select
end if
Expand Down

0 comments on commit 938d4c6

Please sign in to comment.