Issue #547: Remove mask from read

cdds/cdds/common/plugins/base/base_grid.py

@@ -153,7 +153,6 @@ def _load_ocean_grid_polar_masks(self, json) -> None:
             slice_longitude = self._to_mask_slice_str(values['slice_longitude'])
             mask_slice = '{},{}'.format(slice_latitude, slice_longitude)
             self._ocean_grid_polar_masks[grid_name] = mask_slice
-        self._halo_options = json['halo_options']
 
     def _load_bounds_coordinates(self, json) -> None:
         if "bounds_coordinates" in json:
@@ -184,22 +183,6 @@ def masks(self) -> Dict[str, str]:
         """
         return self._ocean_grid_polar_masks
 
-    @property
-    def halo_options(self) -> Dict[str, List[str]]:
-        """
-        Returns the ncks options needed to move ocean holo rows and columns.
-        For example::
-
-          {
-            'grid-T': ['-dx,1,360', '-dy,1,330'],
-            'grid-U': ['-dx,1,360', '-dy,1,330']
-          }
-
-        :return: The ncks options according their gird names
-        :rtype: dict
-        """
-        return self._halo_options
-
     def hybrid_heights_files(self) -> List[str]:
         """
         Returns the hybrid heights file names.

cdds/cdds/common/plugins/base/base_models.py

@@ -123,6 +123,7 @@ def __init__(self, model_id: ModelId) -> None:
         self._stream_file_info: StreamFileInfo = None
         self._streams: List[str] = []
         self._grid_mappings: BaseGridMapping = BaseGridMapping()
+        self._halo_removal_info: Dict[str, str] = {}
 
     def temp_space(self, stream_id: str) -> int:
         """
@@ -147,6 +148,15 @@ def memory(self, stream_id: str) -> str:
         """
         return self._memory[stream_id]
 
