mahmood19227 1 anno fa
parent
commit
d3fe89fe45
9 ha cambiato i file con 25 aggiunte e 17 eliminazioni
  1. +4
    -2
      CSharp/Equipments/ControlPanels/CDataDisplayConsole.f90
  2. +6
    -4
      CSharp/Equipments/ControlPanels/CDataDisplayConsole.i90
  3. +2
    -1
      CSharp/Equipments/ControlPanels/CHook.f90
  4. +2
    -1
      CSharp/Equipments/ControlPanels/CHook.i90
  5. +2
    -1
      CSharp/Equipments/DrillWatch/DrillWatch.f90
  6. +2
    -1
      CSharp/Equipments/DrillWatch/DrillWatch.i90
  7. BIN
     
  8. +6
    -6
      data_out.json
  9. +1
    -1
      redisContent.json

+ 4
- 2
CSharp/Equipments/ControlPanels/CDataDisplayConsole.f90 Vedi File

@@ -253,6 +253,7 @@ module CDataDisplayConsole
call json%add(p,"MFFIAlarmLED",data%Equipments%DataDisplayConsole%MFFIAlarmLED)
call json%add(p,"MFFIPumpLED",data%Equipments%DataDisplayConsole%MFFIPumpLED)
call json%add(p,"TotalWellDepth",data%Equipments%DataDisplayConsole%TotalWellDepth)
! call json%add(p,"TotalWellDepth",1000)
call json%add(p,"BitDepth",data%Equipments%DataDisplayConsole%BitDepth)
call json%add(p,"HookLoad",data%Equipments%DataDisplayConsole%HookLoad)
call json%add(p,"StandPipePressure",data%Equipments%DataDisplayConsole%StandPipePressure)
@@ -280,8 +281,9 @@ module CDataDisplayConsole
! use CSimulationVariables, only: SetDistanceDrilled
implicit none
real(8), intent(in) :: v
data%Equipments%DataDisplayConsole%TotalWellDepth = v
data%Equipments%DrillingWatch%Depth = v
! print *,"total depth = ",v
data%Equipments%DataDisplayConsole%TotalWellDepth = 1000
data%Equipments%DrillingWatch%Depth = 1000
! call SetDistanceDrilled(v)
end subroutine


+ 6
- 4
CSharp/Equipments/ControlPanels/CDataDisplayConsole.i90 Vedi File

@@ -254,6 +254,7 @@ module CDataDisplayConsole
call json%add(p,"MFFIAlarmLED",data%Equipments%DataDisplayConsole%MFFIAlarmLED)
call json%add(p,"MFFIPumpLED",data%Equipments%DataDisplayConsole%MFFIPumpLED)
call json%add(p,"TotalWellDepth",data%Equipments%DataDisplayConsole%TotalWellDepth)
! call json%add(p,"TotalWellDepth",1000)
call json%add(p,"BitDepth",data%Equipments%DataDisplayConsole%BitDepth)
call json%add(p,"HookLoad",data%Equipments%DataDisplayConsole%HookLoad)
call json%add(p,"StandPipePressure",data%Equipments%DataDisplayConsole%StandPipePressure)
@@ -281,8 +282,9 @@ module CDataDisplayConsole
! use CSimulationVariables, only: SetDistanceDrilled
implicit none
real(8), intent(in) :: v
data%Equipments%DataDisplayConsole%TotalWellDepth = v
data%Equipments%DrillingWatch%Depth = v
! print *,"total depth = ",v
data%Equipments%DataDisplayConsole%TotalWellDepth = 1000
data%Equipments%DrillingWatch%Depth = 1000
! call SetDistanceDrilled(v)
end subroutine
@@ -407,7 +409,7 @@ module CDataDisplayConsole
data%Equipments%DataDisplayConsole%MP1SPMGauge = v
data%Equipments%DataDisplayConsole%MP1SPM = v
!@data%State%unitySignals%(PumpsSpmChanges)) call PumpsSpmChanges(data%Equipments%DataDisplayConsole%MP1SPMGauge, data%Equipments%DataDisplayConsole%MP2SPMGauge)
# 411
# 413

end subroutine
@@ -417,7 +419,7 @@ module CDataDisplayConsole
data%Equipments%DataDisplayConsole%MP2SPMGauge = v
data%Equipments%DataDisplayConsole%MP2SPM = v
!@data%State%unitySignals%(PumpsSpmChanges)) call PumpsSpmChanges(data%Equipments%DataDisplayConsole%MP1SPMGauge, data%Equipments%DataDisplayConsole%MP2SPMGauge)
# 422
# 424

end subroutine
end module CDataDisplayConsole

+ 2
- 1
CSharp/Equipments/ControlPanels/CHook.f90 Vedi File

