intermediate commit before tackling discrepancies in MERIT and REMA l…

…on-grid
ray-chew · May 29, 2024 · fe661f6 · fe661f6
1 parent f2b9e9a
commit fe661f6
Showing 1 changed file with 13 additions and 10 deletions.
diff --git a/src/io.py b/src/io.py
@@ -170,7 +170,7 @@ def __init__(self, cell, params, verbose=False, is_parallel=False):
 
             self.merit_cg = params.merit_cg
             self.split_EW = False
-            self.prev_MERIT = False
+            self.span = False
 
             if not is_parallel:
                 self.get_topo(cell)
@@ -448,19 +448,22 @@ def __load_topo(self, cell, fns, dirs, lon_cnt, lat_cnt,  lat_idx_rng, lon_idx_r
                     if n_col == 0:
                         cell.lat += lat[lat_low:lat_high].tolist()
                     if n_row == 0:
-                        cell.lon += lon[lon_low:lon_high].tolist()
 
-                        # current dataset at n_row = 0 is a MERIT dataset
-                        if "MERIT" in fn:
-                            self.prev_merit = True
-
-                    # topographic data is read over MERIT and REMA interface:
-                    if n_row > 0:
-                        if ("REMA" in fn) and (self.prev_merit):
-                            pass
+                        if "MERIT" in fns and "REMA" in fns:
+                            self.span = True
+                            # new_lon = 
 
+                        else:
+                            cell.lon += lon[lon_low:lon_high].tolist()
 
+                    #     # current dataset at n_row = 0 is a MERIT dataset
+                    #     if "MERIT" in fn:
+                    #         self.merit = True
 
+                    # # topographic data is read over MERIT and REMA interface:
+                    # if n_row > 0:
+                    #     if ("REMA" in fn) and (self.prev_merit):
+
 
                     lon_sz = lon_high - lon_low
                     lat_sz = lat_high - lat_low