Skip to content

Commit 6ec5b30

Browse files
mkavulichmkavulich
committed
======================================
TYPE: bug fix KEYWORDS: AIX, compilation, brackets SOURCE: internal PURPOSE: Fix compilation problems for certain AIX systems DESCRIPTION OF CHANGES: Recently some users have complained about the inability to compile WRF or WRFPLUS on IBM systems with the AIX operating system. Dave discovered that the reason for it was a quirk in the C standard that caused CPP to not properly deal with include statements for non-system files that are written the following format: #include <model_data_order.inc> Instead, the include statement should be formatted like this: #include "model_data_order.inc" These sorts of include statements are found in a large number of files, so the list of modified files is long. However, the only changes in all these files is to change the brackets <> to quotes "" LIST OF MODIFIED FILES : M arch/md_calls.inc M chem/chem_driver.F M dyn_em/couple_or_uncouple_em.F M dyn_em/interp_domain_em.F M dyn_em/module_initialize_b_wave.F M dyn_em/module_initialize_convrad.F M dyn_em/module_initialize_fire.F M dyn_em/module_initialize_grav2d_x.F M dyn_em/module_initialize_heldsuarez.F M dyn_em/module_initialize_hill2d_x.F M dyn_em/module_initialize_les.F M dyn_em/module_initialize_quarter_ss.F M dyn_em/module_initialize_scm_xy.F M dyn_em/module_initialize_seabreeze2d_x.F M dyn_em/module_initialize_squall2d_x.F M dyn_em/module_initialize_squall2d_y.F M dyn_em/module_initialize_tropical_cyclone.F M dyn_em/nest_init_utils.F M dyn_em/shift_domain_em.F M dyn_em/solve_em.F M dyn_exp/module_initialize_exp.F M dyn_exp/solve_exp.F M dyn_nmm/NMM_NEST_UTILS1.F M dyn_nmm/module_IGWAVE_ADJUST.F M dyn_nmm/module_initialize_real.F M dyn_nmm/module_initialize_tropical_cyclone.F M dyn_nmm/shift_domain_nmm.F M dyn_nmm/solve_nmm.F M dyn_nmm/start_domain_nmm.F M external/RSL_LITE/module_dm.F M external/RSL_LITE/tfp_tester.F M external/esmf_time_f90/ESMF_TimeMgr.inc M frame/module_configure.F M frame/module_domain.F M frame/module_domain_type.F M frame/module_driver_constants.F M main/wrf_SST_ESMF.F M phys/module_ra_cam.F M phys/module_ra_cam_support.F M phys/module_sf_clm.F M share/input_wrf.F M share/mediation_feedback_domain.F M share/mediation_force_domain.F M share/mediation_integrate.F M share/mediation_interp_domain.F M share/mediation_nest_move.F M share/mediation_wrfmain.F M share/output_wrf.F M share/solve_interface.F M share/start_domain.F M share/track_input.F M share/wrf_bdyin.F M share/wrf_bdyout.F M share/wrf_restartin.F M share/wrf_restartout.F M share/wrf_tsin.F M var/gen_be/gen_be_addmean.f90 M var/gen_be/gen_be_ensmean.f90 TESTS CONDUCTED: The fix results in successful completion of WRF on AIX as reported by a complaining user. WRFDA (gnu/intel) and WRF (gnu/intel/pgi) regression tests were run on Yellowstone as well, and all passed (though this is a trivial result since our compilers never complained in the first place). ======================================= git-svn-id: https://svn-wrf-model.cgd.ucar.edu/trunk@8798 b0b5d27b-6f0f-0410-a2a3-cb1e977edc3d
1 parent 72d2039 commit 6ec5b30

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+401
-401
lines changed

‎arch/md_calls.inc

+72-72
Large diffs are not rendered by default.

‎chem/chem_driver.F

+2-2
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ end SUBROUTINE sum_pm_driver
192192
TYPE(domain) , TARGET :: grid
193193
!
194194
! Definitions of dummy arguments to solve
195-
# include <dummy_new_decl.inc>
195+
# include "dummy_new_decl.inc"
196196
# define NO_I1_OLD
197197