@@ -43,7 +43,8 @@ module CHook
#ifdef ExcludeExtraChanges
if(data%Equipments%Hook%HookHeight == v) return
#endif
data%Equipments%Hook%HookHeight = v

data%Equipments%Hook%HookHeight = 100
! if(associated(HookHeightPtr)) then
! call HookHeightPtr(data%Equipments%Hook%HookHeight)


+ 2
- 1
CSharp/Equipments/ControlPanels/CHook.i90 Vedi File

@@ -44,7 +44,8 @@ module CHook
#ifdef ExcludeExtraChanges
if(data%Equipments%Hook%HookHeight == v) return
#endif
data%Equipments%Hook%HookHeight = v

data%Equipments%Hook%HookHeight = 100
! if(associated(HookHeightPtr)) then
! call HookHeightPtr(data%Equipments%Hook%HookHeight)


+ 2
- 1
CSharp/Equipments/DrillWatch/DrillWatch.f90 Vedi File

@@ -71,7 +71,8 @@ module DrillingWatchModule
call json%add(p,"SPM1",data%Equipments%DrillingWatch%SPM1)
call json%add(p,"SPM2",data%Equipments%DrillingWatch%SPM2)
call json%add(p,"CasingPressure",data%Equipments%DrillingWatch%CasingPressure)
call json%add(p,"PercentFlow",data%Equipments%DrillingWatch%PercentFlow)
call json%add(p,"PercentFlow",50)
! call json%add(p,"PercentFlow",data%Equipments%DrillingWatch%PercentFlow)
call json%add(p,"PitGainLose",data%Equipments%DrillingWatch%PitGainLose)
call json%add(p,"PitVolume",data%Equipments%DrillingWatch%PitVolume)
call json%add(p,"KillMudVolume",data%Equipments%DrillingWatch%KillMudVolume)


+ 2
- 1
CSharp/Equipments/DrillWatch/DrillWatch.i90 Vedi File

@@ -72,7 +72,8 @@ module DrillingWatchModule
call json%add(p,"SPM1",data%Equipments%DrillingWatch%SPM1)
call json%add(p,"SPM2",data%Equipments%DrillingWatch%SPM2)
call json%add(p,"CasingPressure",data%Equipments%DrillingWatch%CasingPressure)
call json%add(p,"PercentFlow",data%Equipments%DrillingWatch%PercentFlow)
call json%add(p,"PercentFlow",50)
! call json%add(p,"PercentFlow",data%Equipments%DrillingWatch%PercentFlow)
call json%add(p,"PitGainLose",data%Equipments%DrillingWatch%PitGainLose)
call json%add(p,"PitVolume",data%Equipments%DrillingWatch%PitVolume)
call json%add(p,"KillMudVolume",data%Equipments%DrillingWatch%KillMudVolume)


BIN
Vedi File


+ 6
- 6
data_out.json Vedi File

@@ -1,5 +1,5 @@
{
"step": 1,
"step": 53,
"Warnings": {
"PumpWithKellyDisconnected": false,
"PumpWithTopdriveDisconnected": false,
@@ -20,7 +20,7 @@
"DrillPipeParted": false,
"TripWithSlipsSet": false,
"Blowout": false,
"UndergroundBlowout": false,
"UndergroundBlowout": true,
"MaximumWellDepthExceeded": false,
"CrownCollision": false,
"FloorCollision": false,
@@ -89,7 +89,7 @@
"MFFITotalStrokeCounter": 0.0E+0,
"MFFIAlarmLED": 0,
"MFFIPumpLED": 0,
"TotalWellDepth": "NaN",
"TotalWellDepth": 0.1E+4,
"BitDepth": 0.0E+0,
"HookLoad": 0.0E+0,
"StandPipePressure": 0.0E+0,
@@ -142,14 +142,14 @@
},
"Hook": {
"HookHeight_S": 0.0E+0,
"HookHeight": 0.57152001953125E+3
"HookHeight": 0.1E+3
},
"StandPipeManifold": {
"StandPipeGauge1": 0.0E+0,
"StandPipeGauge2": 0.0E+0
},
"DrillingWatch": {
"Depth": "NaN",
"Depth": 0.1E+4,
"BitPosition": -0.348E+1,
"HookLoad": 0.0E+0,
"WeightOnBit": 0.0E+0,
@@ -160,7 +160,7 @@
"SPM1": 0.0E+0,
"SPM2": 0.0E+0,
"CasingPressure": 0.0E+0,
"PercentFlow": "NaN",
"PercentFlow": 50,
"PitGainLose": 0.0E+0,
"PitVolume": 0.0E+0,
"KillMudVolume": 0.0E+0,


+ 1
- 1
redisContent.json
File diff soppresso perché troppo grande
Vedi File


Caricamento…
Annulla
Salva