Skip to content

Commit

Permalink
Merge pull request #8 from euroargodev/feature/upgrade
Browse files Browse the repository at this point in the history
merge version version 061a
  • Loading branch information
tcarval authored Feb 2, 2024
2 parents 34622ab + ac2bad5 commit 1be1ad7
Show file tree
Hide file tree
Showing 647 changed files with 115,558 additions and 15,169 deletions.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified decArgo_doc/decoder_versions/_argo_decoder_versions.xlsx
Binary file not shown.
Binary file modified decArgo_doc/decoder_versions/_argo_tools_histo_soft.xlsx
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ PX2;Cut-off pressure of the ascent profile;Pressure to use to separate pumped/un
PT3;duree d'ouverture maximale de l'�lectrovanne en surface;TBD;CONFIG_SurfaceValveMaxTimeAdditionalActions_csec;Maximum duration of the additional valve actions performed at the surface during the buoyancy reduction phase (in centi-seconds).
PT4;volume maxi transf�r� par l'electrovanne en profondeur;TBD;CONFIG_OilVolumeMaxPerValveAction_cm^3;This information is used as a threshold for the valve action durations. The valve flow is known for each float and CONFIG_OilVolumeMaxPerValveAction_cm^3 is converted to a maxDurationOfValveAction. During descent phases the float regularly computes a valve duration to sink to the target depth. In some specific cases the result can be a huge valve action duration and the result must be thresholded by maxDurationOfValveAction. So yes, this information is a configuration parameter (and for Remocean float it can be modified via remote controls, but of course by specialist in PROVOR vector configuration).
PT5;dur�e maxi d'activation pompe en profondeur;TBD;CONFIG_PumpActionMaxTimeReposition_csec;Maximum duration of the pump action for a drift readjustment (in centi-seconds).
PT6;volume impos� transf�r� par l'electrovanne en profondeur;TBD;CONFIG_OilVolumeMaxPerValveAction_cm^3;This information is used as a threshold for the valve action durations. The valve flow is known for each float and CONFIG_OilVolumeMaxPerValveAction_cm^3 is converted to a maxDurationOfValveAction. During descent phases the float regularly computes a valve duration to sink to the target depth. In some specific cases the result can be a huge valve action duration and the result must be thresholded by maxDurationOfValveAction. So yes, this information is a configuration parameter (and for Remocean float it can be modified via remote controls, but of course by specialist in PROVOR vector configuration).
PT6;volume impos� transf�r� par l'electrovanne en profondeur;TBD;CONFIG_OilVolumeMinPerValveAction_cm^3;This information is used as a threshold for the valve action durations. The valve flow is known for each float and CONFIG_OilVolumeMinPerValveAction_cm^3 is converted to a minDurationOfValveAction. During descent phases the float regularly computes a valve duration to sink to the target depth. In some specific cases the result can be a brief valve action duration and the result must be thresholded by minDurationOfValveAction.
PT7;dur�e d'activation pompe en remont�e;TBD;CONFIG_PumpActionMaxTimeAscent_csec;Maximum duration of a pump action during ascent (in centi-seconds).
PT10;dur�e nominale d'activation pompe en �mergence;TBD;CONFIG_PumpActionTimeBuoyancyAcquisition_csec;Duration of the last pump action of the buoyancy acquisition phase (in centi-seconds).
PT11;p�riodicit� de mesures de pression en remont�e;TBD;CONFIG_PressureCheckTimeAscent_minutes;Period of the pressure checks during the float ascent to surface (in minutes).
Expand Down
40 changes: 20 additions & 20 deletions decArgo_soft/config/_configParamNames/_config_param_name_1.json
Original file line number Diff line number Diff line change
Expand Up @@ -162,143 +162,143 @@
"CONF_PARAM_21" :
{
"CONF_PARAM_DEC_ID" : "PT3",
"CONF_PARAM_LABEL" : "duree d'ouverture maximale de l'électrovanne en surface",
"CONF_PARAM_LABEL" : "duree d'ouverture maximale de l'électrovanne en surface",
"CONF_PARAM_DEFINITION" : "TBD",
"CONF_PARAM_NAME" : "CONFIG_SurfaceValveMaxTimeAdditionalActions_csec",
"CONF_PARAM_DESCRIPTION" : "Maximum duration of the additional valve actions performed at the surface during the buoyancy reduction phase (in centi-seconds)."
},
"CONF_PARAM_22" :
{
"CONF_PARAM_DEC_ID" : "PT4",
"CONF_PARAM_LABEL" : "volume maxi transféré par l'electrovanne en profondeur",
"CONF_PARAM_LABEL" : "volume maxi transféré par l'electrovanne en profondeur",
"CONF_PARAM_DEFINITION" : "TBD",
"CONF_PARAM_NAME" : "CONFIG_OilVolumeMaxPerValveAction_cm^3",
"CONF_PARAM_DESCRIPTION" : "This information is used as a threshold for the valve action durations. The valve flow is known for each float and CONFIG_OilVolumeMaxPerValveAction_cm^3 is converted to a maxDurationOfValveAction. During descent phases the float regularly computes a valve duration to sink to the target depth. In some specific cases the result can be a huge valve action duration and the result must be thresholded by maxDurationOfValveAction. So yes, this information is a configuration parameter (and for Remocean float it can be modified via remote controls, but of course by specialist in PROVOR vector configuration)."
},
"CONF_PARAM_23" :
{
"CONF_PARAM_DEC_ID" : "PT5",
"CONF_PARAM_LABEL" : "durée maxi d'activation pompe en profondeur",
"CONF_PARAM_LABEL" : "durée maxi d'activation pompe en profondeur",
"CONF_PARAM_DEFINITION" : "TBD",
"CONF_PARAM_NAME" : "CONFIG_PumpActionMaxTimeReposition_csec",
"CONF_PARAM_DESCRIPTION" : "Maximum duration of the pump action for a drift readjustment (in centi-seconds)."
},
"CONF_PARAM_24" :
{
"CONF_PARAM_DEC_ID" : "PT6",
"CONF_PARAM_LABEL" : "volume imposé transféré par l'electrovanne en profondeur",
"CONF_PARAM_LABEL" : "volume imposé transféré par l'electrovanne en profondeur",
"CONF_PARAM_DEFINITION" : "TBD",
"CONF_PARAM_NAME" : "CONFIG_OilVolumeMaxPerValveAction_cm^3",
"CONF_PARAM_DESCRIPTION" : "This information is used as a threshold for the valve action durations. The valve flow is known for each float and CONFIG_OilVolumeMaxPerValveAction_cm^3 is converted to a maxDurationOfValveAction. During descent phases the float regularly computes a valve duration to sink to the target depth. In some specific cases the result can be a huge valve action duration and the result must be thresholded by maxDurationOfValveAction. So yes, this information is a configuration parameter (and for Remocean float it can be modified via remote controls, but of course by specialist in PROVOR vector configuration)."
"CONF_PARAM_NAME" : "CONFIG_OilVolumeMinPerValveAction_cm^3",
"CONF_PARAM_DESCRIPTION" : "This information is used as a threshold for the valve action durations. The valve flow is known for each float and CONFIG_OilVolumeMinPerValveAction_cm^3 is converted to a minDurationOfValveAction. During descent phases the float regularly computes a valve duration to sink to the target depth. In some specific cases the result can be a brief valve action duration and the result must be thresholded by minDurationOfValveAction."
},
"CONF_PARAM_25" :
{
"CONF_PARAM_DEC_ID" : "PT7",
"CONF_PARAM_LABEL" : "durée d'activation pompe en remontée",
"CONF_PARAM_LABEL" : "durée d'activation pompe en remontée",
"CONF_PARAM_DEFINITION" : "TBD",
"CONF_PARAM_NAME" : "CONFIG_PumpActionMaxTimeAscent_csec",
"CONF_PARAM_DESCRIPTION" : "Maximum duration of a pump action during ascent (in centi-seconds)."
},
"CONF_PARAM_26" :
{
"CONF_PARAM_DEC_ID" : "PT10",
"CONF_PARAM_LABEL" : "durée nominale d'activation pompe en émergence",
"CONF_PARAM_LABEL" : "durée nominale d'activation pompe en émergence",
"CONF_PARAM_DEFINITION" : "TBD",
"CONF_PARAM_NAME" : "CONFIG_PumpActionTimeBuoyancyAcquisition_csec",
"CONF_PARAM_DESCRIPTION" : "Duration of the last pump action of the buoyancy acquisition phase (in centi-seconds)."
},
"CONF_PARAM_27" :
{
"CONF_PARAM_DEC_ID" : "PT11",
"CONF_PARAM_LABEL" : "périodicité de mesures de pression en remontée",
"CONF_PARAM_LABEL" : "périodicité de mesures de pression en remontée",
"CONF_PARAM_DEFINITION" : "TBD",
"CONF_PARAM_NAME" : "CONFIG_PressureCheckTimeAscent_minutes",
"CONF_PARAM_DESCRIPTION" : "Period of the pressure checks during the float ascent to surface (in minutes)."
},
"CONF_PARAM_28" :
{
"CONF_PARAM_DEC_ID" : "PT12",
"CONF_PARAM_LABEL" : "périodicité de mesures en surface",
"CONF_PARAM_LABEL" : "périodicité de mesures en surface",
"CONF_PARAM_DEFINITION" : "TBD",
"CONF_PARAM_NAME" : "CONFIG_PressureCheckTimeBuoyancyReductionPhase_seconds",
"CONF_PARAM_DESCRIPTION" : "Time delay after each valve action before checking the pressure during the buoyancy reduction phase (in seconds)."
},
"CONF_PARAM_29" :
{
"CONF_PARAM_DEC_ID" : "PT14",
"CONF_PARAM_LABEL" : "tolérance sur l'atteinte de la pression de consigne (+/-)",
"CONF_PARAM_LABEL" : "tolérance sur l'atteinte de la pression de consigne (+/-)",
"CONF_PARAM_DEFINITION" : "TBD",
"CONF_PARAM_NAME" : "CONFIG_PressureTargetToleranceForStabilisation_dbar",
"CONF_PARAM_DESCRIPTION" : "Defines the target pressure interval for float stabilisation at parking or profile depth (in dbars)."
},
"CONF_PARAM_30" :
{
"CONF_PARAM_DEC_ID" : "PT16",
"CONF_PARAM_LABEL" : "pression maxi à ne pas dépasser",
"CONF_PARAM_LABEL" : "pression maxi à ne pas dépasser",
"CONF_PARAM_DEFINITION" : "TBD",
"CONF_PARAM_NAME" : "CONFIG_PressureMaxBeforeEmergencyAscent_dbar",
"CONF_PARAM_DESCRIPTION" : "Emergency ascent phase start pressure (in dbars)."
},
"CONF_PARAM_31" :
{
"CONF_PARAM_DEC_ID" : "PT17",
"CONF_PARAM_LABEL" : "pression de début de réduction de la durée d'activation ev en surface",
"CONF_PARAM_LABEL" : "pression de début de réduction de la durée d'activation ev en surface",
"CONF_PARAM_DEFINITION" : "TBD",
"CONF_PARAM_NAME" : "CONFIG_BuoyancyReductionFirstThreshold_dbar",
"CONF_PARAM_DESCRIPTION" : "First threshold of the buoyancy reduction phase (in dbars). From the surface to this first threshold, the float performs one initial valve action (of a computed duration) and N1 additional valve actions (of fixed durations) until the crossing of this first threshold."
},
"CONF_PARAM_32" :
{
"CONF_PARAM_DEC_ID" : "PT18",
"CONF_PARAM_LABEL" : "critère de pression de début de plongée",
"CONF_PARAM_LABEL" : "critère de pression de début de plongée",
"CONF_PARAM_DEFINITION" : "TBD",
"CONF_PARAM_NAME" : "CONFIG_BuoyancyReductionSecondThreshold_dbar",
"CONF_PARAM_DESCRIPTION" : "Second threshold of the buoyancy reduction phase (in dbars). From the first threshold to this second threshold, the float performs N2 additional valve actions (of computed durations) until the crossing of this second threshold. The descent to park phase starts at the crossing of this second threshold."
},
"CONF_PARAM_33" :
{
"CONF_PARAM_DEC_ID" : "PT20",
"CONF_PARAM_LABEL" : "nombre de positions hors tolérance autorisé en dérive conduisant à repositionnement",
"CONF_PARAM_LABEL" : "nombre de positions hors tolérance autorisé en dérive conduisant à repositionnement",
"CONF_PARAM_DEFINITION" : "TBD",
"CONF_PARAM_NAME" : "CONFIG_NumberOfOutOfTolerancePresBeforeReposition_COUNT",
"CONF_PARAM_DESCRIPTION" : "Number of consecutive pressure measurements outside the target pressure interval before performing a drift readjustment."
},
"CONF_PARAM_34" :
{
"CONF_PARAM_DEC_ID" : "PT21",
"CONF_PARAM_LABEL" : "mode de gestion de l'échouage en descente à la pression de dérive (0 = décalage, 1 = attente)",
"CONF_PARAM_LABEL" : "mode de gestion de l'échouage en descente à la pression de dérive (0 = décalage, 1 = attente)",
"CONF_PARAM_DEFINITION" : "TBD",
"CONF_PARAM_NAME" : "CONFIG_GroundingMode_LOGICAL",
"CONF_PARAM_DESCRIPTION" : "Action performed by the float when a grounding is detected. 0: the float changes its drift pressure, 1: the float stays on the seabed until the next phase of the cycle."
},
"CONF_PARAM_35" :
{
"CONF_PARAM_DEC_ID" : "PT23",
"CONF_PARAM_LABEL" : "critère d'échouage: volume cumulé",
"CONF_PARAM_LABEL" : "critère d'échouage: volume cumulé",
"CONF_PARAM_DEFINITION" : "TBD",
"CONF_PARAM_NAME" : "CONFIG_OilVolumeMinForGroundingDetection_cm^3",
"CONF_PARAM_DESCRIPTION" : "This information is a threshold used to detect a grounding of the float. If there is no vertical motion after having tranfered CONFIG_OilVolumeMinForGroundingDetection_cm^3 through the valve, the gounded flag is activated and the float acts as configurated by the CONFIG_GroundingMode_LOGICAL parameter.So, yes it is a configuration parameter (and I can easily understand that it can be modified via remote control since some PROVOR floats have experienced erroneous grounding detection (under study but perhaps due to in-situ conditions)."
},
"CONF_PARAM_36" :
{
"CONF_PARAM_DEC_ID" : "PT24",
"CONF_PARAM_LABEL" : "pression en dessous de laquelle le flotteur reste posé en attente profil remontée",
"CONF_PARAM_LABEL" : "pression en dessous de laquelle le flotteur reste posé en attente profil remontée",
"CONF_PARAM_DEFINITION" : "TBD",
"CONF_PARAM_NAME" : "CONFIG_GroundingModeMinPresThreshold_dbar",
"CONF_PARAM_DESCRIPTION" : "If in grounding mode 0, the float changes its drift pressure only if its current pressure is greater than this value."
},
"CONF_PARAM_37" :
{
"CONF_PARAM_DEC_ID" : "PT25",
"CONF_PARAM_LABEL" : "diminution de la pression visée en cas d'échouage(Pcourante - decal)",
"CONF_PARAM_LABEL" : "diminution de la pression visée en cas d'échouage(Pcourante - decal)",
"CONF_PARAM_DEFINITION" : "TBD",
"CONF_PARAM_NAME" : "CONFIG_GroundingModePresAdjustment_dbar",
"CONF_PARAM_DESCRIPTION" : "If in grounding mode 0, the float changes its drift pressure to its programmed one minus this value only if its current pressure is greater than this value."
},
"CONF_PARAM_38" :
{
"CONF_PARAM_DEC_ID" : "PT26",
"CONF_PARAM_LABEL" : "tolérance sur maintien de la pression de consigne (+/-)",
"CONF_PARAM_LABEL" : "tolérance sur maintien de la pression de consigne (+/-)",
"CONF_PARAM_DEFINITION" : "TBD",
"CONF_PARAM_NAME" : "CONFIG_PressureTargetToleranceDuringDrift_dbar",
"CONF_PARAM_DESCRIPTION" : "Defines the target pressure interval for float drift at parking or profile depth (in dbars)."
Expand Down
Loading

0 comments on commit 1be1ad7

Please sign in to comment.