Merge branch 'develop' of https://github.com/NOAA-SWPC/WAM into featu…

…re/esmf-update

configure

@@ -9095,7 +9095,7 @@ esac
 
 
 # Output Makefiles
-ac_config_files="$ac_config_files Makefile src/Makefile src/fim/Makefile src/gen/Makefile src/gsm/Makefile src/gsm/dyn/Makefile src/gsm/libutil/Makefile src/gsm/phys/Makefile src/io/Makefile src/nmm/Makefile src/phys/Makefile src/post/Makefile src/share/Makefile"
+ac_config_files="$ac_config_files Makefile src/Makefile src/gen/Makefile src/gsm/Makefile src/gsm/dyn/Makefile src/gsm/libutil/Makefile src/gsm/phys/Makefile src/io/Makefile src/phys/Makefile src/post/Makefile src/share/Makefile"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -9849,14 +9849,12 @@ do
     "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
-    "src/fim/Makefile") CONFIG_FILES="$CONFIG_FILES src/fim/Makefile" ;;
     "src/gen/Makefile") CONFIG_FILES="$CONFIG_FILES src/gen/Makefile" ;;
     "src/gsm/Makefile") CONFIG_FILES="$CONFIG_FILES src/gsm/Makefile" ;;
     "src/gsm/dyn/Makefile") CONFIG_FILES="$CONFIG_FILES src/gsm/dyn/Makefile" ;;
     "src/gsm/libutil/Makefile") CONFIG_FILES="$CONFIG_FILES src/gsm/libutil/Makefile" ;;
     "src/gsm/phys/Makefile") CONFIG_FILES="$CONFIG_FILES src/gsm/phys/Makefile" ;;
     "src/io/Makefile") CONFIG_FILES="$CONFIG_FILES src/io/Makefile" ;;
-    "src/nmm/Makefile") CONFIG_FILES="$CONFIG_FILES src/nmm/Makefile" ;;
     "src/phys/Makefile") CONFIG_FILES="$CONFIG_FILES src/phys/Makefile" ;;
     "src/post/Makefile") CONFIG_FILES="$CONFIG_FILES src/post/Makefile" ;;
     "src/share/Makefile") CONFIG_FILES="$CONFIG_FILES src/share/Makefile" ;;

configure.ac

@@ -271,14 +271,12 @@ AM_PROG_AR
 # Output Makefiles
 AC_CONFIG_FILES([Makefile
                  src/Makefile
-                 src/fim/Makefile
                  src/gen/Makefile
                  src/gsm/Makefile
                  src/gsm/dyn/Makefile
                  src/gsm/libutil/Makefile
                  src/gsm/phys/Makefile
                  src/io/Makefile
-                 src/nmm/Makefile
                  src/phys/Makefile
                  src/post/Makefile
                  src/share/Makefile])

src/Makefile.am

@@ -1,22 +1,20 @@
-SUBDIRS = post share phys io fim gen gsm nmm .
+SUBDIRS = post share phys io gen gsm .
 
 lib_LIBRARIES = libwam.a
 
 libwam_a_SOURCES = module_ATM_INTERNAL_STATE.F90 wamCap.F90
 
 libwam_a_FCFLAGS = -I $(top_srcdir)/include \
-	$(FC_MODINC) fim $(FC_MODINC) gen $(FC_MODINC) gsm $(FC_MODINC) nmm \
+	$(FC_MODINC) gen $(FC_MODINC) gsm \
 	$(FC_MODINC) share $(FC_MODINC) phys $(FC_MODINC) io
 
 libwam_a_LIBADD = \
-	fim/*.$(OBJEXT) \
 	gen/*.$(OBJEXT) \
 	gsm/*.$(OBJEXT) \
 	gsm/dyn/*.$(OBJEXT) \
 	gsm/libutil/*.$(OBJEXT) \
 	gsm/phys/*.$(OBJEXT) \
 	io/*.$(OBJEXT) \
-	nmm/*.$(OBJEXT) \
 	phys/*.$(OBJEXT) \
 	post/*.$(OBJEXT) \
 	share/*.$(OBJEXT)

src/Makefile.in

@@ -139,10 +139,10 @@ am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@)
 am__v_AR_0 = @echo "  AR      " $@;
 am__v_AR_1 = 
 libwam_a_AR = $(AR) $(ARFLAGS)
-libwam_a_DEPENDENCIES = fim/*.$(OBJEXT) gen/*.$(OBJEXT) \
-	gsm/*.$(OBJEXT) gsm/dyn/*.$(OBJEXT) gsm/libutil/*.$(OBJEXT) \
-	gsm/phys/*.$(OBJEXT) io/*.$(OBJEXT) nmm/*.$(OBJEXT) \
-	phys/*.$(OBJEXT) post/*.$(OBJEXT) share/*.$(OBJEXT)
+libwam_a_DEPENDENCIES = gen/*.$(OBJEXT) gsm/*.$(OBJEXT) \
+	gsm/dyn/*.$(OBJEXT) gsm/libutil/*.$(OBJEXT) \
+	gsm/phys/*.$(OBJEXT) io/*.$(OBJEXT) phys/*.$(OBJEXT) \
+	post/*.$(OBJEXT) share/*.$(OBJEXT)
 am_libwam_a_OBJECTS = libwam_a-module_ATM_INTERNAL_STATE.$(OBJEXT) \
 	libwam_a-wamCap.$(OBJEXT)
 libwam_a_OBJECTS = $(am_libwam_a_OBJECTS)
@@ -396,22 +396,20 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-SUBDIRS = post share phys io fim gen gsm nmm .
+SUBDIRS = post share phys io gen gsm .
 lib_LIBRARIES = libwam.a
 libwam_a_SOURCES = module_ATM_INTERNAL_STATE.F90 wamCap.F90
 libwam_a_FCFLAGS = -I $(top_srcdir)/include \
-	$(FC_MODINC) fim $(FC_MODINC) gen $(FC_MODINC) gsm $(FC_MODINC) nmm \
+	$(FC_MODINC) gen $(FC_MODINC) gsm \
 	$(FC_MODINC) share $(FC_MODINC) phys $(FC_MODINC) io
 
 libwam_a_LIBADD = \
-	fim/*.$(OBJEXT) \
 	gen/*.$(OBJEXT) \
 	gsm/*.$(OBJEXT) \
 	gsm/dyn/*.$(OBJEXT) \
 	gsm/libutil/*.$(OBJEXT) \
 	gsm/phys/*.$(OBJEXT) \
 	io/*.$(OBJEXT) \
-	nmm/*.$(OBJEXT) \
 	phys/*.$(OBJEXT) \
 	post/*.$(OBJEXT) \
 	share/*.$(OBJEXT)