Skip to content

Commit 780a69b

Browse files
DusanJovic-NOAADusanJovic-NOAA
authored
Port production/GFS.v16 branch to Orion (#121)
* Remove old comments/code related to arguments mismatch (ifdef __GFORTRAN__) * Porting to Orion (update ccpp build)
1 parent 06f03d9 commit 780a69b

File tree

5 files changed

+9
-67
lines changed

5 files changed

+9
-67
lines changed

‎ccpp/build_ccpp.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ set -eu
55

66
# List of valid/tested machines
77
VALID_MACHINES=( wcoss_cray wcoss_dell_p3 gaea.intel jet.intel \
8-
hera.intel \
8+
hera.intel orion.intel \
99
cheyenne.intel cheyenne.intel-impi cheyenne.gnu cheyenne.pgi endeavor.intel \
1010
stampede.intel supermuc_phase2.intel macosx.gnu \
1111
linux.intel linux.gnu linux.pgi )

‎ccpp/set_compilers.sh‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,13 @@ case "$MACHINE_ID" in
3939
export F77=mpiifort
4040
export F90=mpiifort
4141
;;
42+
orion.intel)
43+
export CC=mpiicc
44+
export CXX=mpiicpc
45+
export FC=mpiifort
46+
export F77=mpiifort
47+
export F90=mpiifort
48+
;;
4249
cheyenne.intel)
4350
export CC=mpicc
4451
export CXX=mpicxx

