======================================

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
gthompsnWRF · Nov 13, 2015 · 6ec5b30 · 6ec5b30
1 parent 72d2039
commit 6ec5b30
Show file tree

Hide file tree

Showing 58 changed files with 401 additions and 401 deletions.
diff --git a/arch/md_calls.inc b/arch/md_calls.inc
diff --git a/chem/chem_driver.F b/chem/chem_driver.F
@@ -192,7 +192,7 @@ end SUBROUTINE sum_pm_driver
    TYPE(domain) , TARGET          :: grid
    !
    !  Definitions of dummy arguments to solve
-# include <dummy_new_decl.inc>
+# include "dummy_new_decl.inc"
 # define NO_I1_OLD
 
    TYPE(grid_config_rec_type),  INTENT(IN   )    :: config_flags
@@ -1179,7 +1179,7 @@ end SUBROUTINE sum_pm_driver
    moist,                                                                             &
    vdrog3, ldrog, vdrog3_vbs, ldrog_vbs,                                              &
 !
-#include <call_to_kpp_mech_drive.inc>
+#include "call_to_kpp_mech_drive.inc"
 !
    ids,ide, jds,jde, kds,kde,                                                         &
    ims,ime, jms,jme, kms,kme,                                                         &

diff --git a/dyn_em/couple_or_uncouple_em.F b/dyn_em/couple_or_uncouple_em.F
@@ -33,7 +33,7 @@ SUBROUTINE couple_or_uncouple_em ( grid , config_flags , couple &
    TYPE(domain) , TARGET         :: grid
 
    !  Definitions of dummy arguments to solve
-#include <dummy_new_decl.inc>
+#include "dummy_new_decl.inc"
 
    !  WRF state bcs
    TYPE (grid_config_rec_type) , INTENT(IN)          :: config_flags

diff --git a/dyn_em/interp_domain_em.F b/dyn_em/interp_domain_em.F
@@ -21,7 +21,7 @@ SUBROUTINE interp_domain_em_part1 ( grid, ngrid, config_flags   &
          USE module_domain, ONLY : domain, get_ijk_from_grid
          USE module_configure, ONLY : grid_config_rec_type
          TYPE(domain), POINTER :: grid , ngrid
-#include <dummy_new_decl.inc>
+#include "dummy_new_decl.inc"
 
       INTEGER nlev
       INTEGER i,j,pig,pjg,cm,cn,nig,njg,k

diff --git a/dyn_em/module_initialize_b_wave.F b/dyn_em/module_initialize_b_wave.F
@@ -46,7 +46,7 @@ SUBROUTINE init_domain ( grid )
 
      CALL init_domain_rk( grid &
 !
-#include <actual_new_args.inc>
+#include "actual_new_args.inc"
 !
                         )
 
@@ -56,15 +56,15 @@ END SUBROUTINE init_domain
 
    SUBROUTINE init_domain_rk ( grid &
 !
-# include <dummy_new_args.inc>
+# include "dummy_new_args.inc"
 !
 )
    IMPLICIT NONE
 
    !  Input data.
    TYPE (domain), POINTER :: grid
 
-# include <dummy_decl.inc>
+# include "dummy_decl.inc"
 
    TYPE (grid_config_rec_type)              :: config_flags
 

diff --git a/dyn_em/module_initialize_convrad.F b/dyn_em/module_initialize_convrad.F
@@ -57,7 +57,7 @@ SUBROUTINE init_domain ( grid )
 
      CALL init_domain_rk( grid &
 !
-#include <actual_new_args.inc>
+#include "actual_new_args.inc"
 !
                         )
    END SUBROUTINE init_domain
@@ -66,15 +66,15 @@ END SUBROUTINE init_domain
 
    SUBROUTINE init_domain_rk ( grid &
 !
-# include <dummy_new_args.inc>
+# include "dummy_new_args.inc"
 !
 )
    IMPLICIT NONE
 
    !  Input data.
    TYPE (domain), POINTER :: grid
 
-# include <dummy_new_decl.inc>
+# include "dummy_new_decl.inc"
 
    TYPE (grid_config_rec_type)              :: config_flags
 
@@ -106,7 +106,7 @@ SUBROUTINE init_domain_rk ( grid &
    character (len=256) :: mminlu2
 
 #ifdef DM_PARALLEL
-#    include <data_calls.inc>
+#    include "data_calls.inc"
 #endif
 
 

diff --git a/dyn_em/module_initialize_fire.F b/dyn_em/module_initialize_fire.F
@@ -55,7 +55,7 @@ SUBROUTINE init_domain ( grid )
 
      CALL init_domain_rk( grid &
 !
-#include <actual_new_args.inc>
+#include "actual_new_args.inc"
 !
                         )
 
@@ -65,15 +65,15 @@ END SUBROUTINE init_domain
 
    SUBROUTINE init_domain_rk ( grid &
 !
-# include <dummy_new_args.inc>
+# include "dummy_new_args.inc"
 !
 )
    IMPLICIT NONE
 
    !  Input data.
    TYPE (domain), POINTER :: grid
 
-# include <dummy_new_decl.inc>
+# include "dummy_new_decl.inc"
 
    TYPE (grid_config_rec_type)              :: config_flags
 

diff --git a/dyn_em/module_initialize_grav2d_x.F b/dyn_em/module_initialize_grav2d_x.F
@@ -53,7 +53,7 @@ SUBROUTINE init_domain ( grid )
 
      CALL init_domain_rk( grid &
 !
-#include <actual_new_args.inc>
+#include "actual_new_args.inc"
 !
                         )
 
@@ -63,15 +63,15 @@ END SUBROUTINE init_domain
 
    SUBROUTINE init_domain_rk ( grid &
 !
-# include <dummy_new_args.inc>
+# include "dummy_new_args.inc"
 !
 )
    IMPLICIT NONE
 
    !  Input data.
    TYPE (domain), POINTER :: grid
 
-# include <dummy_new_decl.inc>
+# include "dummy_new_decl.inc"
 
    TYPE (grid_config_rec_type)              :: config_flags
 
@@ -108,7 +108,7 @@ SUBROUTINE init_domain_rk ( grid &
    REAL    :: xa1, xal1,pii,hm1  !  data for intercomparison setup from dale
 
 #ifdef DM_PARALLEL
-#    include <data_calls.inc>
+#    include "data_calls.inc"
 #endif
 
 

diff --git a/dyn_em/module_initialize_heldsuarez.F b/dyn_em/module_initialize_heldsuarez.F
@@ -45,7 +45,7 @@ SUBROUTINE init_domain ( grid )
 
      CALL init_domain_rk( grid &
 !
-#include <actual_new_args.inc>
+#include "actual_new_args.inc"
 !
                         )
 
@@ -55,15 +55,15 @@ END SUBROUTINE init_domain
 
    SUBROUTINE init_domain_rk ( grid &
 !
-# include <dummy_new_args.inc>
+# include "dummy_new_args.inc"
 !
 )
    IMPLICIT NONE
 
    !  Input data.
    TYPE (domain), POINTER :: grid
 
-# include <dummy_decl.inc>
+# include "dummy_decl.inc"
 
    TYPE (grid_config_rec_type)              :: config_flags
 

diff --git a/dyn_em/module_initialize_hill2d_x.F b/dyn_em/module_initialize_hill2d_x.F
@@ -57,7 +57,7 @@ SUBROUTINE init_domain ( grid )
 
      CALL init_domain_rk( grid &
 !
-#include <actual_new_args.inc>
+#include "actual_new_args.inc"
 !
                         )
 
@@ -67,15 +67,15 @@ END SUBROUTINE init_domain
 
    SUBROUTINE init_domain_rk ( grid &
 !
-# include <dummy_new_args.inc>
+# include "dummy_new_args.inc"
 !
 )
    IMPLICIT NONE
 
    !  Input data.
    TYPE (domain), POINTER :: grid
 
-# include <dummy_new_decl.inc>
+# include "dummy_new_decl.inc"
 
    TYPE (grid_config_rec_type)              :: config_flags
 

diff --git a/dyn_em/module_initialize_les.F b/dyn_em/module_initialize_les.F
@@ -53,7 +53,7 @@ SUBROUTINE init_domain ( grid )
 
      CALL init_domain_rk( grid &
 !
-#include <actual_new_args.inc>
+#include "actual_new_args.inc"
 !
                         )
 
@@ -63,15 +63,15 @@ END SUBROUTINE init_domain
 
    SUBROUTINE init_domain_rk ( grid &
 !
-# include <dummy_new_args.inc>
+# include "dummy_new_args.inc"
 !
 )
    IMPLICIT NONE
 
    !  Input data.
    TYPE (domain), POINTER :: grid
 
-# include <dummy_new_decl.inc>
+# include "dummy_new_decl.inc"
 
    TYPE (grid_config_rec_type)              :: config_flags
 
@@ -112,7 +112,7 @@ SUBROUTINE init_domain_rk ( grid &
    real :: randx
 
 #ifdef DM_PARALLEL
-#    include <data_calls.inc>
+#    include "data_calls.inc"
 #endif
 
 

diff --git a/dyn_em/module_initialize_quarter_ss.F b/dyn_em/module_initialize_quarter_ss.F
@@ -53,7 +53,7 @@ SUBROUTINE init_domain ( grid )
 
      CALL init_domain_rk( grid &
 !
-#include <actual_new_args.inc>
+#include "actual_new_args.inc"
 !
                         )
 
@@ -63,15 +63,15 @@ END SUBROUTINE init_domain
 
    SUBROUTINE init_domain_rk ( grid &
 !
-# include <dummy_new_args.inc>
+# include "dummy_new_args.inc"
 !
 )
    IMPLICIT NONE
 
    !  Input data.
    TYPE (domain), POINTER :: grid
 
-# include <dummy_new_decl.inc>
+# include "dummy_new_decl.inc"
 
    TYPE (grid_config_rec_type)              :: config_flags
 

diff --git a/dyn_em/module_initialize_scm_xy.F b/dyn_em/module_initialize_scm_xy.F
@@ -57,7 +57,7 @@ SUBROUTINE init_domain ( grid )
 
      CALL init_domain_rk( grid &
 !
-#include <actual_new_args.inc>
+#include "actual_new_args.inc"
 !
                         )
    END SUBROUTINE init_domain
@@ -66,7 +66,7 @@ END SUBROUTINE init_domain
 
    SUBROUTINE init_domain_rk ( grid &
 !
-# include <dummy_new_args.inc>
+# include "dummy_new_args.inc"
 !
 )
 
@@ -76,7 +76,7 @@ SUBROUTINE init_domain_rk ( grid &
    !  Input data.
    TYPE (domain), POINTER :: grid
 
-# include <dummy_new_decl.inc>
+# include "dummy_new_decl.inc"
 
    TYPE (grid_config_rec_type)              :: config_flags
 
@@ -125,7 +125,7 @@ SUBROUTINE init_domain_rk ( grid &
 
 
 #ifdef DM_PARALLEL
-#    include <data_calls.inc>
+#    include "data_calls.inc"
 #endif
 
 

diff --git a/dyn_em/module_initialize_seabreeze2d_x.F b/dyn_em/module_initialize_seabreeze2d_x.F
@@ -57,7 +57,7 @@ SUBROUTINE init_domain ( grid )
 
      CALL init_domain_rk( grid &
 !
-#include <actual_new_args.inc>
+#include "actual_new_args.inc"
 !
                         )
    END SUBROUTINE init_domain
@@ -66,15 +66,15 @@ END SUBROUTINE init_domain
 
    SUBROUTINE init_domain_rk ( grid &
 !
-# include <dummy_new_args.inc>
+# include "dummy_new_args.inc"
 !
 )
    IMPLICIT NONE
 
    !  Input data.
    TYPE (domain), POINTER :: grid
 
-# include <dummy_new_decl.inc>
+# include "dummy_new_decl.inc"
 
    TYPE (grid_config_rec_type)              :: config_flags
 
@@ -106,7 +106,7 @@ SUBROUTINE init_domain_rk ( grid &
    character (len=256) :: mminlu2
 
 #ifdef DM_PARALLEL
-#    include <data_calls.inc>
+#    include "data_calls.inc"
 #endif
 
 

diff --git a/dyn_em/module_initialize_squall2d_x.F b/dyn_em/module_initialize_squall2d_x.F
@@ -56,7 +56,7 @@ SUBROUTINE init_domain ( grid )
 
      CALL init_domain_rk( grid &
 !
-#include <actual_new_args.inc>
+#include "actual_new_args.inc"
 !
                         )
    END SUBROUTINE init_domain
@@ -65,15 +65,15 @@ END SUBROUTINE init_domain
 
    SUBROUTINE init_domain_rk ( grid &
 !
-# include <dummy_new_args.inc>
+# include "dummy_new_args.inc"
 !
 )
    IMPLICIT NONE
 
    !  Input data.
    TYPE (domain), POINTER :: grid
 
-# include <dummy_new_decl.inc>
+# include "dummy_new_decl.inc"
 
    TYPE (grid_config_rec_type)              :: config_flags