Skip to content

Commit

Permalink
Fix type mismatch compiler error when gfortran 10 is used without '-f…
Browse files Browse the repository at this point in the history
…allow-argument-mismatch' flag (#1147)

* UFSWM - Fix type mismatch compiler error when gfortran 10 is used without '-fallow-argument-mismatch' flag.
  * FV3 - Fix type mismatch compiler error when gfortran 10 is used without '-fallow-argument-mismatch' flag.
    * ccpp-physics - Resolve various subroutine argument mismatches.
    * ccpp-framework - Add support to use mpi_f08 MPI module .
  * stochastic_physics - Fix type mismatch compiler error when gfortran 10 is used without '-fallow-argument-mismatch' flag.
  • Loading branch information
DusanJovic-NOAA authored Mar 20, 2024
1 parent 86b7773 commit 3c8338c
Show file tree
Hide file tree
Showing 14 changed files with 2,012 additions and 4,568 deletions.
4 changes: 0 additions & 4 deletions cmake/GNU.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,6 @@ endif()

set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -ggdb -fbacktrace -cpp -fcray-pointer -ffree-line-length-none -fno-range-check")

if(${CMAKE_Fortran_COMPILER_VERSION} VERSION_GREATER_EQUAL 10)
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fallow-argument-mismatch -fallow-invalid-boz")
endif()

if(NOT 32BIT)
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fdefault-real-8 -fdefault-double-8")
endif()
Expand Down
10 changes: 9 additions & 1 deletion driver/UFS.F90
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,9 @@ PROGRAM UFS
TYPE(ESMF_Config) :: CF_MAIN !<-- The Configure object
!
CHARACTER(ESMF_MAXSTR) :: MESSAGE_CHECK
!
CHARACTER(len=MPI_MAX_LIBRARY_VERSION_STRING) :: library_version
INTEGER :: resultlen
!
INTEGER :: RC, RC_USER !<-- The running error signal
!
Expand Down Expand Up @@ -122,7 +125,12 @@ PROGRAM UFS
!*** Print subversion version and other status information.
!-----------------------------------------------------------------------
!
if (mype==0) call w3tagb('ufs ',0000,0000,0000,'np23 ')
if (mype == 0) then
call w3tagb('ufs-weather-model',0,0,0,'np23')
call MPI_Get_library_version(library_version, resultlen, rc)
write(*,'(A,A)') 'MPI Library = ', library_version(1:resultlen)
write(*,'(A,I0,A,I0)')'MPI Version = ', mpi_version,'.',mpi_subversion
endif
!
!-----------------------------------------------------------------------
!*** Set up the default log.
Expand Down
2 changes: 1 addition & 1 deletion stochastic_physics
20 changes: 10 additions & 10 deletions tests/ci/repo_check.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ result() {
}

# Declare variables
declare -A base fv3 mom6 cice ww3 stoch gocart cmeps cdeps hycom cmake ccpp-framework ccpp-physics upp atmos_cubed_sphere
submodules="fv3 mom6 cice ww3 stoch gocart cmeps cdeps hycom cmake ccpp-framework ccpp-physics upp atmos_cubed_sphere"
declare -A base fv3 mom6 cice ww3 stoch gocart cmeps cdeps hycom cmake ccpp-framework ccpp-physics atmos_cubed_sphere
submodules="fv3 mom6 cice ww3 stoch gocart cmeps cdeps hycom cmake ccpp-framework ccpp-physics atmos_cubed_sphere"
comment=''
ownerID=$1

Expand Down Expand Up @@ -44,7 +44,7 @@ stoch[branch]='master'
stoch[dir]='stochastic_physics'

gocart[repo]='https://github.com/GEOS-ESM/GOCART'
gocart[branch]='main'
gocart[branch]='develop'
gocart[dir]='GOCART'

cmeps[repo]='https://github.com/NOAA-EMC/CMEPS'
Expand All @@ -65,19 +65,19 @@ cmake[dir]='CMakeModules'

ccpp-framework[repo]='https://github.com/NCAR/ccpp-framework'
ccpp-framework[branch]='main'
ccpp-framework[dir]='ccpp/framework'
ccpp-framework[dir]='FV3/ccpp/framework'

ccpp-physics[repo]='https://github.com/ufs-community/ccpp-physics'
ccpp-physics[branch]='ufs/dev'
ccpp-physics[dir]='ccpp/physics'
ccpp-physics[dir]='FV3/ccpp/physics'

upp[repo]='https://github.com/NOAA-EMC/UPP'
upp[branch]='develop'
upp[dir]='upp'
#upp[repo]='https://github.com/NOAA-EMC/UPP'
#upp[branch]='develop'
#upp[dir]='upp'

atmos_cubed_sphere[repo]='https://github.com/NOAA-GFDL/GFDL_atmos_cubed_sphere'
atmos_cubed_sphere[branch]='main'
atmos_cubed_sphere[dir]='atmos_cubed_sphere'
atmos_cubed_sphere[branch]='dev/emc'
atmos_cubed_sphere[dir]='FV3/atmos_cubed_sphere'

# Get sha-1's of the top of develop of ufs-weather-model
app="Accept: application/vnd.github.v3+json"
Expand Down
Loading

0 comments on commit 3c8338c

Please sign in to comment.