‎gfsphysics/GFS_layer/GFS_driver.F90‎

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -696,16 +696,6 @@ subroutine GFS_stochastic_driver (Model, Statein, Stateout, Sfcprop, Coupling, &
696696
implicit none
697697

698698
!--- interface variables
699-
! DH* gfortran correctly throws an error if the intent() declarations
700-
! for arguments differ between the actual routine (here) and the dummy
701-
! interface routine (IPD_func0d_proc in IPD_typedefs.F90):
702-
!
703-
! Error: Interface mismatch in procedure pointer assignment at (1): INTENT mismatch in argument 'control'
704-
!
705-
! Since IPD_func0d_proc declares all arguments as intent(inout), we
706-
! need to do the same here - however, this way we are loosing the
707-
! valuable information on the actual intent to this routine. *DH
708-
#ifdef __GFORTRAN__
709699
type(GFS_control_type), intent(inout) :: Model
710700
type(GFS_statein_type), intent(inout) :: Statein
711701
type(GFS_stateout_type), intent(inout) :: Stateout
@@ -716,18 +706,7 @@ subroutine GFS_stochastic_driver (Model, Statein, Stateout, Sfcprop, Coupling, &
716706
type(GFS_cldprop_type), intent(inout) :: Cldprop
717707
type(GFS_radtend_type), intent(inout) :: Radtend
718708
type(GFS_diag_type), intent(inout) :: Diag
719-
#else
720-
type(GFS_control_type), intent(in ) :: Model
721-
type(GFS_statein_type), intent(in ) :: Statein
722-
type(GFS_stateout_type), intent(in ) :: Stateout
723-
type(GFS_sfcprop_type), intent(in ) :: Sfcprop
724-
type(GFS_coupling_type), intent(inout) :: Coupling
725-
type(GFS_grid_type), intent(in ) :: Grid
726-
type(GFS_tbd_type), intent(in ) :: Tbd
727-
type(GFS_cldprop_type), intent(in ) :: Cldprop
728-
type(GFS_radtend_type), intent(in ) :: Radtend
729-
type(GFS_diag_type), intent(inout) :: Diag
730-
#endif
709+
731710
!--- local variables
732711
integer :: k, i
733712
real(kind=kind_phys) :: upert, vpert, tpert, qpert, qnew,sppt_vwt

‎gfsphysics/GFS_layer/GFS_physics_driver.F90‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -441,16 +441,6 @@ subroutine GFS_physics_driver &
441441
implicit none
442442
!
443443
! --- interface variables
444-
! DH* gfortran correctly throws an error if the intent() declarations
445-
! for arguments differ between the actual routine (here) and the dummy
446-
! interface routine (IPD_func0d_proc in IPD_typedefs.F90):
447-
!
448-
! Error: Interface mismatch in procedure pointer assignment at (1): INTENT mismatch in argument 'control'
449-
!
450-
! Since IPD_func0d_proc declares all arguments as intent(inout), we
451-
! need to do the same here - however, this way we are loosing the
452-
! valuable information on the actual intent to this routine. *DH
453-
#ifdef __GFORTRAN__
454444
type(GFS_control_type), intent(inout) :: Model
455445
type(GFS_statein_type), intent(inout) :: Statein
456446
type(GFS_stateout_type), intent(inout) :: Stateout
@@ -461,18 +451,6 @@ subroutine GFS_physics_driver &
461451
type(GFS_cldprop_type), intent(inout) :: Cldprop
462452
type(GFS_radtend_type), intent(inout) :: Radtend
463453
type(GFS_diag_type), intent(inout) :: Diag
464-
#else
465-
type(GFS_control_type), intent(in) :: Model
466-
type(GFS_statein_type), intent(inout) :: Statein
467-
type(GFS_stateout_type), intent(inout) :: Stateout
468-
type(GFS_sfcprop_type), intent(inout) :: Sfcprop
469-
type(GFS_coupling_type), intent(inout) :: Coupling
470-
type(GFS_grid_type), intent(in) :: Grid
471-
type(GFS_tbd_type), intent(inout) :: Tbd
472-
type(GFS_cldprop_type), intent(inout) :: Cldprop
473-
type(GFS_radtend_type), intent(inout) :: Radtend
474-
type(GFS_diag_type), intent(inout) :: Diag
475-
#endif
476454
!
477455
!## CCPP ## Note: Variables defined locally in this file for temporary calculations
478456
! or transfer of data between schemes are defined in gfsphysics/GFS_layer/GFS_typedefs.F90

‎gfsphysics/GFS_layer/GFS_radiation_driver.F90‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1024,16 +1024,6 @@ subroutine GFS_radiation_driver &
10241024

10251025
implicit none
10261026

1027-
! DH* gfortran correctly throws an error if the intent() declarations
1028-
! for arguments differ between the actual routine (here) and the dummy
1029-
! interface routine (IPD_func0d_proc in IPD_typedefs.F90):
1030-
!
1031-
! Error: Interface mismatch in procedure pointer assignment at (1): INTENT mismatch in argument 'control'
1032-
!
1033-
! Since IPD_func0d_proc declares all arguments as intent(inout), we
1034-
! need to do the same here - however, this way we are loosing the
1035-
! valuable information on the actual intent to this routine. *DH
1036-
#ifdef __GFORTRAN__
10371027
type(GFS_control_type), intent(inout) :: Model
10381028
type(GFS_statein_type), intent(inout) :: Statein
10391029
type(GFS_stateout_type), intent(inout) :: Stateout
@@ -1044,18 +1034,6 @@ subroutine GFS_radiation_driver &
10441034
type(GFS_cldprop_type), intent(inout) :: Cldprop
10451035
type(GFS_radtend_type), intent(inout) :: Radtend
10461036
type(GFS_diag_type), intent(inout) :: Diag
1047-
#else
1048-
type(GFS_control_type), intent(in) :: Model
1049-
type(GFS_statein_type), intent(in) :: Statein
1050-
type(GFS_stateout_type), intent(inout) :: Stateout
1051-
type(GFS_sfcprop_type), intent(in) :: Sfcprop
1052-
type(GFS_coupling_type), intent(inout) :: Coupling
1053-
type(GFS_grid_type), intent(in) :: Grid
1054-
type(GFS_tbd_type), intent(in) :: Tbd
1055-
type(GFS_cldprop_type), intent(in) :: Cldprop
1056-
type(GFS_radtend_type), intent(inout) :: Radtend
1057-
type(GFS_diag_type), intent(inout) :: Diag
1058-
#endif
10591037

10601038
! ================= subprogram documentation block ================ !
10611039
! !

0 commit comments

Comments
 (0)