Skip to content

Commit ce51d57

Browse files
jasonflemingjasonfleming
committed
Start of adcirc version support
1 parent 8f1ddb1 commit ce51d57

5 files changed

+58
-7
lines changed

‎config/mesh_defaults.sh

+35-1
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,7 @@ case $GRIDNAME in
176176
ADCPREPWALLTIME="02:00:00" # adcprep wall clock time, including partmesh
177177
NOWCASTWALLTIME="07:00:00" # longest nowcast wall clock time
178178
FORECASTWALLTIME="07:00:00" # forecast wall clock time
179+
adcircVersions=( "v56.0.2" )
179180
case $parameterPackage in
180181
"hardcoded")
181182
CONTROLTEMPLATE=CPRA23v01c_5kcms_fort.15.template
@@ -255,6 +256,7 @@ case $GRIDNAME in
255256
ADCPREPWALLTIME="01:00:00" # adcprep wall clock time, including partmesh
256257
NOWCASTWALLTIME="01:00:00" # longest nowcast wall clock time
257258
FORECASTWALLTIME="01:00:00" # forecast wall clock time
259+
adcircVersions=( "v56.0.2" )
258260
;;
259261
"LA_v19k-WithUpperAtch_chk")
260262
nodes=1593485
@@ -276,6 +278,7 @@ case $GRIDNAME in
276278
FORECASTWALLTIME="07:00:00" # forecast wall clock time
277279
# unit offset url https://asgs-static-assets.sfo2.digitaloceanspaces.com/offsets/unit_offset_LA_v19k-WithUpperAtch_chk.dat.xz
278280
UNITOFFSETFILE=unit_offset_LA_v19k-WithUpperAtch_chk.dat
281+
adcircVersions=( "v53release" )
279282
;;
280283
#
281284
"LA_v20a-WithUpperAtch_chk"|"LAv20a")
@@ -293,6 +296,7 @@ case $GRIDNAME in
293296
ADCPREPWALLTIME="02:00:00" # adcprep wall clock time, including partmesh
294297
NOWCASTWALLTIME="07:00:00" # longest nowcast wall clock time
295298
FORECASTWALLTIME="07:00:00" # forecast wall clock time
299+
adcircVersions=( "v53release" )
296300
case $parameterPackage in
297301
"hardcoded")
298302
CONTROLTEMPLATE=LA_v20a-WithUpperAtch.15.template
@@ -356,6 +360,7 @@ case $GRIDNAME in
356360
ADCPREPWALLTIME="02:00:00" # adcprep wall clock time, including partmesh
357361
NOWCASTWALLTIME="07:00:00" # longest nowcast wall clock time
358362
FORECASTWALLTIME="07:00:00" # forecast wall clock time
363+
adcircVersions=( "v53release" )
359364
case $parameterPackage in
360365
"hardcoded")
361366
CONTROLTEMPLATE=LAERDCv5i_10.194kcms.15.template
@@ -425,6 +430,7 @@ case $GRIDNAME in
425430
NOWCASTWALLTIME="01:00:00" # longest nowcast wall clock time
426431
FORECASTWALLTIME="01:00:00" # forecast wall clock time
427432
# FIXME: no unit offset url
433+
adcircVersions=( "v53release" )
428434
;;
429435
#
430436
"tx2008_r35h"|"TX2008")
@@ -449,6 +455,7 @@ case $GRIDNAME in
449455
FORECASTWALLTIME="07:00:00" # forecast wall clock time
450456
# unit offset url https://asgs-static-assets.sfo2.digitaloceanspaces.com/offsets/unit_offset_tx2008_r35h.grd.dat.xz
451457
UNITOFFSETFILE=unit_offset_tx2008_r35h.grd.dat
458+
adcircVersions=( "v53release" )
452459
;;
453460
#
454461
"tx2017"|"CTXCS2017")
@@ -474,6 +481,7 @@ case $GRIDNAME in
474481
NOWCASTWALLTIME="10:00:00" # longest nowcast wall clock time
475482
FORECASTWALLTIME="14:00:00" # forecast wall clock time
476483
# FIXME: no unit offset url
484+
adcircVersions=( "v53release" )
477485
;;
478486
#
479487
"tx2020a"|"TX2020a")
@@ -499,6 +507,7 @@ case $GRIDNAME in
499507
NOWCASTWALLTIME="10:00:00" # longest nowcast wall clock time
500508
FORECASTWALLTIME="14:00:00" # forecast wall clock time
501509
# FIXME: no unit offset url
510+
adcircVersions=( "v53release" )
502511
;;
503512
#
504513
"TXLA22a")
@@ -516,6 +525,7 @@ case $GRIDNAME in
516525
ADCPREPWALLTIME="10:00:00" # adcprep wall clock time,including partmesh
517526
NOWCASTWALLTIME="10:00:00" # longest nowcast wall clock time
518527
FORECASTWALLTIME="14:00:00" # forecast wall clock time
528+
adcircVersions=( "v53release" )
519529
case $parameterPackage in
520530
"hardcoded")
521531
CONTROLTEMPLATE=TXLA22a_fort.15.template # fort.15 template
@@ -581,6 +591,7 @@ case $GRIDNAME in
581591
NOWCASTWALLTIME="07:00:00" # longest nowcast wall clock time
582592
FORECASTWALLTIME="07:00:00" # forecast wall clock time
583593
# FIXME: no unit offset url
594+
adcircVersions=( "v53release" )
584595
;;
585596
#
586597
"NCv6d")
@@ -598,6 +609,7 @@ case $GRIDNAME in
598609
ADCPREPWALLTIME="02:00:00" # adcprep wall clock time, including partmesh
599610
NOWCASTWALLTIME="07:00:00" # longest nowcast wall clock time
600611
FORECASTWALLTIME="07:00:00" # forecast wall clock time
612+
adcircVersions=( "v53release" )
601613
case $parameterPackage in
602614
"hardcoded"|"default")
603615
# we don't have a hardcoded template set up for NCv6d
@@ -655,6 +667,7 @@ case $GRIDNAME in
655667
FORECASTWALLTIME="07:00:00" # forecast wall clock time
656668
# unit offset url https://asgs-static-assets.sfo2.digitaloceanspaces.com/offsets/unit_offset_nc_inundation_v9.99_rivers.dat.xz
657669
UNITOFFSETFILE=unit_offset_nc_inundation_v9.99_rivers.dat
670+
adcircVersions=( "v53release" )
658671
case $parameterPackage in
659672
"hardcoded")
660673
CONTROLTEMPLATE=nc_9.99wrivers_vortex_fort.15.template
@@ -727,6 +740,7 @@ case $GRIDNAME in
727740
FORECASTWALLTIME="07:00:00" # forecast wall clock time
728741
# unit offset url https://asgs-static-assets.sfo2.digitaloceanspaces.com/offsets/unit_offset_hsofs.dat.xz
729742
UNITOFFSETFILE=unit_offset_hsofs.dat
743+
adcircVersions=( "v53release" )
730744
;;
731745
"hsofs"|"HSOFS")
732746
#
@@ -748,6 +762,7 @@ case $GRIDNAME in
748762
UNITOFFSETFILE=unit_offset_hsofs.dat
749763
case $parameterPackage in
750764
"hardcoded")
765+
adcircVersions=( "v53release" "v56.0.2" )
751766
CONTROLTEMPLATE=hsofs_explicit.15.template
752767
# wind at 10m fort.15 template
753768
CONTROLTEMPLATENOROUGH=hsofs.nowindreduction.15.template
@@ -756,6 +771,7 @@ case $GRIDNAME in
756771
SWANDT=1800 # swan timestep / coupling interval (seconds)
757772
;;
758773
"default")
774+
adcircVersions=( "v56.0.2" )
759775
CONTROLTEMPLATE=hsofs-parameters.15.template
760776
# interaction between mesh and models:
761777
SWANDT=1800 # swan timestep / coupling interval (seconds)
@@ -807,6 +823,7 @@ case $GRIDNAME in
807823
FORECASTWALLTIME="24:00:00" # forecast wall clock time
808824
case $parameterPackage in
809825
"hardcoded")
826+
adcircVersions=( "v53release" "v56.0.2" )
810827
CONTROLTEMPLATE=SABv20a.15.template
811828
# wind at 10m fort.15 template
812829
CONTROLTEMPLATENOROUGH=SABv20a.nowindreduction.15.template
@@ -815,6 +832,7 @@ case $GRIDNAME in
815832
TIMESTEPSIZE=0.5 # adcirc time step size (seconds)
816833
;;
817834
"default")
835+
adcircVersions=( "v56.0.2" )
818836
CONTROLTEMPLATE=SABv20a.15.ASGS2024.1.template
819837
# numerics/physics (fort.15)
820838
TIMESTEPSIZE=0.5 # adcirc time step size (seconds)
@@ -877,6 +895,7 @@ case $GRIDNAME in
877895
FORECASTWALLTIME="07:00:00" # forecast wall clock time
878896
# unit offset url
879897
UNITOFFSETFILE=null
898+
adcircVersions=( "v53release" )
880899
;;
881900
#
882901
"southfl_v11-1_final"|"SFLv111")
@@ -903,6 +922,7 @@ case $GRIDNAME in
903922
NOWCASTWALLTIME="07:00:00" # longest nowcast wall clock time
904923
FORECASTWALLTIME="07:00:00" # forecast wall clock time
905924
# FIXME: no unit offset url
925+
adcircVersions=( "v53release" )
906926
;;
907927
#
908928
"CenFlv7"|"eccl_v7_geo_z")
@@ -926,6 +946,7 @@ case $GRIDNAME in
926946
NOWCASTWALLTIME="07:00:00" # longest nowcast wall clock time
927947
FORECASTWALLTIME="07:00:00" # forecast wall clock time
928948
# FIXME: no unit offset url
949+
adcircVersions=( "v53release" )
929950
;;
930951
#
931952
"FEMAR3")
@@ -949,6 +970,7 @@ case $GRIDNAME in
949970
FORECASTWALLTIME="07:00:00" # forecast wall clock time
950971
# https://asgs-static-assets.sfo2.digitaloceanspaces.com/offsets/unit_offset_FEMA_R3_20110303_MSL.dat.xz
951972
UNITOFFSETFILE=unit_offset_FEMA_R3_20110303_MSL.dat
973+
adcircVersions=( "v53release" )
952974
;;
953975
#
954976
"FEMAR2")
@@ -971,6 +993,7 @@ case $GRIDNAME in
971993
NOWCASTWALLTIME="07:00:00" # longest nowcast wall clock time
972994
FORECASTWALLTIME="07:00:00" # forecast wall clock time
973995
# no scalable unit water level correction file
996+
adcircVersions=( "v53release" )
974997
;;
975998
#
976999
"NAC2014")
@@ -990,13 +1013,15 @@ case $GRIDNAME in
9901013
FORECASTWALLTIME="07:00:00" # forecast wall clock time
9911014
case $parameterPackage in
9921015
"hardcoded")
1016+
adcircVersions=( "v53release" )
9931017
CONTROLTEMPLATE=NAC2014_R01.15.template
9941018
# wind at 10m fort.15 template
9951019
CONTROLTEMPLATENOROUGH=NAC2014_R01.nowindreduction.15.template
9961020
NAFILE=NAC2014_R01.13
9971021
nodal_attribute_default_values["sea_surface_height_above_geoid"]="0.109"
9981022
;;
9991023
"default")
1024+
adcircVersions=( "v53release" )
10001025
CONTROLTEMPLATE=NAC2014.15.ASGS2024.1.template
10011026
# numerics/physics (fort.15)
10021027
advection="off" # on|off for advection (NOLICA=1|0/NOLICAT=1|0)
@@ -1048,13 +1073,15 @@ case $GRIDNAME in
10481073
FORECASTWALLTIME="07:00:00" # forecast wall clock time
10491074
case $parameterPackage in
10501075
"hardcoded")
1076+
adcircVersions=( "v53release" "v56.0.2" )
10511077
CONTROLTEMPLATE=NGOM_RT_v19b.15.template_18kcms # fort.15 template
10521078
# wind at 10m fort.15 template
10531079
CONTROLTEMPLATENOROUGH=NGOM_RT_v19b.nowindreduction.15.template
10541080
NAFILE=NGOM_RT_v19b_chk.13
10551081
nodal_attribute_default_values["sea_surface_height_above_geoid"]="0.2"
10561082
;;
10571083
"default")
1084+
adcircVersions=( "v56.0.2" )
10581085
CONTROLTEMPLATE=NGOMv19.15.ASGS2024.1.template
10591086
# numerics/physics (fort.15)
10601087
advection="off" # on|off for advection (NOLICA=1|0/NOLICAT=1|0)
@@ -1112,13 +1139,15 @@ case $GRIDNAME in
11121139
FORECASTWALLTIME="07:00:00" # forecast wall clock time
11131140
case $parameterPackage in
11141141
"hardcoded")
1142+
adcircVersions=( "v53release" "v56.0.2" )
11151143
CONTROLTEMPLATE=EGOM-RT_v20b.15.template # fort.15 template
11161144
# wind at 10m fort.15 template
11171145
CONTROLTEMPLATENOROUGH=EGOM-RT_v20b.norough.15.template
11181146
NAFILE=EGOM-RT_v20b_asgs_chk.13
11191147
nodal_attribute_default_values["sea_surface_height_above_geoid"]="-0.106"
11201148
;;
11211149
"default")
1150+
adcircVersions=( "v56.0.2" )
11221151
CONTROLTEMPLATE=EGOMv20b.15.ASGS2024.1.template
11231152
# numerics/physics (fort.15)
11241153
advection="on" # on|off for advection (NOLICA=1|0/NOLICAT=1|0)
@@ -1174,13 +1203,15 @@ case $GRIDNAME in
11741203
FORECASTWALLTIME="01:00:00" # forecast wall clock time
11751204
case $parameterPackage in
11761205
"hardcoded")
1206+
adcircVersions=( "v53release" "v56.0.2" )
11771207
CONTROLTEMPLATE=shinnecock_asgs.fort.15.template
11781208
# wind at 10m fort.15 template
11791209
CONTROLTEMPLATENOROUGH=shinnecock_asgs.fort.15.template
11801210
h0=0.05
11811211
NAFILE="null"
11821212
;;
11831213
"default")
1214+
adcircVersions=( "v53release" "v56.0.2" )
11841215
CONTROLTEMPLATE=shinnecock-parameters.fort.15.template
11851216
NAFILE=shinnecock_nodal_attributes.template
11861217
# default physics parameters (that differ from the settings in config/model_defaults.sh
@@ -1220,6 +1251,7 @@ case $GRIDNAME in
12201251
NOWCASTWALLTIME="01:00:00" # longest nowcast wall clock time
12211252
FORECASTWALLTIME="01:00:00" # forecast wall clock time
12221253
UNITOFFSETFILE=null
1254+
adcircVersions=( "v53release" )
12231255
;;
12241256
"OPENWATERv1e")
12251257
#
@@ -1245,6 +1277,7 @@ case $GRIDNAME in
12451277
NOWCASTWALLTIME="07:00:00" # longest nowcast wall clock time
12461278
FORECASTWALLTIME="07:00:00" # forecast wall clock time
12471279
UNITOFFSETFILE=null
1280+
adcircVersions=( "v53release" )
12481281
;;
12491282
"PRVI15")
12501283
#
@@ -1269,6 +1302,7 @@ case $GRIDNAME in
12691302
NOWCASTWALLTIME="07:00:00" # longest nowcast wall clock time
12701303
FORECASTWALLTIME="07:00:00" # forecast wall clock time
12711304
UNITOFFSETFILE=null
1305+
adcircVersions=( "v53release" )
12721306
;;
12731307

