Owi integration

.gitignore

@@ -19,7 +19,7 @@ _plots/
 *.xyz
 scratch/*
 !scratch/README.txt
-
+*.nc
 # log files
 *.log
 

examples/storm-surge/isaac/Makefile

@@ -20,15 +20,19 @@ SETPLOT_FILE = setplot.py      # File containing function to set plots
 PLOTDIR = _plots               # Directory for plots
 
 # Environment variable FC should be set to fortran compiler, e.g. gfortran
-FFLAGS ?=
+FFLAGS += -DNETCDF -I/opt/homebrew/include -L/opt/homebrew/lib -lnetcdff -O2 -fopenmp #--g -fbacktrace -fbounds-check#-O0 -W -Wall -fbounds-check -fcheck=all -pedantic-errors -Wunderflow -fbacktrace -ffpe-trap=invalid,zero,overflow -g
+LFLAGS += $(FFLAGS) 
 
 # ---------------------------------
 # package sources for this program:
 # ---------------------------------
 
+AMRLIB = $(CLAW)/amrclaw/src/2d
 GEOLIB = $(CLAW)/geoclaw/src/2d/shallow
 include $(GEOLIB)/Makefile.geoclaw
 
+NEWAMR = ../../new_fortran_amrclaw
+NEWGEO = ../../new_fortran_geoclaw
 # ---------------------------------------
 # package sources specifically to exclude
 # (i.e. if a custom replacement source 
@@ -55,14 +59,19 @@ SOURCES = \
 #-------------------------------------------------------------------
 # Include Makefile containing standard definitions and make options:
 include $(CLAWMAKE)
-
-
 # Construct the topography data
-.PHONY: all
+.PHONY: input all fgmax_plots
 
-all:
-	$(MAKE) .plots
-	$(MAKE) .htmls
+input:
+	python make_input_files.py
 
+fgmax_plots:
+	python process_fgmax.py
 
+all:
+	$(MAKE) .exe
+	$(MAKE) input
+	$(MAKE) output
+	$(MAKE) plots
+	$(MAKE) fgmax_plots
 ### DO NOT remove this line - make depends on it ###

examples/storm-surge/isaac_ascii_data/Makefile

@@ -0,0 +1,77 @@
+
+# Makefile for Clawpack code in this directory.
+# This version only sets the local files and frequently changed
+# options, and then includes the standard makefile pointed to by CLAWMAKE.
+CLAWMAKE = $(CLAW)/clawutil/src/Makefile.common
+
+# See the above file for details and a list of make options, or type
+#   make .help
+# at the unix prompt.
+
+
+# Adjust these variables if desired:
+# ----------------------------------
+
+CLAW_PKG = geoclaw                  # Clawpack package to use
+EXE = xgeoclaw                 # Executable to create
+SETRUN_FILE = setrun.py        # File containing function to make data
+OUTDIR = _output               # Directory for output
+SETPLOT_FILE = setplot.py      # File containing function to set plots
+PLOTDIR = _plots               # Directory for plots
+
+# Environment variable FC should be set to fortran compiler, e.g. gfortran
+FFLAGS += #-DNETCDF -I/opt/homebrew/include -L/opt/homebrew/lib -lnetcdff -O2 -fopenmp #--g -fbacktrace -fbounds-check#-O0 -W -Wall -fbounds-check -fcheck=all -pedantic-errors -Wunderflow -fbacktrace -ffpe-trap=invalid,zero,overflow -g
+LFLAGS += $(FFLAGS) 
+
+# ---------------------------------
+# package sources for this program:
+# ---------------------------------
+
+AMRLIB = $(CLAW)/amrclaw/src/2d
+GEOLIB = $(CLAW)/geoclaw/src/2d/shallow
+include $(GEOLIB)/Makefile.geoclaw
+
+NEWAMR = ../../new_fortran_amrclaw
+NEWGEO = ../../new_fortran_geoclaw
+# ---------------------------------------
+# package sources specifically to exclude
+# (i.e. if a custom replacement source 
+#  under a different name is provided)
+# ---------------------------------------
+
+EXCLUDE_MODULES = \
+
+EXCLUDE_SOURCES = \
+
+# ----------------------------------------
+# List of custom sources for this program:
+# ----------------------------------------
+
+RIEMANN = $(CLAW)/riemann/src
+
+MODULES = \
+
+SOURCES = \
+  $(RIEMANN)/rpn2_geoclaw.f \
+  $(RIEMANN)/rpt2_geoclaw.f \
+  $(RIEMANN)/geoclaw_riemann_utils.f \
+
+#-------------------------------------------------------------------
+# Include Makefile containing standard definitions and make options:
+include $(CLAWMAKE)
+# Construct the topography data
+.PHONY: input all fgmax_plots
+
+input:
+	python make_input_files.py
+
+fgmax_plots:
+	python process_fgmax.py
+
+all:
+	$(MAKE) .exe
+	$(MAKE) input
+	$(MAKE) output
+	$(MAKE) plots
+	$(MAKE) fgmax_plots
+### DO NOT remove this line - make depends on it ###

examples/storm-surge/isaac_ascii_data/isaac.info

@@ -0,0 +1,9 @@
+## Control file for OWI ascii wind and pressure data files ##
+## Edit Files to include all wind and pressure data per storm ##
+## Ensure data remains in the below format ##
+## Must include absolute path to the wind and pressure files ##
+
+201208290000                          =: landfall_date    # Date of landfall for the storm
+"clawpack/geoclaw/examples/storm-surge/isaac_ascii_data/isaac.WIN"                           =: wind_field       # path to wind forcing file
+'clawpack/geoclaw/examples/storm-surge/isaac_ascii_data/isaac.PRE'                           =: pressure_field   # path to pressure forcing file
+0                                     =: regional_forcing # 0 for only basin forcing, 1 for regional 

examples/storm-surge/isaac_ascii_data/parse_storm_data.py

@@ -0,0 +1,19 @@
+from clawpack.geoclaw.surge import storm
+import os
+
+"""
+This script will convert a wind and pressure field pair of files into a netcdf
+for use in geoclaw's data derived storm objects
+
+The ability to run both netcdf files and the original .win and .pre files is now implemented as well
+In the setrun.py set the storm_specification_type as -2 for netcdf or -3 for ascii data derived inputs
+"""
+
+storm_path = os.environ['CLAW']
+storm_file = os.path.join(storm_path, 'isaac_data')
+# Instantiate the class
+storm = storm.DataDerivedStorms(storm_file, wind_file_ext='WIN', pressure_file_ext='PRE')
+storm.parse_data(landfall_time='2012-08-29T00:00:00')
+
+output_name = os.path.join(storm_path,'isaac_data_derived')
+storm.write_data_derived(output_name)