198198
TYPE(grid_config_rec_type), INTENT(IN ) :: config_flags
@@ -1179,7 +1179,7 @@ end SUBROUTINE sum_pm_driver
11791179
moist, &
11801180
vdrog3, ldrog, vdrog3_vbs, ldrog_vbs, &
11811181
!
1182-
#include <call_to_kpp_mech_drive.inc>
1182+
#include "call_to_kpp_mech_drive.inc"
11831183
!
11841184
ids,ide, jds,jde, kds,kde, &
11851185
ims,ime, jms,jme, kms,kme, &

‎dyn_em/couple_or_uncouple_em.F

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ SUBROUTINE couple_or_uncouple_em ( grid , config_flags , couple &
3333
TYPE(domain) , TARGET :: grid
3434

3535
! Definitions of dummy arguments to solve
36-
#include <dummy_new_decl.inc>
36+
#include "dummy_new_decl.inc"
3737

3838
! WRF state bcs
3939
TYPE (grid_config_rec_type) , INTENT(IN) :: config_flags

‎dyn_em/interp_domain_em.F

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ SUBROUTINE interp_domain_em_part1 ( grid, ngrid, config_flags &
2121
USE module_domain, ONLY : domain, get_ijk_from_grid
2222
USE module_configure, ONLY : grid_config_rec_type
2323
TYPE(domain), POINTER :: grid , ngrid
24-
#include <dummy_new_decl.inc>
24+
#include "dummy_new_decl.inc"
2525

2626
INTEGER nlev
2727
INTEGER i,j,pig,pjg,cm,cn,nig,njg,k

‎dyn_em/module_initialize_b_wave.F

+3-3
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ SUBROUTINE init_domain ( grid )
4646

4747
CALL init_domain_rk( grid &
4848
!
49-
#include <actual_new_args.inc>
49+
#include "actual_new_args.inc"
5050
!
5151
)
5252

@@ -56,15 +56,15 @@ END SUBROUTINE init_domain
5656

5757
SUBROUTINE init_domain_rk ( grid &
5858
!
59-
# include <dummy_new_args.inc>
59+
# include "dummy_new_args.inc"
6060
!
6161
)
6262
IMPLICIT NONE
6363

6464
! Input data.
6565
TYPE (domain), POINTER :: grid
6666

67-
# include <dummy_decl.inc>
67+
# include "dummy_decl.inc"
6868

6969
TYPE (grid_config_rec_type) :: config_flags
7070

‎dyn_em/module_initialize_convrad.F

+4-4
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ SUBROUTINE init_domain ( grid )
5757

5858
CALL init_domain_rk( grid &
5959
!
60-
#include <actual_new_args.inc>
60+
#include "actual_new_args.inc"
6161
!
6262
)
6363
END SUBROUTINE init_domain
@@ -66,15 +66,15 @@ END SUBROUTINE init_domain
6666

6767
SUBROUTINE init_domain_rk ( grid &
6868
!
69-
# include <dummy_new_args.inc>
69+
# include "dummy_new_args.inc"
7070
!
7171
)
7272
IMPLICIT NONE
7373

7474
! Input data.
7575
TYPE (domain), POINTER :: grid
7676

77-
# include <dummy_new_decl.inc>
77+
# include "dummy_new_decl.inc"
7878

7979
TYPE (grid_config_rec_type) :: config_flags
8080

@@ -106,7 +106,7 @@ SUBROUTINE init_domain_rk ( grid &
106106
character (len=256) :: mminlu2
107107

108108
#ifdef DM_PARALLEL
109-
# include <data_calls.inc>
109+
# include "data_calls.inc"
110110
#endif
111111

112112

‎dyn_em/module_initialize_fire.F

+3-3
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ SUBROUTINE init_domain ( grid )
5555

5656
CALL init_domain_rk( grid &
5757
!
58-
#include <actual_new_args.inc>
58+
#include "actual_new_args.inc"
5959
!
6060
)
6161

@@ -65,15 +65,15 @@ END SUBROUTINE init_domain
6565

6666
SUBROUTINE init_domain_rk ( grid &
6767
!
68-
# include <dummy_new_args.inc>
68+
# include "dummy_new_args.inc"
6969
!
7070
)
7171
IMPLICIT NONE
7272

7373
! Input data.
7474
TYPE (domain), POINTER :: grid
7575

76-
# include <dummy_new_decl.inc>
76+
# include "dummy_new_decl.inc"
7777

7878
TYPE (grid_config_rec_type) :: config_flags
7979

‎dyn_em/module_initialize_grav2d_x.F

+4-4
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ SUBROUTINE init_domain ( grid )
5353

5454
CALL init_domain_rk( grid &
5555
!
56-
#include <actual_new_args.inc>
56+
#include "actual_new_args.inc"
5757
!
5858
)
5959

@@ -63,15 +63,15 @@ END SUBROUTINE init_domain
6363

6464
SUBROUTINE init_domain_rk ( grid &
6565
!
66-
# include <dummy_new_args.inc>
66+
# include "dummy_new_args.inc"
6767
!
6868
)
6969
IMPLICIT NONE
7070

7171
! Input data.
7272
TYPE (domain), POINTER :: grid
7373

74-
# include <dummy_new_decl.inc>
74+
# include "dummy_new_decl.inc"
7575

7676
TYPE (grid_config_rec_type) :: config_flags
7777

@@ -108,7 +108,7 @@ SUBROUTINE init_domain_rk ( grid &
108108
REAL :: xa1, xal1,pii,hm1 ! data for intercomparison setup from dale
109109

110110
#ifdef DM_PARALLEL
111-
# include <data_calls.inc>
111+
# include "data_calls.inc"
112112
#endif
113113

114114

‎dyn_em/module_initialize_heldsuarez.F

+3-3
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ SUBROUTINE init_domain ( grid )
4545

4646
CALL init_domain_rk( grid &
4747
!
48-
#include <actual_new_args.inc>
48+
#include "actual_new_args.inc"
4949
!
5050
)
5151

@@ -55,15 +55,15 @@ END SUBROUTINE init_domain
5555

5656
SUBROUTINE init_domain_rk ( grid &
5757
!
58-
# include <dummy_new_args.inc>
58+
# include "dummy_new_args.inc"
5959
!
6060
)
6161
IMPLICIT NONE
6262

6363
! Input data.
6464
TYPE (domain), POINTER :: grid
6565

66-
# include <dummy_decl.inc>
66+
# include "dummy_decl.inc"
6767

6868
TYPE (grid_config_rec_type) :: config_flags
6969

‎dyn_em/module_initialize_hill2d_x.F

+3-3
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ SUBROUTINE init_domain ( grid )
5757

5858
CALL init_domain_rk( grid &
5959
!
60-
#include <actual_new_args.inc>
60+
#include "actual_new_args.inc"
6161
!
6262
)
6363

@@ -67,15 +67,15 @@ END SUBROUTINE init_domain
6767

6868
SUBROUTINE init_domain_rk ( grid &
6969
!
70-
# include <dummy_new_args.inc>
70+
# include "dummy_new_args.inc"
7171
!
7272
)
7373
IMPLICIT NONE
7474

7575
! Input data.
7676
TYPE (domain), POINTER :: grid
7777

78-
# include <dummy_new_decl.inc>
78+
# include "dummy_new_decl.inc"
7979

8080
TYPE (grid_config_rec_type) :: config_flags
8181

‎dyn_em/module_initialize_les.F

+4-4
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ SUBROUTINE init_domain ( grid )
5353

5454
CALL init_domain_rk( grid &
5555
!
56-
#include <actual_new_args.inc>
56+
#include "actual_new_args.inc"
5757
!
5858
)
5959

@@ -63,15 +63,15 @@ END SUBROUTINE init_domain
6363

6464
SUBROUTINE init_domain_rk ( grid &
6565
!
66-
# include <dummy_new_args.inc>
66+
# include "dummy_new_args.inc"
6767
!
6868
)
6969
IMPLICIT NONE
7070

7171
! Input data.
7272
TYPE (domain), POINTER :: grid
7373

74-
# include <dummy_new_decl.inc>
74+
# include "dummy_new_decl.inc"
7575

7676
TYPE (grid_config_rec_type) :: config_flags
7777

@@ -112,7 +112,7 @@ SUBROUTINE init_domain_rk ( grid &
112112
real :: randx
113113

114114
#ifdef DM_PARALLEL
115-
# include <data_calls.inc>
115+
# include "data_calls.inc"
116116
#endif
117117

118118

‎dyn_em/module_initialize_quarter_ss.F

+3-3
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ SUBROUTINE init_domain ( grid )
5353

5454
CALL init_domain_rk( grid &
5555
!
56-
#include <actual_new_args.inc>
56+
#include "actual_new_args.inc"
5757
!
5858
)
5959

@@ -63,15 +63,15 @@ END SUBROUTINE init_domain
6363

6464
SUBROUTINE init_domain_rk ( grid &
6565
!
66-
# include <dummy_new_args.inc>
66+
# include "dummy_new_args.inc"
6767
!
6868
)
6969
IMPLICIT NONE
7070

7171
! Input data.
7272
TYPE (domain), POINTER :: grid
7373

74-
# include <dummy_new_decl.inc>
74+
# include "dummy_new_decl.inc"
7575

7676
TYPE (grid_config_rec_type) :: config_flags
7777

‎dyn_em/module_initialize_scm_xy.F

+4-4
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ SUBROUTINE init_domain ( grid )
5757

5858
CALL init_domain_rk( grid &
5959
!
60-
#include <actual_new_args.inc>
60+
#include "actual_new_args.inc"
6161
!
6262
)
6363
END SUBROUTINE init_domain
@@ -66,7 +66,7 @@ END SUBROUTINE init_domain
6666

6767
SUBROUTINE init_domain_rk ( grid &
6868
!
69-
# include <dummy_new_args.inc>
69+
# include "dummy_new_args.inc"
7070
!
7171
)
7272

@@ -76,7 +76,7 @@ SUBROUTINE init_domain_rk ( grid &
7676
! Input data.
7777
TYPE (domain), POINTER :: grid
7878

79-
# include <dummy_new_decl.inc>
79+
# include "dummy_new_decl.inc"
8080

8181
TYPE (grid_config_rec_type) :: config_flags
8282

@@ -125,7 +125,7 @@ SUBROUTINE init_domain_rk ( grid &
125125

126126

127127
#ifdef DM_PARALLEL
128-
# include <data_calls.inc>
128+
# include "data_calls.inc"
129129
#endif
130130

131131

‎dyn_em/module_initialize_seabreeze2d_x.F

+4-4
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ SUBROUTINE init_domain ( grid )
5757

5858
CALL init_domain_rk( grid &
5959
!
60-
#include <actual_new_args.inc>
60+
#include "actual_new_args.inc"
6161
!
6262
)
6363
END SUBROUTINE init_domain
@@ -66,15 +66,15 @@ END SUBROUTINE init_domain
6666

6767
SUBROUTINE init_domain_rk ( grid &
6868
!
69-
# include <dummy_new_args.inc>
69+
# include "dummy_new_args.inc"
7070
!
7171
)
7272
IMPLICIT NONE
7373

7474
! Input data.
7575
TYPE (domain), POINTER :: grid
7676

77-
# include <dummy_new_decl.inc>
77+
# include "dummy_new_decl.inc"
7878

7979
TYPE (grid_config_rec_type) :: config_flags
8080

@@ -106,7 +106,7 @@ SUBROUTINE init_domain_rk ( grid &
106106
character (len=256) :: mminlu2
107107

108108
#ifdef DM_PARALLEL
109-
# include <data_calls.inc>
109+
# include "data_calls.inc"
110110
#endif
111111

112112

‎dyn_em/module_initialize_squall2d_x.F

+3-3
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ SUBROUTINE init_domain ( grid )
5656

5757
CALL init_domain_rk( grid &
5858
!
59-
#include <actual_new_args.inc>
59+
#include "actual_new_args.inc"
6060
!
6161
)
6262
END SUBROUTINE init_domain
@@ -65,15 +65,15 @@ END SUBROUTINE init_domain
6565

6666
SUBROUTINE init_domain_rk ( grid &
6767
!
68-
# include <dummy_new_args.inc>
68+
# include "dummy_new_args.inc"
6969
!
7070
)
7171
IMPLICIT NONE
7272

7373
! Input data.
7474
TYPE (domain), POINTER :: grid
7575

76-
# include <dummy_new_decl.inc>
76+
# include "dummy_new_decl.inc"
7777

7878
TYPE (grid_config_rec_type) :: config_flags
7979

0 commit comments

Comments
 (0)