Clean up redundant code, Registry checks + improvements, and simplification of certain defines

.gitignore

@@ -17,3 +17,17 @@
 configure.wrf*
 *.backup
 *.f90
+_build/
+# New (and old) things we should ignore
+wrf_config.cmake
+*.nc
+rsl.out.*
+rsl.error.*
+ndown
+real
+tc
+ideal
+wrf
+wrfbdy_d*
+wrfinput_d*
+wrfout_d*

dyn_em/module_advect_em.F

@@ -1,7 +1,7 @@
 
 !WRF:MODEL_LAYER:DYNAMICS
 !
-#if ( defined(ADVECT_KERNEL) )
+#ifdef ADVECT_KERNEL
 ! cpp -traditional-cpp -P -DADVECT_KERNEL module_advect_em.F > advection_kernel.f90
 ! gfortran -ffree-form -ffree-line-length-none advection_kernel.f90
 ! ./a.out
@@ -111,7 +111,7 @@ SUBROUTINE column (loop , data_list, its,ite)
 
 END SUBROUTINE column
 !----------------------------------------------------------------
-#elif ( ! defined(ADVECT_KERNEL) )
+#else
 
 MODULE module_advect_em
 
@@ -4357,7 +4357,7 @@ SUBROUTINE advect_scalar   ( field, field_old, tendency,    &
    ENDIF vert_order_test
 
 END SUBROUTINE advect_scalar
-#if ( ! defined(ADVECT_KERNEL) )
+#ifndef ADVECT_KERNEL
 
 !---------------------------------------------------------------------------------
 
@@ -10543,7 +10543,7 @@ END SUBROUTINE advect_scalar_mono
 
 !-----------------------------------------------------------
 
-#if ( defined(ADVECT_KERNEL) )
+#ifdef ADVECT_KERNEL
 
 END MODULE advection_kernel
 !================================================================
@@ -10851,7 +10851,7 @@ PROGRAM feeder
 
 END PROGRAM feeder
 #endif
-#if ( !defined(ADVECT_KERNEL) )
+#ifndef ADVECT_KERNEL
 
 !---------------------------------------------------------------------------------
 

dyn_em/module_first_rk_step_part1.F

@@ -925,7 +925,7 @@ SUBROUTINE first_rk_step_part1 (   grid , config_flags              &
      &        ,iopt_crop=config_flags%opt_crop, iopt_irr=config_flags%opt_irr    &
      &        ,iopt_irrm=config_flags%opt_irrm                                   &
      &        ,iopt_infdv=config_flags%opt_infdv,iopt_tdrn=config_flags%opt_tdrn &
-     &        ,soiltstep=config_flags%soiltstep
+     &        ,soiltstep=config_flags%soiltstep                                      &
      &        , isnowxy=grid%isnowxy  ,    tvxy=grid%tvxy    ,    tgxy=grid%tgxy     &
      &        ,canicexy=grid%canicexy ,canliqxy=grid%canliqxy,   eahxy=grid%eahxy    &
      &        ,   tahxy=grid%tahxy    ,    cmxy=grid%cmxy    ,    chxy=grid%chxy     &

external/atm_ocn/cmpcomm.F

@@ -1,4 +1,4 @@
-#if defined( DM_PARALLEL ) 
+#ifdef DM_PARALLEL
       MODULE CMP_COMM
 
       implicit none

external/io_adios2/wrf_io.F90

@@ -702,9 +702,9 @@ subroutine Transpose(IO,MemoryOrder,di, Field,l1,l2,m1,m2,n1,n2 &
 
    call LowerCase(MemoryOrder,MemOrd)
    select case (MemOrd)
-
- !#define XDEX(A,B,C) A-A ## 1+1+(A ## 2-A ## 1+1)*((B-B ## 1)+(C-C ## 1)*(B ## 2-B ## 1+1))
- ! define(`XDEX',($1-``$1''1+1+(``$1''2-``$1''1+1)*(($2-``$2''1)+($3-``$3''1)*(``$2''2-``$2''1+1))))
+! Cannot use following define due to gfortran cpp traditional mode concatenation limitations 
+!#define XDEX(A,B,C) A-A ## 1+1+(A ## 2-A ## 1+1)*((B-B ## 1)+(C-C ## 1)*(B ## 2-B ## 1+1))
+! define(`XDEX',($1-``$1''1+1+(``$1''2-``$1''1+1)*(($2-``$2''1)+($3-``$3''1)*(``$2''2-``$2''1+1))))
      case ('xzy')
 #undef  DFIELD
 #define DFIELD XField(1:di,XDEX(i,k,j))

external/io_grib1/Makefile

@@ -10,7 +10,7 @@
 #
 # Specity location for Makefiles that are included.
 #
-INCLUDEDIRS = -I. -I./MEL_grib1 -Igrib1_util -I../io_grib_share -I../
+INCLUDEDIRS = -I. -I./MEL_grib1 -Igrib1_util -I../io_grib_share -I../ -I../ioapi_share
 BUILD_DIR = $(IO_GRIB_SHARE_DIR)../io_grib_share/build
 #
 # Specify directory that output library is to be put in.

external/io_grib2/g2lib/dec_png.c

@@ -88,7 +88,7 @@ int DEC_PNG(unsigned char *pngbuf,g2int *width,g2int *height,char *cout)
 
 /*    Set new custom read function    */
 
-    png_set_read_fn(png_ptr,(voidp)&read_io_ptr,(png_rw_ptr)user_read_data);
+    png_set_read_fn(png_ptr,(png_voidp)&read_io_ptr,(png_rw_ptr)user_read_data);
 /*     png_init_io(png_ptr, fptr);   */
 
 /*     Read and decode PNG stream   */

external/io_grib2/g2lib/enc_png.c

@@ -88,7 +88,7 @@ int ENC_PNG(char *data,g2int *width,g2int *height,g2int *nbits,char *pngbuf)
 
 /*    Set new custom write functions    */
 
-    png_set_write_fn(png_ptr,(voidp)&write_io_ptr,(png_rw_ptr)user_write_data,
+    png_set_write_fn(png_ptr,(png_voidp)&write_io_ptr,(png_rw_ptr)user_write_data,
                     (png_flush_ptr)user_flush_data);
 /*    png_init_io(png_ptr, fptr);   */
 /*    png_set_compression_level(png_ptr, Z_BEST_COMPRESSION);  */

external/io_grib_share/Makefile

@@ -22,9 +22,9 @@ LIB_DEST = .
 #    CXX_INCLUDES is for C++ files
 #    C_INCLUDES is for C files
 #
-C_INCLUDES   = -I.
-CXX_INCLUDES = -I.
-F_INCLUDES   = -I.
+C_INCLUDES   = -I. -I../ioapi_share
+CXX_INCLUDES = -I. -I../ioapi_share
+F_INCLUDES   = -I. -I../ioapi_share
 AR           = ar
 ARFLAGS      = cruv