Adding file reading for terrain USGS (#2054)

* Removingfolder * Adding folder * Adding case with terrain * Adding reading in for USGS terrain file --------- Co-authored-by: Mahesh Natarajan <[email protected]> Co-authored-by: Mahesh Natarajan <[email protected]> Co-authored-by: Mahesh Natarajan <[email protected]>
erf-model · Jan 10, 2025 · f877a35 · f877a35
1 parent c383faf
commit f877a35
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/Exec/WindFarmTests/SingleTurbine/SimpleActuatorDisk/WithTerrain/ERF_Prob.cpp b/Exec/WindFarmTests/SingleTurbine/SimpleActuatorDisk/WithTerrain/ERF_Prob.cpp
@@ -174,8 +174,11 @@ Problem::init_custom_terrain (
     std::string fname;
     ParmParse pp("erf");
     auto valid_fname = pp.query("terrain_file_name",fname);
+    auto valid_fname_USGS = pp.query("terrain_file_name_USGS",fname);
     if (valid_fname) {
         this->read_custom_terrain(fname,geom,z_phys_nd,time);
+    } else if (valid_fname_USGS) {
+        this->read_custom_terrain_USGS(fname,geom,z_phys_nd,time);
     } else {
         // Domain cell size and real bounds
         auto dx = geom.CellSizeArray();

diff --git a/Exec/WindFarmTests/WindFarm/SimpleActuatorDisk/WithTerrain/ERF_Prob.cpp b/Exec/WindFarmTests/WindFarm/SimpleActuatorDisk/WithTerrain/ERF_Prob.cpp
@@ -174,8 +174,11 @@ Problem::init_custom_terrain (
     std::string fname;
     ParmParse pp("erf");
     auto valid_fname = pp.query("terrain_file_name",fname);
+    auto valid_fname_USGS = pp.query("terrain_file_name_USGS",fname);
     if (valid_fname) {
         this->read_custom_terrain(fname,geom,z_phys_nd,time);
+    } else if (valid_fname_USGS) {
+        this->read_custom_terrain_USGS(fname,geom,z_phys_nd,time);
     } else {
         // Domain cell size and real bounds
         auto dx = geom.CellSizeArray();