grdwindinversion 0.3.8__py3-none-any.whl → 0.3.9__py3-none-any.whl

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/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.dist-info → grdwindinversion-0.3.9.dist-info}/METADATA

@@ -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.dist-info → grdwindinversion-0.3.9.dist-info}/RECORD

@@ -5,19 +5,19 @@ grdwindinversion/config_prod_recal.yaml,sha256=74n2J4tzSx1I5vaat3ydwig1jyfDgxGTG
 grdwindinversion/config_prod_recal_streaks_nrcsmod.yaml,sha256=ob0YmzHrwkI4GLxaR9HzidYtXBrTOAlEYwPYdCK7AqA,1092
 grdwindinversion/config_prod_streaks.yaml,sha256=lJMl4qH6XYqO8ich7yW0WDQsQDrjmWThlLyx1xZy1DA,1313
 grdwindinversion/config_prod_streaks_nrcsmod.yaml,sha256=4yC4KcsC7rUumYHwhpKxM8_LDMe_Je-RIu4-9e1ayp8,1312
-grdwindinversion/config_prod_v3.yaml,sha256=J6lb8swIa7M-P4DjnTqKP1Bzp3b2XWNZp_E1FCrPGXQ,1953
+grdwindinversion/config_prod_v3.yaml,sha256=YdIYJcQhX8bM2vhU4pDmT4BI8O0Mn4DVSS_LvB0CbgI,3136
 grdwindinversion/data_config.yaml,sha256=FnglUHbAtGwHWg8w86hwZt3-vo-dY8uIjxqyI1jZpv8,567
 grdwindinversion/gradientFeatures.py,sha256=NIeAJzb1zrlJPBq1th7wjEZoNJMxwqDpNHLMWP6FQN0,18198
-grdwindinversion/inversion.py,sha256=4AM5CUyLexHW4yX7yMspfW2osA4DTGm8I0KTWZbPiUA,61752
+grdwindinversion/inversion.py,sha256=D8HQ4Ch2FvWXs7vkNfcSSl_ox1tf3WoemJZ9vZbR-Ww,62409
 grdwindinversion/load_config.py,sha256=ZPozOWt0rf2Pmyc6P2D75cE_9wKUfKfr7RUzlE3WoiY,833
 grdwindinversion/main.py,sha256=Cwmxxz-PEt53JvpTL0Jx1WKLJpWvlIXZ9xtnyGKrGHY,3254
 grdwindinversion/utils.py,sha256=2BRq_UEbKbP5yCy_0X-nV-SQFmmp4aKrFaRgrs5MqJo,4347
 grdwindinversion/utils_memory.py,sha256=NA0bvkpCTkEiqCcJuldG1XsrP40-3AQUUt3HLeoRpbY,1432
 grdwindinversion/.github/ISSUE_TEMPLATE.md,sha256=qiM_a7CCUz3fSrz3Q20Se1nwPNFS8QCc8tkwK_0DSCo,327
-grdwindinversion-0.3.8.dist-info/licenses/AUTHORS.rst,sha256=KmhW_5LBKGTIGwWEVkoTm1qx_bvdDR3yYL-1cwbDOFQ,218
-grdwindinversion-0.3.8.dist-info/licenses/LICENSE,sha256=-B8mBiTeY3J7OLuayiV1myqmc7yeijBc7s34kc8RTmg,1075
-grdwindinversion-0.3.8.dist-info/METADATA,sha256=Zhr0ANP7Ek5Kb5zzEBoh8cheWMmvI91EwfbclEOlens,2529
-grdwindinversion-0.3.8.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-grdwindinversion-0.3.8.dist-info/entry_points.txt,sha256=2rjvlVCy0iasRXjOz3kOIGuy2OCGQ-VTNuwuViQ6cMM,95
-grdwindinversion-0.3.8.dist-info/top_level.txt,sha256=z6lPix3QPEYOo37qq8plA2hY7S3C8MQZY81agRlksMI,17
-grdwindinversion-0.3.8.dist-info/RECORD,,
+grdwindinversion-0.3.9.dist-info/licenses/AUTHORS.rst,sha256=KmhW_5LBKGTIGwWEVkoTm1qx_bvdDR3yYL-1cwbDOFQ,218
+grdwindinversion-0.3.9.dist-info/licenses/LICENSE,sha256=-B8mBiTeY3J7OLuayiV1myqmc7yeijBc7s34kc8RTmg,1075
+grdwindinversion-0.3.9.dist-info/METADATA,sha256=6Om_Kjm7yZYOylA7puJhcumBy9UwmIIq0xoxf_3W5d0,2529
+grdwindinversion-0.3.9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+grdwindinversion-0.3.9.dist-info/entry_points.txt,sha256=2rjvlVCy0iasRXjOz3kOIGuy2OCGQ-VTNuwuViQ6cMM,95
+grdwindinversion-0.3.9.dist-info/top_level.txt,sha256=z6lPix3QPEYOo37qq8plA2hY7S3C8MQZY81agRlksMI,17
+grdwindinversion-0.3.9.dist-info/RECORD,,

{grdwindinversion-0.3.8.dist-info → grdwindinversion-0.3.9.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (78.1.0)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py3-none-any