resolves #1354

StormSurgeLive · Jul 28, 2024 · 27db6df · 27db6df
1 parent f64128d
commit 27db6df
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 8 deletions.
diff --git a/control_file_gen.pl b/control_file_gen.pl
@@ -395,6 +395,7 @@
 my $outputWindDrag = $p->{metControl}->{outputWindDrag} eq "yes" ? "T" : "F";
 my $invertedBarometerOnElevationBoundary = $p->{metControl}->{invertedBarometerOnElevationBoundary} eq "yes" ? "T" : "F";
 my $met_control_line ="&metControl WindDragLimit=$p->{metControl}->{WindDragLimit}, DragLawString=\"$p->{metControl}->{DragLawString}\", outputWindDrag=$outputWindDrag, invertedBarometerOnElevationBoundary=$invertedBarometerOnElevationBoundary /";
+
 #
 # construct wetDryControl namelist
 # &wetDryControl outputNodeCode=logicalValue, outputNOFF=logicalValue, noffActive=logicalValue
@@ -619,6 +620,26 @@
     s/%wetdry_control_namelist%/$wetdry_control_line/;
     s/%inundation_output_control_namelist%/$inundation_output_control_line/;
     s/%dynamic_water_level_correction_namelist%/$dynamic_water_level_correction_line/;
+    # individual namelist parameters
+    s/%WindDragLimit%/$p->{metControl}->{WindDragLimit}/;          # &metControl
+    s/%DragLawString%/\"$p->{metControl}->{DragLawString}\"/;
+    s/%outputWindDrag%/$outputWindDrag/;
+    s/%invertedBarometerOnElevationBoundary%/$invertedBarometerOnElevationBoundary/;
+    s/%outputNodeCode%/$outputNodeCode/;                           # &wetDryControl
+    s/%outputNOFF%/$outputNOFF/;
+    s/%noffActive%/$noffActive/;
+    s/%slim%/$p->{wetDryControl}->{slim}/;
+    s/%windlim%/$windlim/;
+    s/%directvelWD%/$directvelWD/;
+    s/%useHF%/$useHF/;
+    s/%inundationOutput%/$inundationOutput/;                       # &inundationOutputControl
+    s/%inunThresh%/$p->{inundationOutputControl}->{inunThresh}/;
+    s/%SWAN_OutputTPS%/$SWAN_OutputTPS/;                           #  &SWANOutputControl
+    s/%SWAN_OutputTM01%/$SWAN_OutputTM01/;
+    s/%SWAN_OutputHS%/$SWAN_OutputHS/;
+    s/%SWAN_OutputDIR%/$SWAN_OutputDIR/;
+    s/%SWAN_OutputTMM10%/$SWAN_OutputTMM10/;
+    s/%SWAN_OutputTM02%/$SWAN_OutputTM02/;
     #
     unless (/NO LINE HERE/) {
        print $_;

diff --git a/input/meshes/SABv20a/SABv20a.15.ASGS2024.1.template b/input/meshes/SABv20a/SABv20a.15.ASGS2024.1.template
@@ -1588,7 +1588,5 @@ K2
 %CSYEAR%-%CSMONTH%-%CSDAY% %CSHOUR%:00:00%NCDATE-Line%
 !
 ! namelists:
-%met_control_namelist%
-%wetdry_control_namelist%
-%inundation_output_control_namelist%
-%dynamic_water_level_correction_namelist%
+&inundationOutputControl inundationOutput=%inundationOutput% /
+&metControl WindDragLimit=%WindDragLimit% DragLawString=%DragLawString% /
diff --git a/input/meshes/hsofs/hsofs-parameters.15.template b/input/meshes/hsofs/hsofs-parameters.15.template
@@ -1588,7 +1588,5 @@ K2
 %CSYEAR%-%CSMONTH%-%CSDAY% %CSHOUR%:00:00%NCDATE-Line%
 !
 ! namelists:
-%met_control_namelist%
-%wetdry_control_namelist%
-%inundation_output_control_namelist%
-%dynamic_water_level_correction_namelist%
+&inundationOutputControl inundationOutput=%inundationOutput% /
+&metControl WindDragLimit=%WindDragLimit% /