grdwindinversion 0.3.8__tar.gz → 0.3.9__tar.gz

{grdwindinversion-0.3.8/grdwindinversion.egg-info → grdwindinversion-0.3.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: grdwindinversion
-Version: 0.3.8
+Version: 0.3.9
 Summary: Package to perform Wind inversion from GRD Level-1 SAR images
 Author-email: Antoine Grouazel <antoine.grouazel@ifremer.fr>
 License: MIT

{grdwindinversion-0.3.8 → grdwindinversion-0.3.9}/grdwindinversion/config_prod_v3.yaml

@@ -42,6 +42,49 @@ S1B:
     wspd_step: 0.1
     phi_step: 1.0
     resolution: "high"
+
+S1C:
+    GMF_HH_NAME: "nc_lut_gmf_cmod5n_Rhigh_hh_mouche1"
+    GMF_VV_NAME: "gmf_cmod5n"
+    GMF_VH_NAME: "gmf_s1_v2"
+    dsig_VH_NAME: "gmf_s1_v2"
+    dsig_cr_step: "nrcs"
+    apply_flattening: True
+    S1_EW_calG>20190731:
+        GMF_HH_NAME: "nc_lut_gmf_cmod5n_Rhigh_hh_mouche1"
+        GMF_VV_NAME: "gmf_cmod5n"
+        GMF_VH_NAME: "gmf_s1_v3_ew_rec"
+        dsig_VH_NAME: "dsig_wspd_s1_ew_rec_v3"
+        dsig_cr_step: "wspd"
+        apply_flattening: True
+    recalibration: False
+    ancillary: "ecmwf"
+    inc_step: 0.1
+    wspd_step: 0.1
+    phi_step: 1.0
+    resolution: "high"
+
+S1D:
+    GMF_HH_NAME: "nc_lut_gmf_cmod5n_Rhigh_hh_mouche1"
+    GMF_VV_NAME: "gmf_cmod5n"
+    GMF_VH_NAME: "gmf_s1_v2"
+    dsig_VH_NAME: "gmf_s1_v2"
+    dsig_cr_step: "nrcs"
+    apply_flattening: True
+    S1_EW_calG>20190731:
+        GMF_HH_NAME: "nc_lut_gmf_cmod5n_Rhigh_hh_mouche1"
+        GMF_VV_NAME: "gmf_cmod5n"
+        GMF_VH_NAME: "gmf_s1_v3_ew_rec"
+        dsig_VH_NAME: "dsig_wspd_s1_ew_rec_v3"
+        dsig_cr_step: "wspd"
+        apply_flattening: True
+    recalibration: False
+    ancillary: "ecmwf"
+    inc_step: 0.1
+    wspd_step: 0.1
+    phi_step: 1.0
+    resolution: "high"
+
 RS2:
     GMF_HH_NAME: "nc_lut_gmf_cmod5n_Rhigh_hh_mouche1"
     GMF_VV_NAME: "gmf_cmod5n"

{grdwindinversion-0.3.8 → grdwindinversion-0.3.9}/grdwindinversion/inversion.py

@@ -54,6 +54,10 @@ def getSensorMetaDataset(filename):
         return "S1A", "SENTINEL-1 A", xsar.Sentinel1Meta, xsar.Sentinel1Dataset
     elif "S1B" in filename:
         return "S1B", "SENTINEL-1 B", xsar.Sentinel1Meta, xsar.Sentinel1Dataset
+    elif "S1C" in filename:
+        return "S1C", "SENTINEL-1 C", xsar.Sentinel1Meta, xsar.Sentinel1Dataset
+    elif "S1D" in filename:
+        return "S1D", "SENTINEL-1 D", xsar.Sentinel1Meta, xsar.Sentinel1Dataset
     elif "RS2" in filename:
         return "RS2", "RADARSAT-2", xsar.RadarSat2Meta, xsar.RadarSat2Dataset
     elif "RCM1" in filename:
@@ -65,7 +69,7 @@ def getSensorMetaDataset(filename):
 
     else:
         raise ValueError(
-            "must be S1A|S1B|RS2|RCM1|RCM2|RCM3, got filename %s" % filename
+            "must be S1A|S1B|S1C|S1D|RS2|RCM1|RCM2|RCM3, got filename %s" % filename
         )
 
 
@@ -96,7 +100,7 @@ def getOutputName(
     basename = os.path.basename(input_file)
     basename_match = basename
 
-    if sensor == "S1A" or sensor == "S1B":
+    if sensor == "S1A" or sensor == "S1B" or sensor == "S1C" or sensor == "S1D":
         regex = re.compile(
             "(...)_(..)_(...)(.)_(.)(.)(..)_(........T......)_(........T......)_(......)_(......)_(....).SAFE"
         )
@@ -143,7 +147,7 @@ def getOutputName(
         MISSIONID, DATA1, DATA2, DATA3, SWATH, DATE, TIME, POLARIZATION, LAST = (
             match.groups()
         )
-        new_format = f"{MISSIONID.lower()}-{SWATH.lower()}-owi-{convert_polarization_name(POLARIZATION)}-{meta_start_date.lower()}-{meta_stop_date.lower()}-_____-_____.nc"
+        new_format = f"{MISSIONID.lower()}-{SWATH.lower()}-owi-{convert_polarization_name(POLARIZATION)}-{meta_start_date.lower()}-{meta_stop_date.lower()}-xxxxx-xxxxx.nc"
     elif sensor == "RCM":
 
         regex = re.compile(
@@ -160,11 +164,11 @@ def getOutputName(
         MISSIONID, DATA1, DATA2, DATA3, SWATH, DATE, TIME, POLARIZATION, PRODUCT = (
             match.groups()
         )
-        new_format = f"{MISSIONID.lower()}-{SWATH.lower()}-owi-{convert_polarization_name(POLARIZATION)}-{meta_start_date.lower()}-{meta_stop_date.lower()}-_____-_____.nc"
+        new_format = f"{MISSIONID.lower()}-{SWATH.lower()}-owi-{convert_polarization_name(POLARIZATION)}-{meta_start_date.lower()}-{meta_stop_date.lower()}-xxxxx-xxxxx.nc"
 
     else:
         raise ValueError(
-            "sensor must be S1A|S1B|RS2|RCM, got sensor %s" % sensor)
+            "sensor must be S1A|S1B|S1C|RS2|RCM, got sensor %s" % sensor)
 
     if subdir:
         out_file = os.path.join(outdir, basename, new_format)
@@ -953,8 +957,16 @@ def preprocess(
         copol_gmf = "HH"
         crosspol_gmf = "VH"
 
-    cond_aux_cal = (sensor == "S1A" or sensor == "S1B") and (
-        xsar_dataset.dataset.attrs["aux_cal"].split("_")[-1][1:9] > '20190731')
+    if (sensor == "S1A" or sensor == "S1B" or sensor == "S1C" or sensor == "S1D") and xsar_dataset.dataset.attrs["aux_cal"] is None:
+        raise ValueError(
+            "aux_cal attribute is None, xsar_dataset.dataset.attrs['aux_cal'] must be set to a valid value"
+        )
+    cond_aux_cal = (
+        (sensor == "S1A" or sensor == "S1B" or sensor == "S1C" or sensor == "S1D")
+        and xsar_dataset.dataset.attrs["aux_cal"] is not None
+        and xsar_dataset.dataset.attrs["aux_cal"].split("_")[-1][1:9] > "20190731"
+    )
+
     if cond_aux_cal and xr_dataset.attrs["swath"] == "EW" and "S1_EW_calG>20190731" in config.keys():
         model_co = config["S1_EW_calG>20190731"]["GMF_" + copol_gmf + "_NAME"]
         model_cross = config["S1_EW_calG>20190731"]["GMF_" +

{grdwindinversion-0.3.8 → grdwindinversion-0.3.9/grdwindinversion.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: grdwindinversion
-Version: 0.3.8
+Version: 0.3.9
 Summary: Package to perform Wind inversion from GRD Level-1 SAR images
 Author-email: Antoine Grouazel <antoine.grouazel@ifremer.fr>
 License: MIT

{grdwindinversion-0.3.8 → grdwindinversion-0.3.9}/tests/test_simple_functions.py

@@ -19,15 +19,15 @@ safes = ['S1A_IW_GRDH_1SDV_20210909T130650_20210909T130715_039605_04AE83_C34F.SA
 outfiles = ['s1a-iw-owi-dv-20210909t130650-20210909t130715-039605-04AE83.nc',
             's1a-iw-owi-dh-20210101t102321-20210101t102346-035943-0435C4.nc',
             's1a-iw-owi-sv-20170105t225242-20170105t225311-014703-017ED0.nc',
-            'rcm1-sclnd-owi-dv-20230930t214011-20230930t214127-_____-_____.nc',
-            'rcm2-sclna-owi-dv-20240125t195611-20240125t195726-_____-_____.nc',
-            'rs2-scwa-owi-dv-20220904t093402-20220904t093518-_____-_____.nc',
+            'rcm1-sclnd-owi-dv-20230930t214011-20230930t214127-xxxxx-xxxxx.nc',
+            'rcm2-sclna-owi-dv-20240125t195611-20240125t195726-xxxxx-xxxxx.nc',
+            'rs2-scwa-owi-dv-20220904t093402-20220904t093518-xxxxx-xxxxx.nc',
             's1a-ew-owi-dv-20230908t092521-20230908t092624-050234-060BF1.nc',
             's1a-iw-owi-dv-20150315t053621-20150315t053646-005038-006529.nc',
             's1b-iw-owi-dv-20171117t164022-20171117t164047-008324-00EBB3.nc',
-            'rcm3-sclna-owi-dv-20230303t063449-20230303t063629-_____-_____.nc',
-            'rs2-scwa-owi-dv-20160912t212842-20160912t212958-_____-_____.nc',
-            'rs2-scwa-owi-sv-20160912t212842-20160912t212958-_____-_____.nc',]
+            'rcm3-sclna-owi-dv-20230303t063449-20230303t063629-xxxxx-xxxxx.nc',
+            'rs2-scwa-owi-dv-20160912t212842-20160912t212958-xxxxx-xxxxx.nc',
+            'rs2-scwa-owi-sv-20160912t212842-20160912t212958-xxxxx-xxxxx.nc',]
 
 sensors = ['S1A', 'S1A', 'S1A', 'RCM', 'RCM',
            'RS2', 'S1A', 'S1A', 'S1B', 'RCM', 'RS2', 'RS2']
@@ -101,6 +101,6 @@ def test_function_getOutputName():
 
         assert output == result, f"Expected {output}, got {result}"
 
-
+        
 if __name__ == '__main__':
     test_function_getSensorMetaDataset()