Skip to content

Commit 3c8338c

Browse files
Fix type mismatch compiler error when gfortran 10 is used without '-fallow-argument-mismatch' flag (NOAA-EMC#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.
1 parent 86b7773 commit 3c8338c

14 files changed

+2012
-4568
lines changed

FV3

Submodule FV3 updated from fae9bc2 to 6942270

cmake/GNU.cmake

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,6 @@ endif()
55

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

8-
if(${CMAKE_Fortran_COMPILER_VERSION} VERSION_GREATER_EQUAL 10)
9-
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fallow-argument-mismatch -fallow-invalid-boz")
10-
endif()
11-
128
if(NOT 32BIT)
139
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fdefault-real-8 -fdefault-double-8")
1410
endif()

driver/UFS.F90

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,9 @@ PROGRAM UFS
7979
TYPE(ESMF_Config) :: CF_MAIN !<-- The Configure object
8080
!
8181
CHARACTER(ESMF_MAXSTR) :: MESSAGE_CHECK
82+
!
83+
CHARACTER(len=MPI_MAX_LIBRARY_VERSION_STRING) :: library_version
84+
INTEGER :: resultlen
8285
!
8386
INTEGER :: RC, RC_USER !<-- The running error signal
8487
!
@@ -122,7 +125,12 @@ PROGRAM UFS
122125
!*** Print subversion version and other status information.
123126
!-----------------------------------------------------------------------
124127
!
125-
if (mype==0) call w3tagb('ufs ',0000,0000,0000,'np23 ')
128+
if (mype == 0) then
129+
call w3tagb('ufs-weather-model',0,0,0,'np23')
130+
call MPI_Get_library_version(library_version, resultlen, rc)
131+
write(*,'(A,A)') 'MPI Library = ', library_version(1:resultlen)
132+
write(*,'(A,I0,A,I0)')'MPI Version = ', mpi_version,'.',mpi_subversion
133+
endif
126134
!
127135
!-----------------------------------------------------------------------
128136
!*** Set up the default log.

tests/ci/repo_check.sh

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ result() {
1313
}
1414

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

@@ -44,7 +44,7 @@ stoch[branch]='master'
4444
stoch[dir]='stochastic_physics'
4545

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

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

6666
ccpp-framework[repo]='https://github.com/NCAR/ccpp-framework'
6767
ccpp-framework[branch]='main'
68-
ccpp-framework[dir]='ccpp/framework'
68+
ccpp-framework[dir]='FV3/ccpp/framework'
6969

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

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

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

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

0 commit comments

Comments
 (0)