doodsonHarmonicsCalculateAdmittance: changed defaults for excludeDood…

…sonForInterpolation.
groops-devs · Nov 30, 2024 · e1d7c4e · e1d7c4e
1 parent efa9549
commit e1d7c4e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/groops.xsd b/groops.xsd
@@ -10313,7 +10313,7 @@
 				</xs:annotation>
 				<xs:complexType>
 					<xs:sequence>
-						<xs:element name="inputfileTides" type="filename" default="{groopsDataDir}/tides/oceanTide_fes2022_n180_version20241110.datt"/>
+						<xs:element name="inputfileTides" type="filename" default="{groopsDataDir}/tides/oceanTide_fes2022_n180_version20241110.dat"/>
 						<xs:element name="inputfileAdmittance" type="filename" minOccurs="0" default="{groopsDataDir}/tides/oceanTide_fes2022_admittance_linear_linear.txt">
 							<xs:annotation>
 								<xs:documentation>interpolation of minor constituents</xs:documentation>
@@ -11173,7 +11173,7 @@
 								<xs:documentation>polynomial degree for extrapolation</xs:documentation>
 							</xs:annotation>
 						</xs:element>
-						<xs:element name="excludeDoodsonForInterpolation" type="doodson" minOccurs="0" default="[&quot;164.555&quot;, &quot;164.556&quot;]" maxOccurs="unbounded">
+						<xs:element name="excludeDoodsonForInterpolation" type="doodson" minOccurs="0" default="[&quot;164.554&quot;, &quot;164.555&quot;, &quot;164.556&quot;, &quot;164.566&quot;]" maxOccurs="unbounded">
 							<xs:annotation>
 								<xs:documentation>major tides not used for interpolation</xs:documentation>
 							</xs:annotation>

diff --git a/source/programs/doodsonHarmonics/doodsonHarmonicsCalculateAdmittance.cpp b/source/programs/doodsonHarmonics/doodsonHarmonicsCalculateAdmittance.cpp
@@ -59,7 +59,7 @@ void DoodsonHarmonicsCalculateAdmittance::run(Config &config, Parallel::Communic
     readConfig(config, "threshold",                        threshold,           Config::DEFAULT,  "1e-4", "[m^2/s^2] only interpolate tides with TGP greater than threshold");
     readConfig(config, "degreeInterpolation",              degreeInterpolation, Config::DEFAULT,  "1",    "polynomial degree for interpolation");
     readConfig(config, "degreeExtrapolation",              degreeExtrapolation, Config::OPTIONAL, "1",    "polynomial degree for extrapolation");
-    readConfig(config, "excludeDoodsonForInterpolation",   doodsonExclude,      Config::OPTIONAL, R"(["164.555", "164.556"])", "major tides not used for interpolation");
+    readConfig(config, "excludeDoodsonForInterpolation",   doodsonExclude,      Config::OPTIONAL, R"(["164.554", "164.555", "164.556", "164.566"])", "major tides not used for interpolation");
     if(isCreateSchema(config)) return;
 
     // =====================================================