12741308
*)
@@ -1289,4 +1323,4 @@ case $GRIDNAME in
12891323
exit 1
12901324
fi
12911325
;;
1292-
esac
1326+
esac

‎config/model_defaults.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
# ADCIRC parameters (fort.15) file
2828
parameterPackage="hardcoded" # use old (mostly) hardcoded fort.15 template and static nodal attributes
2929
controlParametersTemplate=$SCRIPTDIR/control-parameters-template.yaml
30-
adcirc_version="notset"
30+
adcircVersions=( "notset" )
3131
TIMESTEPSIZE="1.0" # ADCIRC time step in seconds
3232
WTIMINC=900 # time increment of meteorological data sets in seconds
3333
advection="on" # on|off for advection (NOLICA=1|0/NOLICAT=1|0)

‎control-parameters-template.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
---
22
adcirc_version: "%ADCIRCVER%"
3+
adcirc_version_support:
4+
%adcircVersions%
35
solver_time_integration: "%IM_ETC%"
46
initialization_length: %HINDCASTLENGTH%
57
time_weighting_coefficients: "%A00B00C00%"

‎control_file_gen.pl

+16-5
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
# [--dt timestep] [--nowcast] [--controltemplate templatefile] < storm1_fort.22
4242
#
4343
#--------------------------------------------------------------------------
44-
# Copyright(C) 2006--2024 Jason Fleming
44+
# Copyright(C) 2006--2025 Jason Fleming
4545
# Copyright(C) 2006, 2007 Brett Estrade
4646
#
4747
# This file is part of the ADCIRC Surge Guidance System (ASGS).
@@ -59,11 +59,22 @@
5959
# You should have received a copy of the GNU General Public License
6060
# along with the ASGS. If not, see <http://www.gnu.org/licenses/>.
6161
#--------------------------------------------------------------------------
62-
#
63-
#jgf20120124: standalone usage example for making a fort.15 for the
64-
# ec95d mesh. It was for a tides-only run.
65-
#perl ~/asgs/trunk/control_file_gen.pl --controltemplate ~/asgs/trunk/input/ec_95_fort.15_template --gridname fort.14 --cst 2012010100 --endtime 7 --dt 30.0 --nws 0 --hsformat binary --name hindcast --fort63freq 3600.0
62+
# Almost all features that are activated in the fort.15 file are
63+
# compatible with all versions of ADCIRC that are supported in ASGS
64+
# (v53release and later). However, certain features are only
65+
# supported in particular later versions of ADCIRC, as shown in the
66+
# following table:
6667

68+
#
69+
#--------------------------------------------------------------------------
70+
# The following table maps between the name of an adcirc version in ASGS
71+
# and the output from "adcirc -v"
72+
# ASGS Name | adcirc -v
73+
# ---------------+----------------
74+
# v53release | v53.05-modified
75+
# v55.02 |
76+
# v56.0.0-beta.2 |
77+
#--------------------------------------------------------------------------
6778
use strict;
6879
use warnings;
6980
use Getopt::Long;

‎generateDynamicInput.sh

+4
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,12 @@ generateDynamicInput()
104104
done
105105
layerWaves="off"
106106
fi
107+
# record adcirc version support (according to config/mesh_defaults.sh)
108+
avs="" ; for v in ${adcircVersions[*]}; do avs+=' - '$v$'\n' ; done
109+
# fill in the template
107110
sed \
108111
-e "s/%ADCIRCVER%/$(adcirc -v)/" \
112+
-e "s/%adcircVersions%/$(printf "$avs"/ \
109113
-e "s/%IM_ETC%/$solver_time_integration/" \
110114
-e "s/%HINDCASTLENGTH%/$HINDCASTLENGTH/" \
111115
-e "s/%A00B00C00%/$time_weighting_coefficients/" \

0 commit comments

Comments
 (0)