Merge pull request #128 from Goddard-Fortran-Ecosystem/develop

Develop

Author: tclune

CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.12)
 
 project (FARGPARSE
 
-  VERSION 1.4.2
+  VERSION 1.5.0
   LANGUAGES Fortran)
 
 # Most users of this software do not (should not?) have permissions to

ChangeLog.md

@@ -5,13 +5,32 @@ All notable changes to this project will be documented in this file.
 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
+
+## [1.5.0] - 2023-04-13
+
+### Added
+
+- Added `IntelLLVM.cmake` file as a copy of `Intel.cmake` to support the LLVM Intel compiler frontends
+
+### Changed
+
+- Updated submodules for gFTL-shared (v1.6.0)
+
+### Fixed
+
+- implemented workaround for GFortran which was not correctly handling
+  deferred-length allocatable string arrays.  Used StringVector instead.
+
 ## [1.4.2] - 2023-01-23
 
 ### Fixed
 
 - Fixes for GNU Make builds
 - Update gFTL-shared submodule to v1.5.1
 
+
 ## [1.4.1] 2022-11-07
 
 ### Fixed

cmake/IntelLLVM.cmake

@@ -0,0 +1,22 @@
+# Compiler specific flags for Intel Fortran compiler
+
+if(WIN32)
+  set(no_optimize "-Od")
+  set(check_all "-check:all")
+else()
+  set(no_optimize "-O0")
+  set(check_all "-check all")
+endif()
+  
+
+set(disable_warning_for_long_names "-diag-disable 5462")
+set(traceback "-traceback")
+set(cpp "-cpp")
+
+
+set(CMAKE_Fortran_FLAGS_DEBUG  "${no_optimize}")
+set(CMAKE_Fortran_FLAGS_RELEASE "-O3")
+set(CMAKE_Fortran_FLAGS "-g ${cpp} ${traceback} ${check_all} ${disable_warning_for_long_names} -save-temps")
+
+add_definitions(-D_INTEL)
+add_definitions(-D__ifort_18)

extern/gFTL-shared

@@ -367,7 +367,7 @@ subroutine handle_option(this, action, argument, iter, end, embedded_value, args
      type(RealVector) :: real_list
      type(StringVector) :: string_list
      integer :: i
-     character(:), pointer :: choices(:)
+     type(StringVector), pointer :: choices
 
      integer :: arg_value_int
      real :: arg_value_real
@@ -516,8 +516,9 @@ subroutine handle_option(this, action, argument, iter, end, embedded_value, args
      end select
 
      choices => action%get_choices()
-     if (associated(choices)) then
-        if (.not. any(choices == argument)) then
+
+     if (choices%size() > 0) then
+        if (find(choices%begin(),choices%end(), argument) == choices%end()) then ! not found
            error stop 'invalid choice for argument'
         end if
      end if

src/ArgParser.F90

@@ -13,14 +13,14 @@ module fp_BaseAction
    type, extends(AbstractAction) :: BaseAction
       private
       character(:), allocatable :: destination
-      type (StringVector) :: option_strings
+      type(StringVector) :: option_strings
       character(:), allocatable :: type
       class(*), allocatable :: const
       class(*), allocatable :: default
       character(:), allocatable :: help
       class(*), allocatable :: n_arguments ! string or integer
       logical :: positional = .false.
-      character(len=:), allocatable :: choices(:)
+      type(StringVector) :: choices
    contains
       procedure :: initialize
       procedure :: get_destination
@@ -68,8 +68,9 @@ subroutine initialize(this, &
       character(len=*), optional, intent(in) :: choices(:)
       character(len=*), optional, intent(in) :: help
 
-      type (StringVectorIterator) :: iter
+      type(StringVectorIterator) :: iter
       character(:), pointer :: opt_string
+      integer :: i
 
       _UNUSED_DUMMY(unused)
 
@@ -138,7 +139,9 @@ subroutine initialize(this, &
       end if
 
       if (present(choices)) then
-         this%choices = choices
+         do i = 1, size(choices)
+            call this%choices%push_back(choices(i))
+         end do
       end if
    end subroutine initialize
 
@@ -318,14 +321,11 @@ function get_n_arguments(this) result(n_arguments)
    end function get_n_arguments
 
    function get_choices(this) result(choices)
-      character(:), pointer :: choices(:)
+      type(StringVector), pointer :: choices
       class(BaseAction), target, intent(in) :: this
 
-      if (allocated(this%choices)) then
-         choices => this%choices
-      else
-         choices => null()
-      end if
+      choices => this%choices
+
    end function get_choices
 
 end module fp_BaseAction