+    @property
+    def halo_removal_info(self) -> Dict[str, str]:
+        """
+        Returns the halo removal information for this model.
+        :return: Halo removal information
+        :rtype: Dict[str, str]
+        """
+        return self._halo_removal_info
+
     def cycle_length(self, stream_id: str) -> str:
         """
         Returns the cycle length of the given stream.
@@ -235,13 +245,15 @@ def load_parameters(self, dir_path: str) -> LoadResult:
             new_temp_space = parameters.get('temp_space', {})
             new_sizing_info = parameters.get('sizing_info', {})
             new_grid_info = parameters.get('grid_info')
+            new_halo_removal = parameters.get('halo_removal', {})
 
             self._load_stream_file_info(parameters.get('stream_file_frequency', {}))
             self._subdaily_streams = parameters.get('subdaily_streams', [])
             self._cycle_lengths.update(new_cylc_lengths)
             self._memory.update(new_memory)
             self._temp_space.update(new_temp_space)
             self._sizing.update(new_sizing_info)
+            self._halo_removal_info.update(new_halo_removal)
 
             if new_grid_info:
                 self._load_grid_info(new_grid_info)

cdds/cdds/common/plugins/cmip6/data/model/HadGEM3-GC31-HH.json

@@ -160,6 +160,16 @@
     "ap9",
     "apt"
   ],
+  "halo_removal": {
+    "onm": {
+      "longitude": "1:-1",
+      "latitude": "1:-1"
+    },
+    "ond": {
+      "longitude": "1:-1",
+      "latitude": "1:-1"
+    }
+  },
   "grid_info": {
     "atmos": {
       "atmos_timestep": 600,
@@ -247,28 +257,7 @@
             null
           ]
         }
-      },
-      "halo_options": {
-        "grid-T": [
-          "-dx,1,4320",
-          "-dy,1,3604"
-        ],
-        "grid-U": [
-          "-dx,1,4320",
-          "-dy,1,3604"
-        ],
-        "grid-V": [
-          "-dx,1,4320",
-          "-dy,1,3604"
-        ],
-        "grid-W": [
-          "-dx,1,4320",
-          "-dy,1,3604"
-        ],
-        "diaptr": [
-          "-dy,1,3604"
-        ]
       }
     }
   }
-}
+}

cdds/cdds/common/plugins/cmip6/data/model/HadGEM3-GC31-HM.json

@@ -160,6 +160,16 @@
     "ap9",
     "apt"
   ],
+  "halo_removal": {
+    "onm": {
+      "longitude": "1:-1",
+      "latitude": "1:-1"
+    },
+    "ond": {
+      "longitude": "1:-1",
+      "latitude": "1:-1"
+    }
+  },
   "grid_info": {
     "atmos": {
       "atmos_timestep": 600,
@@ -253,28 +263,7 @@
             null
           ]
         }
-      },
-      "halo_options": {
-        "grid-T": [
-          "-dx,1,1440",
-          "-dy,1,1205"
-        ],
-        "grid-U": [
-          "-dx,1,1440",
-          "-dy,1,1205"
-        ],
-        "grid-V": [
-          "-dx,1,1440",
-          "-dy,1,1205"
-        ],
-        "grid-W": [
-          "-dx,1,1440",
-          "-dy,1,1205"
-        ],
-        "diaptr": [
-          "-dy,1,1205"
-        ]
       }
     }
   }
-}
+}

cdds/cdds/common/plugins/cmip6/data/model/HadGEM3-GC31-LL.json

@@ -170,6 +170,16 @@
     "ap9",
     "apt"
   ],
+  "halo_removal": {
+    "onm": {
+      "longitude": "1:-1",
+      "latitude": "1:-1"
+    },
+    "ond": {
+      "longitude": "1:-1",
+      "latitude": "1:-1"
+    }
+  },
   "grid_info": {
     "atmos": {
       "atmos_timestep": 1200,
@@ -202,6 +212,28 @@
         "diaptr_basin_masks.nc",
         "ocean_zostoga.nc"
       ],
+      "halo_removal": {
+        "onm": [
+          [
+            1,
+            -1
+          ],
+          [
+            1,
+            -1
+          ]
+        ],
+        "ond": [
+          [
+            1,
+            -1
+          ],
+          [
+            1,
+            -1
+          ]
+        ]
+      },
       "masked": {
         "grid-V": {
           "slice_latitude": [
@@ -227,27 +259,6 @@
             null
           ]
         }
-      },
-      "halo_options": {
-        "grid-T": [
-          "-dx,1,360",
-          "-dy,1,330"
-        ],
-        "grid-U": [
-          "-dx,1,360",
-          "-dy,1,330"
-        ],
-        "grid-V": [
-          "-dx,1,360",
-          "-dy,1,330"
-        ],
-        "grid-W": [
-          "-dx,1,360",
-          "-dy,1,330"
-        ],
-        "diaptr": [
-          "-dy,1,330"
-        ]
       }
     }
   }

cdds/cdds/common/plugins/cmip6/data/model/HadGEM3-GC31-MH.json

@@ -160,6 +160,16 @@
     "ap9",
     "apt"
   ],
+  "halo_removal": {
+    "onm": {
+      "longitude": "1:-1",
+      "latitude": "1:-1"
+    },
+    "ond": {
+      "longitude": "1:-1",
+      "latitude": "1:-1"
+    }
+  },
   "grid_info": {
     "atmos": {
       "atmos_timestep": 900,
@@ -247,28 +257,7 @@
             null
           ]
         }
-      },
-      "halo_options": {
-        "grid-T": [
-          "-dx,1,4320",
-          "-dy,1,3604"
-        ],
-        "grid-U": [
-          "-dx,1,4320",
-          "-dy,1,3604"
-        ],
-        "grid-V": [
-          "-dx,1,4320",
-          "-dy,1,3604"
-        ],
-        "grid-W": [
-          "-dx,1,4320",
-          "-dy,1,3604"
-        ],
-        "diaptr": [
-          "-dy,1,3604"
-        ]
       }
     }
   }
-}
+}

cdds/cdds/common/plugins/cmip6/data/model/HadGEM3-GC31-MM.json

@@ -161,6 +161,16 @@
     "apt",
     "apa"
   ],
+  "halo_removal": {
+    "onm": {
+      "longitude": "1:-1",
+      "latitude": "1:-1"
+    },
+    "ond": {
+      "longitude": "1:-1",
+      "latitude": "1:-1"
+    }
+  },
   "grid_info": {
     "atmos": {
       "atmos_timestep": 900,
@@ -254,28 +264,7 @@
             null
           ]
         }
-      },
-      "halo_options": {
-        "grid-T": [
-          "-dx,1,1440",
-          "-dy,1,1205"
-        ],
-        "grid-U": [
-          "-dx,1,1440",
-          "-dy,1,1205"
-        ],
-        "grid-V": [
-          "-dx,1,1440",
-          "-dy,1,1205"
-        ],
-        "grid-W": [
-          "-dx,1,1440",
-          "-dy,1,1205"
-        ],
-        "diaptr": [
-          "-dy,1,1205"
-        ]
       }
     }
   }
-}
+}

cdds/cdds/common/plugins/cmip6/data/model/HadREM3-GA7-05.json

@@ -11,15 +11,21 @@
       "ond"
     ]
   },
-  "cycle_length": {
-  },
-  "memory": {
-  },
-  "temp_space": {
-  },
-  "sizing_info": {
-  },
+  "cycle_length": {},
+  "memory": {},
+  "temp_space": {},
+  "sizing_info": {},
   "subdaily_streams": [],
+  "halo_removal": {
+    "onm": {
+      "longitude": "1:-1",
+      "latitude": "1:-1"
+    },
+    "ond": {
+      "longitude": "1:-1",
+      "latitude": "1:-1"
+    }
+  },
   "grid_info": {
     "atmos": {
       "atmos_timestep": null,
@@ -52,10 +58,13 @@
         "diaptr_basin_masks.nc",
         "ocean_zostoga.nc"
       ],
-      "masked": {
-      },
-      "halo_options": {
+      "masked": {},
+      "halo_removal": {
+        "onm": {
+          "longitude": "1:-1",
+          "latitude": "1:-1"
+        }
       }
     }
   }
-}
+}