From e9d4867ff9e37465e07ec422d7acf9776061773d Mon Sep 17 00:00:00 2001
From: smsaleeb <smsaleeb@gmail.com>
Date: Fri, 15 Sep 2023 10:29:35 -0600
Subject: [PATCH] Fixes to Makefiles, update bin.block, update gitignore,
 update README for dprep.

---
 .gitignore              | 16 ++++++++-
 bin.block/Makefile      | 74 +++++++++++++++++++++++++++++++++++++++++
 bin.dp.grib1/Makefile   |  2 +-
 bin.dp.grib2/Makefile   |  2 +-
 bin.dp.grib2/README.txt |  7 ++++
 include.mk              |  2 +-
 6 files changed, 99 insertions(+), 4 deletions(-)
 create mode 100755 bin.block/Makefile

diff --git a/.gitignore b/.gitignore
index fff6f47..ca9ed71 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,13 +13,27 @@
 *.grb1
 *.grb2
 dp-p[0-9]*
+
 bin.block/example_modis_sst/*
 bin.block/example_reynolds_sst/*
+bin.block/mk-blkfiles*
+bin.block/CreateSSTblockfiles.sc
+bin.block/run_test_sstfiles.sc
+
 bin.dp.grib1/example_data/*
+bin.dp.grib1/dgrib*
+bin.dp.grib1/rams_wgrib
+
 bin.dp.grib2/example_data/*
-bin.revu/example_data/*
 bin.dp.grib2/wgrib*
+bin.dp.grib2/dgrib*
+
+bin.revu/example_data/*
+bin.revu/revu*
+
 bin.rams/dprep.test/*
+bin.rams/rams*
+bin.rams/cleanup.sc
 
 # Ignore external libraries
 misc/*
diff --git a/bin.block/Makefile b/bin.block/Makefile
new file mode 100755
index 0000000..97e7c8b
--- /dev/null
+++ b/bin.block/Makefile
@@ -0,0 +1,74 @@
+#Makefile
+###############################################################################
+# Include definitions
+###############################################################################
+include ../include.mk
+###############################################################################
+# Compiler commands
+###############################################################################
+INCLUDES  = $(UTILS_INCS) $(PAR_INCS) $(HDF5_INCS)
+F_CD1 = $(F_COMP) -c $(F_OPTS1) $(INCLUDES)
+F_CD2 = $(F_COMP) -c $(F_OPTS2) $(INCLUDES)
+C_CD  = $(C_COMP) -c $(C_OPTS)  $(INCLUDES) $(PAR_DEFS) $(HDF5_DEFS)
+
+C_CM =$(C_CD)  -D$(CMACH) $< && $(ARCH) $@ $(<F:.c=.o)   && rm -f $(<F:.c=.o)
+F_CM1=$(F_CD1) $<            && $(ARCH) $@ $(<F:.f90=.o) && rm -f $(<F:.f90=.o)
+F_CM2=$(F_CD2) $<            && $(ARCH) $@ $(<F:.f90=.o) && rm -f $(<F:.f90=.o)
+F_CM3=$(F_CD2) -D$(CMACH) $< && $(ARCH) $@ $(<F:.F90=.o) && rm -f $(<F:.F90=.o)
+
+################################################################################
+## File extension rules
+################################################################################
+$(ARC)(%.o): %.f90; $(F_CM2)
+
+$(ARC)(%.o): %.F90; $(F_CM3)
+
+$(ARC)(%.o): %.c;   $(C_CM)
+
+################################################################################
+# Define objects
+################################################################################
+OBJ = $(ARC)($(MODEL)/block/hdf5_f2c.o)  \
+      $(ARC)($(MODEL)/block/hdf5_utils.o) \
+      $(ARC)($(MODEL)/lib/rget.o)
+
+###############################################################################
+# Define archive and executable names
+###############################################################################
+BASE=mk-blkfiles
+EXE=$(BASE)-$(RAMS_VERSION)
+ARC=$(BASE)-$(RAMS_VERSION).a
+
+# Define main source.
+MAIN_OBJ = ./mk_main.o
+MAIN = $(MODEL)/block/mk_main.f90
+
+# Define targets.
+all: $(EXE)
+
+$(EXE): $(ARC) $(MAIN) FORCE
+	@echo ""
+	$(F_COMP) -o $(EXE) $(MAIN_OBJ) $(LOADER_OPTS) $(ARC) \
+	$(HDF5_LIBS) $(LIBS) $(PAR_LIBS)
+	rm -f *.o
+	@echo ""
+	@echo Finished building === $(EXE)
+	@echo ""
+
+$(MAIN): FORCE
+	@echo ""
+	$(F_CD2) $@
+
+$(ARC): $(OBJ)
+
+FORCE:
+
+check: FORCE
+	@echo ""
+	check
+
+clean:
+	@echo ""
+	rm -f $(ARC) $(EXE) $(BASE) *.o *.mod *.f
+	@echo ""
+
diff --git a/bin.dp.grib1/Makefile b/bin.dp.grib1/Makefile
index a2fd30b..bfff4c1 100755
--- a/bin.dp.grib1/Makefile
+++ b/bin.dp.grib1/Makefile
@@ -52,7 +52,7 @@ rams_wgrib:
 $(EXE): $(ARC) $(MAIN) FORCE
 	@echo ""
 	$(F_COMP) -o $(EXE) $(MAIN_OBJ) $(LOADER_OPTS) $(ARC) \
-        $(PAR_LIBS)
+	$(HDF5_LIBS) $(LIBS) $(PAR_LIBS)
 	rm -f *.o
 	@echo ""
 	@echo Finished building === $(EXE)
diff --git a/bin.dp.grib2/Makefile b/bin.dp.grib2/Makefile
index aad08c8..a1dc980 100755
--- a/bin.dp.grib2/Makefile
+++ b/bin.dp.grib2/Makefile
@@ -54,7 +54,7 @@ wgrib2:
 $(EXE): $(ARC) $(MAIN) FORCE
 	@echo ""
 	$(F_COMP) -o $(EXE) $(MAIN_OBJ) $(LOADER_OPTS) $(ARC) \
-        $(PAR_LIBS)
+	$(HDF5_LIBS) $(LIBS) $(PAR_LIBS)
 	rm -f *.o
 	@echo ""
 	@echo Finished building === $(EXE)
diff --git a/bin.dp.grib2/README.txt b/bin.dp.grib2/README.txt
index 3b55619..70fd31b 100644
--- a/bin.dp.grib2/README.txt
+++ b/bin.dp.grib2/README.txt
@@ -1,3 +1,9 @@
+Before compiling, you need a precompiled executable for "wgrib2".
+We have used version wgrib2 2.0.3 downloaded September 19, 2019.
+You will need to search for this software online and compile for your system.
+The executable name should be "wgrib2" and should be placed in this directory
+for the Makefile to find.
+
 1. Type "make" to compile after you have setup your ../include.mk file.
 
 2. Run sample executable like "dgrib-6.2.11" to see instructions on how to
@@ -12,3 +18,4 @@
    In these routines are the specfications for adding a new dataset. Grib
    names and numbers and labels can vary among datasets and each variation
    has to be customized as a new datatype.
+
diff --git a/include.mk b/include.mk
index 52c2990..acd56c7 100644
--- a/include.mk
+++ b/include.mk
@@ -20,7 +20,7 @@ MAKE=/usr/bin/make
 #############################################################################
 # Set your RAMS root path and version number.
 #############################################################################
-RAMS_ROOT=/home/smsaleeb/rams_steve_git/RAMS
+RAMS_ROOT=/home/smsaleeb/rams_git_dev
 RAMS_VERSION=6.3.04
 
 #############################################################################