nws8 support and other additions to namelist to Make_f15 (#317)

* adding nws8 namelist for switchin to CLE15 vortex model and other options

* adding a forward slash final line to ensure namelist is correctly identified

* combining the velwd and limit into the wetdry namelist as per the current official adcirc version

* changelog for namelist changes and additions

Author: WPringle

@msh/private/writefort15.m

@@ -344,6 +344,7 @@
            fprintf( fid, '%s = "%s",\n',f15dat.controllist(k).var(m).name,val);
         end
     end
+    fprintf( fid, '/ ! -- End %s Control Namelist -- \n', f15dat.controllist(k).type ) ;
 end
 
 fclose(fid) ;

README.md

@@ -178,7 +178,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 ## Fixed 
 - User inputted edge constraints are now saved when no weirs are being constrained during mesh generation.
 ## Added
-- Added a check in `Read_shapefile.m` to handle, warn, and correct cases where there are empty objects in a shapefile. https://github.com/CHLNDDEV/OceanMesh2D/pull/315
+- Check in `Read_shapefile.m` to handle, warn, and correct cases where there are empty objects in a shapefile. https://github.com/CHLNDDEV/OceanMesh2D/pull/315
+- `nws8` namelist for switching to CLE15 vortex model and option vortex model options implemented into a developement branch (https://github.com/adcirc/adcirc/pull/393) of ADCIRC. https://github.com/CHLNDDEV/OceanMesh2D/pull/317
+## Changed
+- Combine `limit` and `velwd` namelists into `wetdry` namelist to match ADCIRC release code. https://github.com/CHLNDDEV/OceanMesh2D/pull/317
 
 ### [6.0.0] - 2024-02-28
 ## Added

utilities/Make_f15.m

@@ -59,7 +59,7 @@
 %                https://wiki.adcirc.org/Supplemental_meteorological/wave/ice_parameters
 %    
 %               'namelist' : cell/string list of namelists to add from the following:
-%                {'met', 'dynamicWaterLevelCorrection', 'limit', 'velwd','swanoutput'}
+%                {'met', 'dynamicWaterLevelCorrection', 'wetdry','swanoutput','nws8'}
 %                https://wiki.adcirc.org/Fort.15_file_format#Namelists
 %
 %  Outputs:  1) msh class obj with f15 struct populated
@@ -392,21 +392,28 @@
        obj.f15.controllist(ci).var(6).name = [obj.f15.controllist(ci).type 'SkipSnaps'];
        obj.f15.controllist(ci).var(6).val = 0;
     end 
-    if find(contains(namelists,'limit'),1)
+    if find(contains(namelists,'wetdry'),1)
        ci = ci + 1;
-       % limit control
-       obj.f15.controllist(ci).type = 'limit';
-       obj.f15.controllist(ci).var(1).name = 'slim';
-       obj.f15.controllist(ci).var(1).val = 4e-4;
-       obj.f15.controllist(ci).var(2).name = 'windlim';
-       obj.f15.controllist(ci).var(2).val = true;
-    end
-    if find(contains(namelists,'velwd'),1)
-       ci = ci + 1;
-       % wetdry velocity control
-       obj.f15.controllist(ci).type = 'velwd';
-       obj.f15.controllist(ci).var(1).name = 'directvelWD';
-       obj.f15.controllist(ci).var(1).val = true;
+       % wetdry control
+       obj.f15.controllist(ci).type = 'wetDry';
+       obj.f15.controllist(ci).var(1).name = 'outputNodeCode';
+       obj.f15.controllist(ci).var(1).val = false;
+       obj.f15.controllist(ci).var(2).name = 'outputNOFF';
+       obj.f15.controllist(ci).var(2).val = false;
+       obj.f15.controllist(ci).var(3).name = 'noffActive';
+       obj.f15.controllist(ci).var(3).val = true;
+       obj.f15.controllist(ci).var(4).name = 'StatPartWetFix';
+       obj.f15.controllist(ci).var(4).val = false;
+       obj.f15.controllist(ci).var(5).name = 'How2FixStatPartWet';
+       obj.f15.controllist(ci).var(5).val = 0;
+       obj.f15.controllist(ci).var(6).name = 'slim';
+       obj.f15.controllist(ci).var(6).val = 1e9;
+       obj.f15.controllist(ci).var(7).name = 'windLim';
+       obj.f15.controllist(ci).var(7).val = false;
+       obj.f15.controllist(ci).var(8).name = 'directvelWD';
+       obj.f15.controllist(ci).var(8).val = false;
+       obj.f15.controllist(ci).var(9).name = 'useHF';
+       obj.f15.controllist(ci).var(9).val = false;
     end
     if find(contains(namelists,'swanoutput'),1)
        % SWAN output
@@ -418,6 +425,29 @@
            obj.f15.controllist(ci).var(vv).val = vv <= 3;
        end
     end
+    if find(contains(namelists,'nws8'),1)
+       % NWS8
+       ci = ci + 1;
+       obj.f15.controllist(ci).type = 'nws8';
+       obj.f15.controllist(ci).var(1).name = 'vortexModel';
+       obj.f15.controllist(ci).var(1).val = 'Holland';
+       obj.f15.controllist(ci).var(2).name = 'backgroundWindModel';
+       obj.f15.controllist(ci).var(2).val = 'radialVelocityWeighted';
+       obj.f15.controllist(ci).var(3).name = 'BCalc';
+       obj.f15.controllist(ci).var(3).val = 'limited'; 
+       obj.f15.controllist(ci).var(4).name = 'thetaLatDep';
+       obj.f15.controllist(ci).var(4).val = false; 
+       obj.f15.controllist(ci).var(5).name = 'useInflow';
+       obj.f15.controllist(ci).var(5).val = false;
+       obj.f15.controllist(ci).var(6).name = 'windspeed_averaging_minute';
+       obj.f15.controllist(ci).var(6).val = 1;
+       obj.f15.controllist(ci).var(7).name = 'w_cool';
+       obj.f15.controllist(ci).var(7).val = 2.0;
+       obj.f15.controllist(ci).var(8).name = 'CkCd_calc';
+       obj.f15.controllist(ci).var(8).val = false;
+       obj.f15.controllist(ci).var(9).name = 'CkCd';
+       obj.f15.controllist(ci).var(9).val = 1.0;
+    end
 end
 
 end