diff --git a/.vscode/launch.json b/.vscode/launch.json
index 31a181b..5504ea2 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -26,11 +26,23 @@
]
},
{
- "name": "Debug SimulationCore2",
+ "name": "Debug (Liara)",
"type": "cppdbg",
"request": "launch",
"program": "${workspaceRoot}/SimulationCore2",
- "args": ["aberama.iran.liara.ir","32815","4YKFnubfFFjfh4yTK7b0Rg9X","60f8144a-c1b7-4d1a-5d99-08db9e4e35f5","5","1000"],
+ "args": ["aberama.iran.liara.ir", "32815", "4YKFnubfFFjfh4yTK7b0Rg9X", "de972886-410b-440e-f8cc-08dba274a00f", "4", "1000"],
+ "stopAtEntry": false,
+ "cwd": "${workspaceRoot}",
+ "externalConsole": false,
+ "MIMode": "gdb",
+ "preLaunchTask": "make",
+ },
+ {
+ "name": "Debug (Asiatech)",
+ "type": "cppdbg",
+ "request": "launch",
+ "program": "${workspaceRoot}/SimulationCore2",
+ "args": ["85.198.9.229", "6379", "'1qazxsw2$$'", "72a84eb3-eee5-4104-8363-08dba3c9a113", "4", "1000"],
"stopAtEntry": false,
"cwd": "${workspaceRoot}",
"externalConsole": false,
diff --git a/CSharp/BasicInputs/Bha/CStringConfiguration.f90 b/CSharp/BasicInputs/Bha/CStringConfiguration.f90
index f76a585..2acdc7a 100644
--- a/CSharp/BasicInputs/Bha/CStringConfiguration.f90
+++ b/CSharp/BasicInputs/Bha/CStringConfiguration.f90
@@ -29,7 +29,7 @@ module CStringConfiguration
ALLOCATE(data%Configuration%StringConfiguration%StringConfigurations(n_children))
endif
-
+ data%Configuration%StringConfiguration%StringConfigurationCount = n_children
do i=1,n_children
call json%get_child(pitems, i, pitem, found=is_found)
@@ -47,11 +47,11 @@ module CStringConfiguration
call json%get(pval,data%Configuration%StringConfiguration%StringConfigurations(i)%WeightPerLength)
call json%get(pitem,"ComponentLength",pval)
call json%get(pval,data%Configuration%StringConfiguration%StringConfigurations(i)%ComponentLength)
- call json%get(pitem,"NominalToolJointOd",pval)
- call json%get(pval,data%Configuration%StringConfiguration%StringConfigurations(i)%NominalToolJointOd)
- call json%get(pitem,"Grade",pval)
- call json%get(pval,val)
- data%Configuration%StringConfiguration%StringConfigurations(i)%Grade = val
+ ! call json%get(pitem,"NominalToolJointOd",pval)
+ ! call json%get(pval,data%Configuration%StringConfiguration%StringConfigurations(i)%NominalToolJointOd)
+ ! call json%get(pitem,"Grade",pval)
+ ! call json%get(pval,val)
+ ! data%Configuration%StringConfiguration%StringConfigurations(i)%Grade = val
end do
call json%get(p,'BitDefenition',pbit)
call json%get(pbit,'BitType',pval)
@@ -92,11 +92,11 @@ module CStringConfiguration
call json%create_object(pitem,'')
call json%add(pitem,"ComponentLength",data%Configuration%StringConfiguration%StringConfigurations(i)%ComponentLength)
call json%add(pitem,"ComponentType",data%Configuration%StringConfiguration%StringConfigurations(i)%ComponentType)
- call json%add(pitem,"Grade",data%Configuration%StringConfiguration%StringConfigurations(i)%Grade)
+ ! call json%add(pitem,"Grade",data%Configuration%StringConfiguration%StringConfigurations(i)%Grade)
call json%add(pitem,"LengthPerJoint",data%Configuration%StringConfiguration%StringConfigurations(i)%LengthPerJoint)
call json%add(pitem,"NominalId",data%Configuration%StringConfiguration%StringConfigurations(i)%NominalId)
call json%add(pitem,"NominalOd",data%Configuration%StringConfiguration%StringConfigurations(i)%NominalOd)
- call json%add(pitem,"NominalToolJointOd",data%Configuration%StringConfiguration%StringConfigurations(i)%NominalToolJointOd)
+ ! call json%add(pitem,"NominalToolJointOd",data%Configuration%StringConfiguration%StringConfigurations(i)%NominalToolJointOd)
call json%add(pitem,"NumberOfJoint",data%Configuration%StringConfiguration%StringConfigurations(i)%NumberOfJoint)
call json%add(pitem,"WeightPerLength",data%Configuration%StringConfiguration%StringConfigurations(i)%WeightPerLength)
call json%add(pitems,pitem)
diff --git a/CSharp/BasicInputs/Bha/CStringConfiguration.i90 b/CSharp/BasicInputs/Bha/CStringConfiguration.i90
index ffdccbe..7b0c46d 100644
--- a/CSharp/BasicInputs/Bha/CStringConfiguration.i90
+++ b/CSharp/BasicInputs/Bha/CStringConfiguration.i90
@@ -1,4 +1,4 @@
-# 1 "/mnt/c/Projects/VSIM/SimulationCore2/CSharp/BasicInputs/Bha/CStringConfiguration.f90"
+# 1 "/home/admin/SimulationCore2/CSharp/BasicInputs/Bha/CStringConfiguration.f90"
module CStringConfiguration
use CStringConfigurationVariables
use SimulationVariables
@@ -30,7 +30,7 @@ module CStringConfiguration
ALLOCATE(data%Configuration%StringConfiguration%StringConfigurations(n_children))
endif
-
+ data%Configuration%StringConfiguration%StringConfigurationCount = n_children
do i=1,n_children
call json%get_child(pitems, i, pitem, found=is_found)
@@ -48,11 +48,11 @@ module CStringConfiguration
call json%get(pval,data%Configuration%StringConfiguration%StringConfigurations(i)%WeightPerLength)
call json%get(pitem,"ComponentLength",pval)
call json%get(pval,data%Configuration%StringConfiguration%StringConfigurations(i)%ComponentLength)
- call json%get(pitem,"NominalToolJointOd",pval)
- call json%get(pval,data%Configuration%StringConfiguration%StringConfigurations(i)%NominalToolJointOd)
- call json%get(pitem,"Grade",pval)
- call json%get(pval,val)
- data%Configuration%StringConfiguration%StringConfigurations(i)%Grade = val
+! call json%get(pitem,"NominalToolJointOd",pval)
+! call json%get(pval,data%Configuration%StringConfiguration%StringConfigurations(i)%NominalToolJointOd)
+! call json%get(pitem,"Grade",pval)
+! call json%get(pval,val)
+! data%Configuration%StringConfiguration%StringConfigurations(i)%Grade = val
end do
call json%get(p,'BitDefenition',pbit)
call json%get(pbit,'BitType',pval)
@@ -93,11 +93,11 @@ module CStringConfiguration
call json%create_object(pitem,'')
call json%add(pitem,"ComponentLength",data%Configuration%StringConfiguration%StringConfigurations(i)%ComponentLength)
call json%add(pitem,"ComponentType",data%Configuration%StringConfiguration%StringConfigurations(i)%ComponentType)
- call json%add(pitem,"Grade",data%Configuration%StringConfiguration%StringConfigurations(i)%Grade)
+! call json%add(pitem,"Grade",data%Configuration%StringConfiguration%StringConfigurations(i)%Grade)
call json%add(pitem,"LengthPerJoint",data%Configuration%StringConfiguration%StringConfigurations(i)%LengthPerJoint)
call json%add(pitem,"NominalId",data%Configuration%StringConfiguration%StringConfigurations(i)%NominalId)
call json%add(pitem,"NominalOd",data%Configuration%StringConfiguration%StringConfigurations(i)%NominalOd)
- call json%add(pitem,"NominalToolJointOd",data%Configuration%StringConfiguration%StringConfigurations(i)%NominalToolJointOd)
+! call json%add(pitem,"NominalToolJointOd",data%Configuration%StringConfiguration%StringConfigurations(i)%NominalToolJointOd)
call json%add(pitem,"NumberOfJoint",data%Configuration%StringConfiguration%StringConfigurations(i)%NumberOfJoint)
call json%add(pitem,"WeightPerLength",data%Configuration%StringConfiguration%StringConfigurations(i)%WeightPerLength)
call json%add(pitems,pitem)
diff --git a/CSharp/BasicInputs/Bha/CStringConfigurationVariables.f90 b/CSharp/BasicInputs/Bha/CStringConfigurationVariables.f90
index 0f03f62..216b032 100644
--- a/CSharp/BasicInputs/Bha/CStringConfigurationVariables.f90
+++ b/CSharp/BasicInputs/Bha/CStringConfigurationVariables.f90
@@ -20,8 +20,8 @@ module CStringConfigurationVariables
real(8) :: NominalId
real(8) :: WeightPerLength
real(8) :: ComponentLength
- real(8) :: NominalToolJointOd
- character(1) :: Grade
+ ! real(8) :: NominalToolJointOd
+ ! character(1) :: Grade
end type CStringItem
type, bind(c), public :: CBitInfo
diff --git a/CSharp/BasicInputs/Bha/CStringConfigurationVariables.i90 b/CSharp/BasicInputs/Bha/CStringConfigurationVariables.i90
index ad3b7ca..ad77452 100644
--- a/CSharp/BasicInputs/Bha/CStringConfigurationVariables.i90
+++ b/CSharp/BasicInputs/Bha/CStringConfigurationVariables.i90
@@ -1,4 +1,4 @@
-# 1 "/mnt/c/Projects/VSIM/SimulationCore2/CSharp/BasicInputs/Bha/CStringConfigurationVariables.f90"
+# 1 "/home/admin/SimulationCore2/CSharp/BasicInputs/Bha/CStringConfigurationVariables.f90"
module CStringConfigurationVariables
implicit none
public
@@ -21,8 +21,8 @@ module CStringConfigurationVariables
real(8) :: NominalId
real(8) :: WeightPerLength
real(8) :: ComponentLength
- real(8) :: NominalToolJointOd
- character(1) :: Grade
+! real(8) :: NominalToolJointOd
+! character(1) :: Grade
end type CStringItem
type, bind(c), public :: CBitInfo
diff --git a/CSharp/BasicInputs/CMudPropertiesVariables.i90 b/CSharp/BasicInputs/CMudPropertiesVariables.i90
index c88b4fa..cb13b00 100644
--- a/CSharp/BasicInputs/CMudPropertiesVariables.i90
+++ b/CSharp/BasicInputs/CMudPropertiesVariables.i90
@@ -1,4 +1,4 @@
-# 1 "/mnt/c/Projects/VSIM/SimulationCore2/CSharp/BasicInputs/CMudPropertiesVariables.f90"
+# 1 "/home/admin/SimulationCore2/CSharp/BasicInputs/CMudPropertiesVariables.f90"
module CMudPropertiesVariables
use CIActionReference
!**use CDoubleEventHandlerCollection
diff --git a/CSharp/BasicInputs/Geology/CFormation.f90 b/CSharp/BasicInputs/Geology/CFormation.f90
index 16bf2d8..c30d3f8 100644
--- a/CSharp/BasicInputs/Geology/CFormation.f90
+++ b/CSharp/BasicInputs/Geology/CFormation.f90
@@ -23,6 +23,7 @@ module CFormation
if (.not. allocated(data%Configuration%Formation%Formations) .or. size(data%Configuration%Formation%Formations)/=n_children) then
ALLOCATE(data%Configuration%Formation%Formations(n_children))
endif
+ data%Configuration%Formation%Count = n_children
do i=1,n_children
call json%get_child(p, i, pitem, found=is_found)
diff --git a/CSharp/BasicInputs/Geology/CFormation.i90 b/CSharp/BasicInputs/Geology/CFormation.i90
index edf9157..6f43b0e 100644
--- a/CSharp/BasicInputs/Geology/CFormation.i90
+++ b/CSharp/BasicInputs/Geology/CFormation.i90
@@ -1,4 +1,4 @@
-# 1 "/mnt/c/Projects/VSIM/SimulationCore2/CSharp/BasicInputs/Geology/CFormation.f90"
+# 1 "/home/admin/SimulationCore2/CSharp/BasicInputs/Geology/CFormation.f90"
module CFormation
use CFormationVariables
use SimulationVariables
@@ -24,6 +24,7 @@ module CFormation
if (.not. allocated(data%Configuration%Formation%Formations) .or. size(data%Configuration%Formation%Formations)/=n_children) then
ALLOCATE(data%Configuration%Formation%Formations(n_children))
endif
+ data%Configuration%Formation%Count = n_children
do i=1,n_children
call json%get_child(p, i, pitem, found=is_found)
diff --git a/CSharp/BasicInputs/Geology/CReservoir.f90 b/CSharp/BasicInputs/Geology/CReservoir.f90
index 62c4b11..da62e80 100644
--- a/CSharp/BasicInputs/Geology/CReservoir.f90
+++ b/CSharp/BasicInputs/Geology/CReservoir.f90
@@ -17,20 +17,20 @@ module CReservoir
call json%get(pval,data%Configuration%Reservoir%FormationNo)
call json%get(p,'FormationTop',pval)
call json%get(pval,data%Configuration%Reservoir%FormationTop)
- call json%get(p,'PressureGradient',pval)
- call json%get(pval,data%Configuration%Reservoir%PressureGradient)
+ ! call json%get(p,'PressureGradient',pval)
+ ! call json%get(pval,data%Configuration%Reservoir%PressureGradient)
call json%get(p,'FormationPermeability',pval)
call json%get(pval,data%Configuration%Reservoir%FormationPermeability)
- call json%get(p,'GeothermalGradient',pval)
- call json%get(pval,data%Configuration%Reservoir%GeothermalGradient)
- call json%get(p,'FluidType',pval)
- call json%get(pval,data%Configuration%Reservoir%FluidType)
- call json%get(p,'FluidGradient',pval)
- call json%get(pval,data%Configuration%Reservoir%FluidGradient)
- call json%get(p,'FluidViscosity',pval)
- call json%get(pval,data%Configuration%Reservoir%FluidViscosity)
- call json%get(p,'InactiveInflux',pval)
- call json%get(pval,data%Configuration%Reservoir%InactiveInflux)
+ ! call json%get(p,'GeothermalGradient',pval)
+ ! call json%get(pval,data%Configuration%Reservoir%GeothermalGradient)
+ ! call json%get(p,'FluidType',pval)
+ ! call json%get(pval,data%Configuration%Reservoir%FluidType)
+ ! call json%get(p,'FluidGradient',pval)
+ ! call json%get(pval,data%Configuration%Reservoir%FluidGradient)
+ ! call json%get(p,'FluidViscosity',pval)
+ ! call json%get(pval,data%Configuration%Reservoir%FluidViscosity)
+ ! call json%get(p,'InactiveInflux',pval)
+ ! call json%get(pval,data%Configuration%Reservoir%InactiveInflux)
call json%get(p,'IsAutoMigrationRateSelected',pval)
call json%get(pval,data%Configuration%Reservoir%IsAutoMigrationRateSelected)
call json%get(p,'AutoMigrationRate',pval)
@@ -39,32 +39,32 @@ module CReservoir
call json%get(pval,data%Configuration%Reservoir%MakeKickSinglePacket)
end subroutine
- subroutine ReservoirToJson(parent)
+ ! subroutine ReservoirToJson(parent)
- type(json_value),pointer :: parent
- type(json_core) :: json
- type(json_value),pointer :: p
+ ! type(json_value),pointer :: parent
+ ! type(json_core) :: json
+ ! type(json_value),pointer :: p
- ! 1. create new node
- call json%create_object(p,'Reservoir')
+ ! ! 1. create new node
+ ! call json%create_object(p,'Reservoir')
- ! 2. add member of data type to new node
- ! call StringConfigurationToJson(p)
- ! call FormationToJson(p)
- call json%add(p,"AutoMigrationRate",data%Configuration%Reservoir%AutoMigrationRate)
- call json%add(p,"FluidGradient",data%Configuration%Reservoir%FluidGradient)
- call json%add(p,"FluidType",data%Configuration%Reservoir%FluidType)
- call json%add(p,"FluidViscosity",data%Configuration%Reservoir%FluidViscosity)
- call json%add(p,"FormationNo",data%Configuration%Reservoir%FormationNo)
- call json%add(p,"FormationPermeability",data%Configuration%Reservoir%FormationPermeability)
- call json%add(p,"FormationTop",data%Configuration%Reservoir%FormationTop)
- call json%add(p,"GeothermalGradient",data%Configuration%Reservoir%GeothermalGradient)
- call json%add(p,"InactiveInflux",data%Configuration%Reservoir%InactiveInflux)
- call json%add(p,"IsAutoMigrationRateSelected",data%Configuration%Reservoir%IsAutoMigrationRateSelected)
- call json%add(p,"MakeKickSinglePacket",data%Configuration%Reservoir%MakeKickSinglePacket)
- call json%add(p,"PressureGradient",data%Configuration%Reservoir%PressureGradient)
+ ! ! 2. add member of data type to new node
+ ! ! call StringConfigurationToJson(p)
+ ! ! call FormationToJson(p)
+ ! call json%add(p,"AutoMigrationRate",data%Configuration%Reservoir%AutoMigrationRate)
+ ! ! call json%add(p,"FluidGradient",data%Configuration%Reservoir%FluidGradient)
+ ! ! call json%add(p,"FluidType",data%Configuration%Reservoir%FluidType)
+ ! ! call json%add(p,"FluidViscosity",data%Configuration%Reservoir%FluidViscosity)
+ ! call json%add(p,"FormationNo",data%Configuration%Reservoir%FormationNo)
+ ! call json%add(p,"FormationPermeability",data%Configuration%Reservoir%FormationPermeability)
+ ! call json%add(p,"FormationTop",data%Configuration%Reservoir%FormationTop)
+ ! call json%add(p,"GeothermalGradient",data%Configuration%Reservoir%GeothermalGradient)
+ ! call json%add(p,"InactiveInflux",data%Configuration%Reservoir%InactiveInflux)
+ ! call json%add(p,"IsAutoMigrationRateSelected",data%Configuration%Reservoir%IsAutoMigrationRateSelected)
+ ! call json%add(p,"MakeKickSinglePacket",data%Configuration%Reservoir%MakeKickSinglePacket)
+ ! call json%add(p,"PressureGradient",data%Configuration%Reservoir%PressureGradient)
- ! 3. add new node to parent
- call json%add(parent,p)
- end subroutine
+ ! ! 3. add new node to parent
+ ! call json%add(parent,p)
+ ! end subroutine
end module CReservoir
\ No newline at end of file
diff --git a/CSharp/BasicInputs/Geology/CReservoir.i90 b/CSharp/BasicInputs/Geology/CReservoir.i90
index 7da502e..982758e 100644
--- a/CSharp/BasicInputs/Geology/CReservoir.i90
+++ b/CSharp/BasicInputs/Geology/CReservoir.i90
@@ -1,4 +1,4 @@
-# 1 "/mnt/c/Projects/VSIM/SimulationCore2/CSharp/BasicInputs/Geology/CReservoir.f90"
+# 1 "/home/admin/SimulationCore2/CSharp/BasicInputs/Geology/CReservoir.f90"
module CReservoir
use SimulationVariables
use json_module
@@ -18,20 +18,20 @@ module CReservoir
call json%get(pval,data%Configuration%Reservoir%FormationNo)
call json%get(p,'FormationTop',pval)
call json%get(pval,data%Configuration%Reservoir%FormationTop)
- call json%get(p,'PressureGradient',pval)
- call json%get(pval,data%Configuration%Reservoir%PressureGradient)
+! call json%get(p,'PressureGradient',pval)
+! call json%get(pval,data%Configuration%Reservoir%PressureGradient)
call json%get(p,'FormationPermeability',pval)
call json%get(pval,data%Configuration%Reservoir%FormationPermeability)
- call json%get(p,'GeothermalGradient',pval)
- call json%get(pval,data%Configuration%Reservoir%GeothermalGradient)
- call json%get(p,'FluidType',pval)
- call json%get(pval,data%Configuration%Reservoir%FluidType)
- call json%get(p,'FluidGradient',pval)
- call json%get(pval,data%Configuration%Reservoir%FluidGradient)
- call json%get(p,'FluidViscosity',pval)
- call json%get(pval,data%Configuration%Reservoir%FluidViscosity)
- call json%get(p,'InactiveInflux',pval)
- call json%get(pval,data%Configuration%Reservoir%InactiveInflux)
+! call json%get(p,'GeothermalGradient',pval)
+! call json%get(pval,data%Configuration%Reservoir%GeothermalGradient)
+! call json%get(p,'FluidType',pval)
+! call json%get(pval,data%Configuration%Reservoir%FluidType)
+! call json%get(p,'FluidGradient',pval)
+! call json%get(pval,data%Configuration%Reservoir%FluidGradient)
+! call json%get(p,'FluidViscosity',pval)
+! call json%get(pval,data%Configuration%Reservoir%FluidViscosity)
+! call json%get(p,'InactiveInflux',pval)
+! call json%get(pval,data%Configuration%Reservoir%InactiveInflux)
call json%get(p,'IsAutoMigrationRateSelected',pval)
call json%get(pval,data%Configuration%Reservoir%IsAutoMigrationRateSelected)
call json%get(p,'AutoMigrationRate',pval)
@@ -40,32 +40,32 @@ module CReservoir
call json%get(pval,data%Configuration%Reservoir%MakeKickSinglePacket)
end subroutine
- subroutine ReservoirToJson(parent)
+! subroutine ReservoirToJson(parent)
- type(json_value),pointer :: parent
- type(json_core) :: json
- type(json_value),pointer :: p
+! type(json_value),pointer :: parent
+! type(json_core) :: json
+! type(json_value),pointer :: p
-! 1. create new node
- call json%create_object(p,'Reservoir')
+! ! 1. create new node
+! call json%create_object(p,'Reservoir')
-! 2. add member of data type to new node
-! call StringConfigurationToJson(p)
-! call FormationToJson(p)
- call json%add(p,"AutoMigrationRate",data%Configuration%Reservoir%AutoMigrationRate)
- call json%add(p,"FluidGradient",data%Configuration%Reservoir%FluidGradient)
- call json%add(p,"FluidType",data%Configuration%Reservoir%FluidType)
- call json%add(p,"FluidViscosity",data%Configuration%Reservoir%FluidViscosity)
- call json%add(p,"FormationNo",data%Configuration%Reservoir%FormationNo)
- call json%add(p,"FormationPermeability",data%Configuration%Reservoir%FormationPermeability)
- call json%add(p,"FormationTop",data%Configuration%Reservoir%FormationTop)
- call json%add(p,"GeothermalGradient",data%Configuration%Reservoir%GeothermalGradient)
- call json%add(p,"InactiveInflux",data%Configuration%Reservoir%InactiveInflux)
- call json%add(p,"IsAutoMigrationRateSelected",data%Configuration%Reservoir%IsAutoMigrationRateSelected)
- call json%add(p,"MakeKickSinglePacket",data%Configuration%Reservoir%MakeKickSinglePacket)
- call json%add(p,"PressureGradient",data%Configuration%Reservoir%PressureGradient)
+! ! 2. add member of data type to new node
+! ! call StringConfigurationToJson(p)
+! ! call FormationToJson(p)
+! call json%add(p,"AutoMigrationRate",data%Configuration%Reservoir%AutoMigrationRate)
+! ! call json%add(p,"FluidGradient",data%Configuration%Reservoir%FluidGradient)
+! ! call json%add(p,"FluidType",data%Configuration%Reservoir%FluidType)
+! ! call json%add(p,"FluidViscosity",data%Configuration%Reservoir%FluidViscosity)
+! call json%add(p,"FormationNo",data%Configuration%Reservoir%FormationNo)
+! call json%add(p,"FormationPermeability",data%Configuration%Reservoir%FormationPermeability)
+! call json%add(p,"FormationTop",data%Configuration%Reservoir%FormationTop)
+! call json%add(p,"GeothermalGradient",data%Configuration%Reservoir%GeothermalGradient)
+! call json%add(p,"InactiveInflux",data%Configuration%Reservoir%InactiveInflux)
+! call json%add(p,"IsAutoMigrationRateSelected",data%Configuration%Reservoir%IsAutoMigrationRateSelected)
+! call json%add(p,"MakeKickSinglePacket",data%Configuration%Reservoir%MakeKickSinglePacket)
+! call json%add(p,"PressureGradient",data%Configuration%Reservoir%PressureGradient)
-! 3. add new node to parent
- call json%add(parent,p)
- end subroutine
+! ! 3. add new node to parent
+! call json%add(parent,p)
+! end subroutine
end module CReservoir
diff --git a/CSharp/BasicInputs/Geology/CReservoirVariables.f90 b/CSharp/BasicInputs/Geology/CReservoirVariables.f90
index fad94f7..5ab5d8e 100644
--- a/CSharp/BasicInputs/Geology/CReservoirVariables.f90
+++ b/CSharp/BasicInputs/Geology/CReservoirVariables.f90
@@ -10,12 +10,12 @@ module CReservoirVariables
! variables
integer :: FormationNo
real(8) :: FormationTop
- real(8) :: PressureGradient
+ ! real(8) :: PressureGradient
real(8) :: FormationPermeability
- real(8) :: GeothermalGradient
- integer :: FluidType
- real(8) :: FluidGradient
- real(8) :: FluidViscosity
+ ! real(8) :: GeothermalGradient
+ ! integer :: FluidType
+ ! real(8) :: FluidGradient
+ ! real(8) :: FluidViscosity
logical :: InactiveInflux
logical :: IsAutoMigrationRateSelected
real(8) :: AutoMigrationRate
diff --git a/CSharp/BasicInputs/Geology/CReservoirVariables.i90 b/CSharp/BasicInputs/Geology/CReservoirVariables.i90
index cb254ac..f56ba66 100644
--- a/CSharp/BasicInputs/Geology/CReservoirVariables.i90
+++ b/CSharp/BasicInputs/Geology/CReservoirVariables.i90
@@ -1,4 +1,4 @@
-# 1 "/mnt/c/Projects/VSIM/SimulationCore2/CSharp/BasicInputs/Geology/CReservoirVariables.f90"
+# 1 "/home/admin/SimulationCore2/CSharp/BasicInputs/Geology/CReservoirVariables.f90"
module CReservoirVariables
implicit none
public
@@ -11,12 +11,12 @@ module CReservoirVariables
! variables
integer :: FormationNo
real(8) :: FormationTop
- real(8) :: PressureGradient
+! real(8) :: PressureGradient
real(8) :: FormationPermeability
- real(8) :: GeothermalGradient
- integer :: FluidType
- real(8) :: FluidGradient
- real(8) :: FluidViscosity
+! real(8) :: GeothermalGradient
+! integer :: FluidType
+! real(8) :: FluidGradient
+! real(8) :: FluidViscosity
logical :: InactiveInflux
logical :: IsAutoMigrationRateSelected
real(8) :: AutoMigrationRate
diff --git a/CSharp/BasicInputs/Geology/CShoeVariables.i90 b/CSharp/BasicInputs/Geology/CShoeVariables.i90
index 2608829..d456acd 100644
--- a/CSharp/BasicInputs/Geology/CShoeVariables.i90
+++ b/CSharp/BasicInputs/Geology/CShoeVariables.i90
@@ -1,4 +1,4 @@
-# 1 "/mnt/c/Projects/VSIM/SimulationCore2/CSharp/BasicInputs/Geology/CShoeVariables.f90"
+# 1 "/home/admin/SimulationCore2/CSharp/BasicInputs/Geology/CShoeVariables.f90"
module CShoeVariables
implicit none
public
diff --git a/CSharp/BasicInputs/MudProperties.i90 b/CSharp/BasicInputs/MudProperties.i90
index c0b3075..fc4103b 100644
--- a/CSharp/BasicInputs/MudProperties.i90
+++ b/CSharp/BasicInputs/MudProperties.i90
@@ -1,4 +1,4 @@
-# 1 "/mnt/c/Projects/VSIM/SimulationCore2/CSharp/BasicInputs/MudProperties.f90"
+# 1 "/home/admin/SimulationCore2/CSharp/BasicInputs/MudProperties.f90"
module MudPropertiesModule
use SimulationVariables
use json_module
diff --git a/CSharp/BasicInputs/RigSpecifications/CBopStack.i90 b/CSharp/BasicInputs/RigSpecifications/CBopStack.i90
index 911f3bb..b58a0b5 100644
--- a/CSharp/BasicInputs/RigSpecifications/CBopStack.i90
+++ b/CSharp/BasicInputs/RigSpecifications/CBopStack.i90
@@ -1,4 +1,4 @@
-# 1 "/mnt/c/Projects/VSIM/SimulationCore2/CSharp/BasicInputs/RigSpecifications/CBopStack.f90"
+# 1 "/home/admin/SimulationCore2/CSharp/BasicInputs/RigSpecifications/CBopStack.f90"
module CBopStack
use SimulationVariables
use json_module
diff --git a/CSharp/BasicInputs/RigSpecifications/CBopStackVariables.i90 b/CSharp/BasicInputs/RigSpecifications/CBopStackVariables.i90
index 3b1a6f9..e4b78e1 100644
--- a/CSharp/BasicInputs/RigSpecifications/CBopStackVariables.i90
+++ b/CSharp/BasicInputs/RigSpecifications/CBopStackVariables.i90
@@ -1,4 +1,4 @@
-# 1 "/mnt/c/Projects/VSIM/SimulationCore2/CSharp/BasicInputs/RigSpecifications/CBopStackVariables.f90"
+# 1 "/home/admin/SimulationCore2/CSharp/BasicInputs/RigSpecifications/CBopStackVariables.f90"
module CBopStackVariables
implicit none
public
diff --git a/CSharp/BasicInputs/RigSpecifications/CHoisting.f90 b/CSharp/BasicInputs/RigSpecifications/CHoisting.f90
index 33f64c7..975272d 100644
--- a/CSharp/BasicInputs/RigSpecifications/CHoisting.f90
+++ b/CSharp/BasicInputs/RigSpecifications/CHoisting.f90
@@ -28,6 +28,9 @@ module CHoisting
call json%get(pval,data%Configuration%Hoisting%NumberOfLine)
call json%get(p,'DrillingLineBreakingLoad',pval)
call json%get(pval,data%Configuration%Hoisting%DrillingLineBreakingLoad)
+
+ !@@@
+ data%Configuration%Hoisting%NumberOfLine = 10
end subroutine
subroutine HoistingToJson(parent)
diff --git a/CSharp/BasicInputs/RigSpecifications/CHoistingVariables.i90 b/CSharp/BasicInputs/RigSpecifications/CHoistingVariables.i90
index c7ef1c2..726e673 100644
--- a/CSharp/BasicInputs/RigSpecifications/CHoistingVariables.i90
+++ b/CSharp/BasicInputs/RigSpecifications/CHoistingVariables.i90
@@ -1,4 +1,4 @@
-# 1 "/mnt/c/Projects/VSIM/SimulationCore2/CSharp/BasicInputs/RigSpecifications/CHoistingVariables.f90"
+# 1 "/home/admin/SimulationCore2/CSharp/BasicInputs/RigSpecifications/CHoistingVariables.f90"
module CHoistingVariables
implicit none
public
diff --git a/CSharp/BasicInputs/RigSpecifications/CPower.i90 b/CSharp/BasicInputs/RigSpecifications/CPower.i90
index 0800c15..bec13d4 100644
--- a/CSharp/BasicInputs/RigSpecifications/CPower.i90
+++ b/CSharp/BasicInputs/RigSpecifications/CPower.i90
@@ -1,4 +1,4 @@
-# 1 "/mnt/c/Projects/VSIM/SimulationCore2/CSharp/BasicInputs/RigSpecifications/CPower.f90"
+# 1 "/home/admin/SimulationCore2/CSharp/BasicInputs/RigSpecifications/CPower.f90"
module CPower
use SimulationVariables
use json_module
diff --git a/CSharp/BasicInputs/RigSpecifications/CPumps.f90 b/CSharp/BasicInputs/RigSpecifications/CPumps.f90
index 4617c08..e49dc0b 100644
--- a/CSharp/BasicInputs/RigSpecifications/CPumps.f90
+++ b/CSharp/BasicInputs/RigSpecifications/CPumps.f90
@@ -5,55 +5,55 @@ module CPumps
public
contains
- subroutine PumpsToJson(parent)
+ ! subroutine PumpsToJson(parent)
- type(json_value),pointer :: parent
- type(json_core) :: json
- type(json_value),pointer :: p
+ ! type(json_value),pointer :: parent
+ ! type(json_core) :: json
+ ! type(json_value),pointer :: p
- ! 1. create new node
- call json%create_object(p,'Pumps')
+ ! ! 1. create new node
+ ! call json%create_object(p,'Pumps')
- ! 2. add member of data type to new node
- ! call StringConfigurationToJson(p)
- ! call FormationToJson(p)
- call json%add(p,"MudPump1LinerDiameter",data%Configuration%Pumps%MudPump1LinerDiameter)
- call json%add(p,"MudPump1Stroke",data%Configuration%Pumps%MudPump1Stroke)
- call json%add(p,"MudPump1MechanicalEfficiency",data%Configuration%Pumps%MudPump1MechanicalEfficiency)
- call json%add(p,"MudPump1VolumetricEfficiency",data%Configuration%Pumps%MudPump1VolumetricEfficiency)
- call json%add(p,"MudPump1Output",data%Configuration%Pumps%MudPump1Output)
- call json%add(p,"MudPump1OutputBblStroke",data%Configuration%Pumps%MudPump1OutputBblStroke)
- call json%add(p,"MudPump1Maximum",data%Configuration%Pumps%MudPump1Maximum)
- call json%add(p,"MudPump1ReliefValvePressure",data%Configuration%Pumps%MudPump1ReliefValvePressure)
- call json%add(p,"MudPump2LinerDiameter",data%Configuration%Pumps%MudPump2LinerDiameter)
- call json%add(p,"MudPump2Stroke",data%Configuration%Pumps%MudPump2Stroke)
- call json%add(p,"MudPump2MechanicalEfficiency",data%Configuration%Pumps%MudPump2MechanicalEfficiency)
- call json%add(p,"MudPump2VolumetricEfficiency",data%Configuration%Pumps%MudPump2VolumetricEfficiency)
- call json%add(p,"MudPump2Output",data%Configuration%Pumps%MudPump2Output)
- call json%add(p,"MudPump2OutputBblStroke",data%Configuration%Pumps%MudPump2OutputBblStroke)
- call json%add(p,"MudPump2Maximum",data%Configuration%Pumps%MudPump2Maximum)
- call json%add(p,"MudPump2ReliefValvePressure",data%Configuration%Pumps%MudPump2ReliefValvePressure)
- call json%add(p,"CementPumpLinerDiameter",data%Configuration%Pumps%CementPumpLinerDiameter)
- call json%add(p,"CementPumpStroke",data%Configuration%Pumps%CementPumpStroke)
- call json%add(p,"CementPumpMechanicalEfficiency",data%Configuration%Pumps%CementPumpMechanicalEfficiency)
- call json%add(p,"CementPumpVolumetricEfficiency",data%Configuration%Pumps%CementPumpVolumetricEfficiency)
- call json%add(p,"CementPumpOutput",data%Configuration%Pumps%CementPumpOutput)
- call json%add(p,"CementPumpOutputBblStroke",data%Configuration%Pumps%CementPumpOutputBblStroke)
- call json%add(p,"CementPumpMaximum",data%Configuration%Pumps%CementPumpMaximum)
- call json%add(p,"CementPumpReliefValvePressure ",data%Configuration%Pumps%CementPumpReliefValvePressure )
- call json%add(p,"MudPump1ReliefValveIsSet",data%Configuration%Pumps%MudPump1ReliefValveIsSet)
- call json%add(p,"MudPump2ReliefValveIsSet",data%Configuration%Pumps%MudPump2ReliefValveIsSet)
- call json%add(p,"CementPumpReliefValveIsSet",data%Configuration%Pumps%CementPumpReliefValveIsSet)
- ! call json%add(p,"ManualPumpPower",data%Configuration%Pumps%ManualPumpPower)
- ! call json%add(p,"Valve1",data%Configuration%Pumps%Valve1)
- ! call json%add(p,"Valve2",data%Configuration%Pumps%Valve2)
- ! call json%add(p,"Valve3",data%Configuration%Pumps%Valve3)
- ! call json%add(p,"Valve4",data%Configuration%Pumps%Valve4)
- ! call json%add(p,"Valve5",data%Configuration%Pumps%Valve5)
+ ! ! 2. add member of data type to new node
+ ! ! call StringConfigurationToJson(p)
+ ! ! call FormationToJson(p)
+ ! call json%add(p,"MudPump1LinerDiameter",data%Configuration%Pumps%MudPump1LinerDiameter)
+ ! call json%add(p,"MudPump1Stroke",data%Configuration%Pumps%MudPump1Stroke)
+ ! call json%add(p,"MudPump1MechanicalEfficiency",data%Configuration%Pumps%MudPump1MechanicalEfficiency)
+ ! call json%add(p,"MudPump1VolumetricEfficiency",data%Configuration%Pumps%MudPump1VolumetricEfficiency)
+ ! call json%add(p,"MudPump1Output",data%Configuration%Pumps%MudPump1Output)
+ ! call json%add(p,"MudPump1OutputBblStroke",data%Configuration%Pumps%MudPump1OutputBblStroke)
+ ! call json%add(p,"MudPump1Maximum",data%Configuration%Pumps%MudPump1Maximum)
+ ! call json%add(p,"MudPump1ReliefValvePressure",data%Configuration%Pumps%MudPump1ReliefValvePressure)
+ ! call json%add(p,"MudPump2LinerDiameter",data%Configuration%Pumps%MudPump2LinerDiameter)
+ ! call json%add(p,"MudPump2Stroke",data%Configuration%Pumps%MudPump2Stroke)
+ ! call json%add(p,"MudPump2MechanicalEfficiency",data%Configuration%Pumps%MudPump2MechanicalEfficiency)
+ ! ! call json%add(p,"MudPump2VolumetricEfficiency",data%Configuration%Pumps%MudPump2VolumetricEfficiency)
+ ! call json%add(p,"MudPump2Output",data%Configuration%Pumps%MudPump2Output)
+ ! call json%add(p,"MudPump2OutputBblStroke",data%Configuration%Pumps%MudPump2OutputBblStroke)
+ ! call json%add(p,"MudPump2Maximum",data%Configuration%Pumps%MudPump2Maximum)
+ ! call json%add(p,"MudPump2ReliefValvePressure",data%Configuration%Pumps%MudPump2ReliefValvePressure)
+ ! call json%add(p,"CementPumpLinerDiameter",data%Configuration%Pumps%CementPumpLinerDiameter)
+ ! call json%add(p,"CementPumpStroke",data%Configuration%Pumps%CementPumpStroke)
+ ! call json%add(p,"CementPumpMechanicalEfficiency",data%Configuration%Pumps%CementPumpMechanicalEfficiency)
+ ! ! call json%add(p,"CementPumpVolumetricEfficiency",data%Configuration%Pumps%CementPumpVolumetricEfficiency)
+ ! call json%add(p,"CementPumpOutput",data%Configuration%Pumps%CementPumpOutput)
+ ! call json%add(p,"CementPumpOutputBblStroke",data%Configuration%Pumps%CementPumpOutputBblStroke)
+ ! call json%add(p,"CementPumpMaximum",data%Configuration%Pumps%CementPumpMaximum)
+ ! call json%add(p,"CementPumpReliefValvePressure ",data%Configuration%Pumps%CementPumpReliefValvePressure )
+ ! call json%add(p,"MudPump1ReliefValveIsSet",data%Configuration%Pumps%MudPump1ReliefValveIsSet)
+ ! call json%add(p,"MudPump2ReliefValveIsSet",data%Configuration%Pumps%MudPump2ReliefValveIsSet)
+ ! call json%add(p,"CementPumpReliefValveIsSet",data%Configuration%Pumps%CementPumpReliefValveIsSet)
+ ! ! call json%add(p,"ManualPumpPower",data%Configuration%Pumps%ManualPumpPower)
+ ! ! call json%add(p,"Valve1",data%Configuration%Pumps%Valve1)
+ ! ! call json%add(p,"Valve2",data%Configuration%Pumps%Valve2)
+ ! ! call json%add(p,"Valve3",data%Configuration%Pumps%Valve3)
+ ! ! call json%add(p,"Valve4",data%Configuration%Pumps%Valve4)
+ ! ! call json%add(p,"Valve5",data%Configuration%Pumps%Valve5)
- ! 3. add new node to parent
- call json%add(parent,p)
- end subroutine
+ ! ! 3. add new node to parent
+ ! call json%add(parent,p)
+ ! end subroutine
subroutine PumpsFromJson(parent)
use json_module,IK =>json_ik
@@ -69,8 +69,8 @@ module CPumps
call json%get(pitem,data%Configuration%Pumps%MudPump1Stroke)
call json%get(p,"MudPump1MechanicalEfficiency",pitem)
call json%get(pitem,data%Configuration%Pumps%MudPump1MechanicalEfficiency)
- call json%get(p,"MudPump1VolumetricEfficiency",pitem)
- call json%get(pitem,data%Configuration%Pumps%MudPump1VolumetricEfficiency)
+ ! call json%get(p,"MudPump1VolumetricEfficiency",pitem)
+ ! call json%get(pitem,data%Configuration%Pumps%MudPump1VolumetricEfficiency)
call json%get(p,"MudPump1Output",pitem)
call json%get(pitem,data%Configuration%Pumps%MudPump1Output)
call json%get(p,"MudPump1OutputBblStroke",pitem)
@@ -85,8 +85,8 @@ module CPumps
call json%get(pitem,data%Configuration%Pumps%MudPump2Stroke)
call json%get(p,"MudPump2MechanicalEfficiency",pitem)
call json%get(pitem,data%Configuration%Pumps%MudPump2MechanicalEfficiency)
- call json%get(p,"MudPump2VolumetricEfficiency",pitem)
- call json%get(pitem,data%Configuration%Pumps%MudPump2VolumetricEfficiency)
+ ! call json%get(p,"MudPump2VolumetricEfficiency",pitem)
+ ! call json%get(pitem,data%Configuration%Pumps%MudPump2VolumetricEfficiency)
call json%get(p,"MudPump2Output",pitem)
call json%get(pitem,data%Configuration%Pumps%MudPump2Output)
call json%get(p,"MudPump2OutputBblStroke",pitem)
@@ -101,8 +101,8 @@ module CPumps
call json%get(pitem,data%Configuration%Pumps%CementPumpStroke)
call json%get(p,"CementPumpMechanicalEfficiency",pitem)
call json%get(pitem,data%Configuration%Pumps%CementPumpMechanicalEfficiency)
- call json%get(p,"CementPumpVolumetricEfficiency",pitem)
- call json%get(pitem,data%Configuration%Pumps%CementPumpVolumetricEfficiency)
+ ! call json%get(p,"CementPumpVolumetricEfficiency",pitem)
+ ! call json%get(pitem,data%Configuration%Pumps%CementPumpVolumetricEfficiency)
call json%get(p,"CementPumpOutput",pitem)
call json%get(pitem,data%Configuration%Pumps%CementPumpOutput)
call json%get(p,"CementPumpOutputBblStroke",pitem)
diff --git a/CSharp/BasicInputs/RigSpecifications/CPumps.i90 b/CSharp/BasicInputs/RigSpecifications/CPumps.i90
index b67a20a..2971f18 100644
--- a/CSharp/BasicInputs/RigSpecifications/CPumps.i90
+++ b/CSharp/BasicInputs/RigSpecifications/CPumps.i90
@@ -1,4 +1,4 @@
-# 1 "/mnt/c/Projects/VSIM/SimulationCore2/CSharp/BasicInputs/RigSpecifications/CPumps.f90"
+# 1 "/home/admin/SimulationCore2/CSharp/BasicInputs/RigSpecifications/CPumps.f90"
module CPumps
use SimulationVariables
use json_module
@@ -6,55 +6,55 @@ module CPumps
public
contains
- subroutine PumpsToJson(parent)
+! subroutine PumpsToJson(parent)
- type(json_value),pointer :: parent
- type(json_core) :: json
- type(json_value),pointer :: p
+! type(json_value),pointer :: parent
+! type(json_core) :: json
+! type(json_value),pointer :: p
-! 1. create new node
- call json%create_object(p,'Pumps')
+! ! 1. create new node
+! call json%create_object(p,'Pumps')
-! 2. add member of data type to new node
-! call StringConfigurationToJson(p)
-! call FormationToJson(p)
- call json%add(p,"MudPump1LinerDiameter",data%Configuration%Pumps%MudPump1LinerDiameter)
- call json%add(p,"MudPump1Stroke",data%Configuration%Pumps%MudPump1Stroke)
- call json%add(p,"MudPump1MechanicalEfficiency",data%Configuration%Pumps%MudPump1MechanicalEfficiency)
- call json%add(p,"MudPump1VolumetricEfficiency",data%Configuration%Pumps%MudPump1VolumetricEfficiency)
- call json%add(p,"MudPump1Output",data%Configuration%Pumps%MudPump1Output)
- call json%add(p,"MudPump1OutputBblStroke",data%Configuration%Pumps%MudPump1OutputBblStroke)
- call json%add(p,"MudPump1Maximum",data%Configuration%Pumps%MudPump1Maximum)
- call json%add(p,"MudPump1ReliefValvePressure",data%Configuration%Pumps%MudPump1ReliefValvePressure)
- call json%add(p,"MudPump2LinerDiameter",data%Configuration%Pumps%MudPump2LinerDiameter)
- call json%add(p,"MudPump2Stroke",data%Configuration%Pumps%MudPump2Stroke)
- call json%add(p,"MudPump2MechanicalEfficiency",data%Configuration%Pumps%MudPump2MechanicalEfficiency)
- call json%add(p,"MudPump2VolumetricEfficiency",data%Configuration%Pumps%MudPump2VolumetricEfficiency)
- call json%add(p,"MudPump2Output",data%Configuration%Pumps%MudPump2Output)
- call json%add(p,"MudPump2OutputBblStroke",data%Configuration%Pumps%MudPump2OutputBblStroke)
- call json%add(p,"MudPump2Maximum",data%Configuration%Pumps%MudPump2Maximum)
- call json%add(p,"MudPump2ReliefValvePressure",data%Configuration%Pumps%MudPump2ReliefValvePressure)
- call json%add(p,"CementPumpLinerDiameter",data%Configuration%Pumps%CementPumpLinerDiameter)
- call json%add(p,"CementPumpStroke",data%Configuration%Pumps%CementPumpStroke)
- call json%add(p,"CementPumpMechanicalEfficiency",data%Configuration%Pumps%CementPumpMechanicalEfficiency)
- call json%add(p,"CementPumpVolumetricEfficiency",data%Configuration%Pumps%CementPumpVolumetricEfficiency)
- call json%add(p,"CementPumpOutput",data%Configuration%Pumps%CementPumpOutput)
- call json%add(p,"CementPumpOutputBblStroke",data%Configuration%Pumps%CementPumpOutputBblStroke)
- call json%add(p,"CementPumpMaximum",data%Configuration%Pumps%CementPumpMaximum)
- call json%add(p,"CementPumpReliefValvePressure ",data%Configuration%Pumps%CementPumpReliefValvePressure )
- call json%add(p,"MudPump1ReliefValveIsSet",data%Configuration%Pumps%MudPump1ReliefValveIsSet)
- call json%add(p,"MudPump2ReliefValveIsSet",data%Configuration%Pumps%MudPump2ReliefValveIsSet)
- call json%add(p,"CementPumpReliefValveIsSet",data%Configuration%Pumps%CementPumpReliefValveIsSet)
-! call json%add(p,"ManualPumpPower",data%Configuration%Pumps%ManualPumpPower)
-! call json%add(p,"Valve1",data%Configuration%Pumps%Valve1)
-! call json%add(p,"Valve2",data%Configuration%Pumps%Valve2)
-! call json%add(p,"Valve3",data%Configuration%Pumps%Valve3)
-! call json%add(p,"Valve4",data%Configuration%Pumps%Valve4)
-! call json%add(p,"Valve5",data%Configuration%Pumps%Valve5)
+! ! 2. add member of data type to new node
+! ! call StringConfigurationToJson(p)
+! ! call FormationToJson(p)
+! call json%add(p,"MudPump1LinerDiameter",data%Configuration%Pumps%MudPump1LinerDiameter)
+! call json%add(p,"MudPump1Stroke",data%Configuration%Pumps%MudPump1Stroke)
+! call json%add(p,"MudPump1MechanicalEfficiency",data%Configuration%Pumps%MudPump1MechanicalEfficiency)
+! call json%add(p,"MudPump1VolumetricEfficiency",data%Configuration%Pumps%MudPump1VolumetricEfficiency)
+! call json%add(p,"MudPump1Output",data%Configuration%Pumps%MudPump1Output)
+! call json%add(p,"MudPump1OutputBblStroke",data%Configuration%Pumps%MudPump1OutputBblStroke)
+! call json%add(p,"MudPump1Maximum",data%Configuration%Pumps%MudPump1Maximum)
+! call json%add(p,"MudPump1ReliefValvePressure",data%Configuration%Pumps%MudPump1ReliefValvePressure)
+! call json%add(p,"MudPump2LinerDiameter",data%Configuration%Pumps%MudPump2LinerDiameter)
+! call json%add(p,"MudPump2Stroke",data%Configuration%Pumps%MudPump2Stroke)
+! call json%add(p,"MudPump2MechanicalEfficiency",data%Configuration%Pumps%MudPump2MechanicalEfficiency)
+! ! call json%add(p,"MudPump2VolumetricEfficiency",data%Configuration%Pumps%MudPump2VolumetricEfficiency)
+! call json%add(p,"MudPump2Output",data%Configuration%Pumps%MudPump2Output)
+! call json%add(p,"MudPump2OutputBblStroke",data%Configuration%Pumps%MudPump2OutputBblStroke)
+! call json%add(p,"MudPump2Maximum",data%Configuration%Pumps%MudPump2Maximum)
+! call json%add(p,"MudPump2ReliefValvePressure",data%Configuration%Pumps%MudPump2ReliefValvePressure)
+! call json%add(p,"CementPumpLinerDiameter",data%Configuration%Pumps%CementPumpLinerDiameter)
+! call json%add(p,"CementPumpStroke",data%Configuration%Pumps%CementPumpStroke)
+! call json%add(p,"CementPumpMechanicalEfficiency",data%Configuration%Pumps%CementPumpMechanicalEfficiency)
+! ! call json%add(p,"CementPumpVolumetricEfficiency",data%Configuration%Pumps%CementPumpVolumetricEfficiency)
+! call json%add(p,"CementPumpOutput",data%Configuration%Pumps%CementPumpOutput)
+! call json%add(p,"CementPumpOutputBblStroke",data%Configuration%Pumps%CementPumpOutputBblStroke)
+! call json%add(p,"CementPumpMaximum",data%Configuration%Pumps%CementPumpMaximum)
+! call json%add(p,"CementPumpReliefValvePressure ",data%Configuration%Pumps%CementPumpReliefValvePressure )
+! call json%add(p,"MudPump1ReliefValveIsSet",data%Configuration%Pumps%MudPump1ReliefValveIsSet)
+! call json%add(p,"MudPump2ReliefValveIsSet",data%Configuration%Pumps%MudPump2ReliefValveIsSet)
+! call json%add(p,"CementPumpReliefValveIsSet",data%Configuration%Pumps%CementPumpReliefValveIsSet)
+! ! call json%add(p,"ManualPumpPower",data%Configuration%Pumps%ManualPumpPower)
+! ! call json%add(p,"Valve1",data%Configuration%Pumps%Valve1)
+! ! call json%add(p,"Valve2",data%Configuration%Pumps%Valve2)
+! ! call json%add(p,"Valve3",data%Configuration%Pumps%Valve3)
+! ! call json%add(p,"Valve4",data%Configuration%Pumps%Valve4)
+! ! call json%add(p,"Valve5",data%Configuration%Pumps%Valve5)
-! 3. add new node to parent
- call json%add(parent,p)
- end subroutine
+! ! 3. add new node to parent
+! call json%add(parent,p)
+! end subroutine
subroutine PumpsFromJson(parent)
use json_module,IK =>json_ik
@@ -70,8 +70,8 @@ module CPumps
call json%get(pitem,data%Configuration%Pumps%MudPump1Stroke)
call json%get(p,"MudPump1MechanicalEfficiency",pitem)
call json%get(pitem,data%Configuration%Pumps%MudPump1MechanicalEfficiency)
- call json%get(p,"MudPump1VolumetricEfficiency",pitem)
- call json%get(pitem,data%Configuration%Pumps%MudPump1VolumetricEfficiency)
+! call json%get(p,"MudPump1VolumetricEfficiency",pitem)
+! call json%get(pitem,data%Configuration%Pumps%MudPump1VolumetricEfficiency)
call json%get(p,"MudPump1Output",pitem)
call json%get(pitem,data%Configuration%Pumps%MudPump1Output)
call json%get(p,"MudPump1OutputBblStroke",pitem)
@@ -86,8 +86,8 @@ module CPumps
call json%get(pitem,data%Configuration%Pumps%MudPump2Stroke)
call json%get(p,"MudPump2MechanicalEfficiency",pitem)
call json%get(pitem,data%Configuration%Pumps%MudPump2MechanicalEfficiency)
- call json%get(p,"MudPump2VolumetricEfficiency",pitem)
- call json%get(pitem,data%Configuration%Pumps%MudPump2VolumetricEfficiency)
+! call json%get(p,"MudPump2VolumetricEfficiency",pitem)
+! call json%get(pitem,data%Configuration%Pumps%MudPump2VolumetricEfficiency)
call json%get(p,"MudPump2Output",pitem)
call json%get(pitem,data%Configuration%Pumps%MudPump2Output)
call json%get(p,"MudPump2OutputBblStroke",pitem)
@@ -102,8 +102,8 @@ module CPumps
call json%get(pitem,data%Configuration%Pumps%CementPumpStroke)
call json%get(p,"CementPumpMechanicalEfficiency",pitem)
call json%get(pitem,data%Configuration%Pumps%CementPumpMechanicalEfficiency)
- call json%get(p,"CementPumpVolumetricEfficiency",pitem)
- call json%get(pitem,data%Configuration%Pumps%CementPumpVolumetricEfficiency)
+! call json%get(p,"CementPumpVolumetricEfficiency",pitem)
+! call json%get(pitem,data%Configuration%Pumps%CementPumpVolumetricEfficiency)
call json%get(p,"CementPumpOutput",pitem)
call json%get(pitem,data%Configuration%Pumps%CementPumpOutput)
call json%get(p,"CementPumpOutputBblStroke",pitem)
diff --git a/CSharp/BasicInputs/RigSpecifications/CPumpsVariables.f90 b/CSharp/BasicInputs/RigSpecifications/CPumpsVariables.f90
index 7618abc..6cf7c2d 100644
--- a/CSharp/BasicInputs/RigSpecifications/CPumpsVariables.f90
+++ b/CSharp/BasicInputs/RigSpecifications/CPumpsVariables.f90
@@ -9,7 +9,7 @@ module CPumpsVariables
real(8) :: MudPump1LinerDiameter
real(8) :: MudPump1Stroke
real(8) :: MudPump1MechanicalEfficiency
- real(8) :: MudPump1VolumetricEfficiency
+ ! real(8) :: MudPump1VolumetricEfficiency
real(8) :: MudPump1Output
real(8) :: MudPump1OutputBblStroke
real(8) :: MudPump1Maximum
@@ -18,7 +18,7 @@ module CPumpsVariables
real(8) :: MudPump2LinerDiameter
real(8) :: MudPump2Stroke
real(8) :: MudPump2MechanicalEfficiency
- real(8) :: MudPump2VolumetricEfficiency
+ ! real(8) :: MudPump2VolumetricEfficiency
real(8) :: MudPump2Output
real(8) :: MudPump2OutputBblStroke
real(8) :: MudPump2Maximum
@@ -27,7 +27,7 @@ module CPumpsVariables
real(8) :: CementPumpLinerDiameter
real(8) :: CementPumpStroke
real(8) :: CementPumpMechanicalEfficiency
- real(8) :: CementPumpVolumetricEfficiency
+ ! real(8) :: CementPumpVolumetricEfficiency
real(8) :: CementPumpOutput
real(8) :: CementPumpOutputBblStroke
real(8) :: CementPumpMaximum
@@ -37,12 +37,12 @@ module CPumpsVariables
logical :: MudPump2ReliefValveIsSet
logical :: CementPumpReliefValveIsSet
- ! logical :: ManualPumpPower
- ! logical :: Valve1
- ! logical :: Valve2
- ! logical :: Valve3
- ! logical :: Valve4
- ! logical :: Valve5
+ real(8) :: MudPump1VolumetricOutput
+
+ ! Newly added
+ Real(8) :: MudPump1MaximumPressure,MudPump1PumpRateChange,MudPump1SurfaceLineLength,MudPump1DelayToShutdown
+ Real(8) :: MudPump2MaximumPressure,MudPump2PumpRateChange,MudPump2SurfaceLineLength,MudPump2DelayToShutdown
+ Real(8) :: CementPumpMaximumPressure,CementPumpPumpRateChange,CementPumpSurfaceLineLength,CementPumpDelayToShutdown
End type PumpSpecificationType
! Type(PumpSpecificationType)::PumpsSpecification
diff --git a/CSharp/BasicInputs/RigSpecifications/CPumpsVariables.i90 b/CSharp/BasicInputs/RigSpecifications/CPumpsVariables.i90
index 5b76ddb..91dfe99 100644
--- a/CSharp/BasicInputs/RigSpecifications/CPumpsVariables.i90
+++ b/CSharp/BasicInputs/RigSpecifications/CPumpsVariables.i90
@@ -1,4 +1,4 @@
-# 1 "/mnt/c/Projects/VSIM/SimulationCore2/CSharp/BasicInputs/RigSpecifications/CPumpsVariables.f90"
+# 1 "/home/admin/SimulationCore2/CSharp/BasicInputs/RigSpecifications/CPumpsVariables.f90"
module CPumpsVariables
use CIActionReference
implicit none
@@ -10,7 +10,7 @@ module CPumpsVariables
real(8) :: MudPump1LinerDiameter
real(8) :: MudPump1Stroke
real(8) :: MudPump1MechanicalEfficiency
- real(8) :: MudPump1VolumetricEfficiency
+! real(8) :: MudPump1VolumetricEfficiency
real(8) :: MudPump1Output
real(8) :: MudPump1OutputBblStroke
real(8) :: MudPump1Maximum
@@ -19,7 +19,7 @@ module CPumpsVariables
real(8) :: MudPump2LinerDiameter
real(8) :: MudPump2Stroke
real(8) :: MudPump2MechanicalEfficiency
- real(8) :: MudPump2VolumetricEfficiency
+! real(8) :: MudPump2VolumetricEfficiency
real(8) :: MudPump2Output
real(8) :: MudPump2OutputBblStroke
real(8) :: MudPump2Maximum
@@ -28,7 +28,7 @@ module CPumpsVariables
real(8) :: CementPumpLinerDiameter
real(8) :: CementPumpStroke
real(8) :: CementPumpMechanicalEfficiency
- real(8) :: CementPumpVolumetricEfficiency
+! real(8) :: CementPumpVolumetricEfficiency
real(8) :: CementPumpOutput
real(8) :: CementPumpOutputBblStroke
real(8) :: CementPumpMaximum
@@ -38,12 +38,12 @@ module CPumpsVariables
logical :: MudPump2ReliefValveIsSet
logical :: CementPumpReliefValveIsSet
-! logical :: ManualPumpPower
-! logical :: Valve1
-! logical :: Valve2
-! logical :: Valve3
-! logical :: Valve4
-! logical :: Valve5
+ real(8) :: MudPump1VolumetricOutput
+
+! Newly added
+ Real(8) :: MudPump1MaximumPressure,MudPump1PumpRateChange,MudPump1SurfaceLineLength,MudPump1DelayToShutdown
+ Real(8) :: MudPump2MaximumPressure,MudPump2PumpRateChange,MudPump2SurfaceLineLength,MudPump2DelayToShutdown
+ Real(8) :: CementPumpMaximumPressure,CementPumpPumpRateChange,CementPumpSurfaceLineLength,CementPumpDelayToShutdown
End type PumpSpecificationType
! Type(PumpSpecificationType)::PumpsSpecification
diff --git a/CSharp/BasicInputs/WellProfile/CCasingLinerChoke.i90 b/CSharp/BasicInputs/WellProfile/CCasingLinerChoke.i90
index ed98176..14ab915 100644
--- a/CSharp/BasicInputs/WellProfile/CCasingLinerChoke.i90
+++ b/CSharp/BasicInputs/WellProfile/CCasingLinerChoke.i90
@@ -1,4 +1,4 @@
-# 1 "/mnt/c/Projects/VSIM/SimulationCore2/CSharp/BasicInputs/WellProfile/CCasingLinerChoke.f90"
+# 1 "/home/admin/SimulationCore2/CSharp/BasicInputs/WellProfile/CCasingLinerChoke.f90"
module CCasingLinerChoke
use SimulationVariables
use json_module
diff --git a/CSharp/BasicInputs/WellProfile/CCasingLinerChokeVariables.i90 b/CSharp/BasicInputs/WellProfile/CCasingLinerChokeVariables.i90
index d10b618..b5e7ea4 100644
--- a/CSharp/BasicInputs/WellProfile/CCasingLinerChokeVariables.i90
+++ b/CSharp/BasicInputs/WellProfile/CCasingLinerChokeVariables.i90
@@ -1,4 +1,4 @@
-# 1 "/mnt/c/Projects/VSIM/SimulationCore2/CSharp/BasicInputs/WellProfile/CCasingLinerChokeVariables.f90"
+# 1 "/home/admin/SimulationCore2/CSharp/BasicInputs/WellProfile/CCasingLinerChokeVariables.f90"
module CCasingLinerChokeVariables
implicit none
public
diff --git a/CSharp/BasicInputs/WellProfile/CPathGeneration.f90 b/CSharp/BasicInputs/WellProfile/CPathGeneration.f90
index 8e3842d..9d2f9a1 100644
--- a/CSharp/BasicInputs/WellProfile/CPathGeneration.f90
+++ b/CSharp/BasicInputs/WellProfile/CPathGeneration.f90
@@ -62,7 +62,7 @@ module CPathGeneration
DEALLOCATE(data%Configuration%Path%Items)
ALLOCATE(data%Configuration%Path%Items(n_children))
endif
-
+ data%Configuration%Path%ItemCount = n_children
do i=1,n_children
call json%get_child(pitems, i, pitem, found=is_found)
call json%get(pitem,"HoleType",pval)
diff --git a/CSharp/BasicInputs/WellProfile/CPathGeneration.i90 b/CSharp/BasicInputs/WellProfile/CPathGeneration.i90
index aaca743..ca92963 100644
--- a/CSharp/BasicInputs/WellProfile/CPathGeneration.i90
+++ b/CSharp/BasicInputs/WellProfile/CPathGeneration.i90
@@ -1,4 +1,4 @@
-# 1 "/mnt/c/Projects/VSIM/SimulationCore2/CSharp/BasicInputs/WellProfile/CPathGeneration.f90"
+# 1 "/home/admin/SimulationCore2/CSharp/BasicInputs/WellProfile/CPathGeneration.f90"
module CPathGeneration
use SimulationVariables !@
use json_module
@@ -63,7 +63,7 @@ module CPathGeneration
DEALLOCATE(data%Configuration%Path%Items)
ALLOCATE(data%Configuration%Path%Items(n_children))
endif
-
+ data%Configuration%Path%ItemCount = n_children
do i=1,n_children
call json%get_child(pitems, i, pitem, found=is_found)
call json%get(pitem,"HoleType",pval)
diff --git a/CSharp/BasicInputs/WellProfile/CPathGenerationVariables.i90 b/CSharp/BasicInputs/WellProfile/CPathGenerationVariables.i90
index 7460877..093baaf 100644
--- a/CSharp/BasicInputs/WellProfile/CPathGenerationVariables.i90
+++ b/CSharp/BasicInputs/WellProfile/CPathGenerationVariables.i90
@@ -1,4 +1,4 @@
-# 1 "/mnt/c/Projects/VSIM/SimulationCore2/CSharp/BasicInputs/WellProfile/CPathGenerationVariables.f90"
+# 1 "/home/admin/SimulationCore2/CSharp/BasicInputs/WellProfile/CPathGenerationVariables.f90"
module CPathGenerationVariables
implicit none
public
diff --git a/CSharp/Equipments/ControlPanels/CBopControlPanel.i90 b/CSharp/Equipments/ControlPanels/CBopControlPanel.i90
index d263584..de69055 100644
--- a/CSharp/Equipments/ControlPanels/CBopControlPanel.i90
+++ b/CSharp/Equipments/ControlPanels/CBopControlPanel.i90
@@ -1,4 +1,4 @@
-# 1 "/mnt/c/Projects/VSIM/SimulationCore2/CSharp/Equipments/ControlPanels/CBopControlPanel.f90"
+# 1 "/home/admin/SimulationCore2/CSharp/Equipments/ControlPanels/CBopControlPanel.f90"
module CBopControlPanel
! use CBopControlPanel
use SimulationVariables
diff --git a/CSharp/Equipments/ControlPanels/CDataDisplayConsole.f90 b/CSharp/Equipments/ControlPanels/CDataDisplayConsole.f90
index 194416a..c051a5e 100644
--- a/CSharp/Equipments/ControlPanels/CDataDisplayConsole.f90
+++ b/CSharp/Equipments/ControlPanels/CDataDisplayConsole.f90
@@ -282,8 +282,8 @@ module CDataDisplayConsole
implicit none
real(8), intent(in) :: v
! print *,"total depth = ",v
- data%Equipments%DataDisplayConsole%TotalWellDepth = 1000
- data%Equipments%DrillingWatch%Depth = 1000
+ data%Equipments%DataDisplayConsole%TotalWellDepth = v
+ data%Equipments%DrillingWatch%Depth = v
! call SetDistanceDrilled(v)
end subroutine
diff --git a/CSharp/Equipments/ControlPanels/CDataDisplayConsole.i90 b/CSharp/Equipments/ControlPanels/CDataDisplayConsole.i90
index 6b99429..0238169 100644
--- a/CSharp/Equipments/ControlPanels/CDataDisplayConsole.i90
+++ b/CSharp/Equipments/ControlPanels/CDataDisplayConsole.i90
@@ -1,4 +1,4 @@
-# 1 "/mnt/c/Projects/VSIM/SimulationCore2/CSharp/Equipments/ControlPanels/CDataDisplayConsole.f90"
+# 1 "/home/admin/SimulationCore2/CSharp/Equipments/ControlPanels/CDataDisplayConsole.f90"
module CDataDisplayConsole
! use CDataDisplayConsole
use SimulationVariables
@@ -283,8 +283,8 @@ module CDataDisplayConsole
implicit none
real(8), intent(in) :: v
! print *,"total depth = ",v
- data%Equipments%DataDisplayConsole%TotalWellDepth = 1000
- data%Equipments%DrillingWatch%Depth = 1000
+ data%Equipments%DataDisplayConsole%TotalWellDepth = v
+ data%Equipments%DrillingWatch%Depth = v
! call SetDistanceDrilled(v)
end subroutine
diff --git a/CSharp/Equipments/ControlPanels/CDataDisplayConsoleVariables.i90 b/CSharp/Equipments/ControlPanels/CDataDisplayConsoleVariables.i90
index 1d4fb69..6c39f45 100644
--- a/CSharp/Equipments/ControlPanels/CDataDisplayConsoleVariables.i90
+++ b/CSharp/Equipments/ControlPanels/CDataDisplayConsoleVariables.i90
@@ -1,4 +1,4 @@
-# 1 "/mnt/c/Projects/VSIM/SimulationCore2/CSharp/Equipments/ControlPanels/CDataDisplayConsoleVariables.f90"
+# 1 "/home/admin/SimulationCore2/CSharp/Equipments/ControlPanels/CDataDisplayConsoleVariables.f90"
module CDataDisplayConsoleVariables
use CIActionReference
! !**use CDoubleEventHandlerCollection
diff --git a/CSharp/Equipments/ControlPanels/CDrillingConsole.f90 b/CSharp/Equipments/ControlPanels/CDrillingConsole.f90
index 25baf65..1937b4f 100644
--- a/CSharp/Equipments/ControlPanels/CDrillingConsole.f90
+++ b/CSharp/Equipments/ControlPanels/CDrillingConsole.f90
@@ -10,182 +10,125 @@ module CDrillingConsole
contains
- subroutine DrillingConsoleFromJson(parent)
+ subroutine DrillingConsoleFromJson(jsonfile)
type(json_value),pointer :: parent
type(json_core) :: json
type(json_value),pointer :: p,pval
+ type(json_file)::jsonfile
+ logical::found
- ! 1. get related root
- call json%get(parent,'Drilling',p)
-
- ! 2. get member of data type from node
- call json%get(p,'AssignmentSwitch',pval)
- call json%get(pval,data%Equipments%DrillingConsole%AssignmentSwitch)
- call json%get(p,'EmergencySwitch',pval)
- call json%get(pval,data%Equipments%DrillingConsole%EmergencySwitch)
- call json%get(p,'RTTorqueLimitKnob',pval)
- call json%get(pval,data%Equipments%DrillingConsole%RTTorqueLimitKnob)
- call json%get(p,'MP1CPSwitchI',pval)
- call json%get(pval,data%Equipments%DrillingConsole%MP1CPSwitchI)
- call json%get(p,'MP1CPSwitchT',pval)
- call json%get(pval,data%Equipments%DrillingConsole%MP1CPSwitchT)
- call json%get(p,'MP1CPSwitch',pval)
- call json%get(pval,data%Equipments%DrillingConsole%MP1CPSwitch)
- call json%get(p,'MP1ThrottleUpdate',pval)
- call json%get(pval,data%Equipments%DrillingConsole%MP1ThrottleUpdate)
- call json%get(p,'MP1Throttle',pval)
- call json%get(pval,data%Equipments%DrillingConsole%MP1Throttle)
- call json%get(p,'MP2SwitchI',pval)
- call json%get(pval,data%Equipments%DrillingConsole%MP2SwitchI)
- call json%get(p,'MP2SwitchT',pval)
- call json%get(pval,data%Equipments%DrillingConsole%MP2SwitchT)
- call json%get(p,'MP2Switch',pval)
- call json%get(pval,data%Equipments%DrillingConsole%MP2Switch)
- call json%get(p,'MP2ThrottleUpdate',pval)
- call json%get(pval,data%Equipments%DrillingConsole%MP2ThrottleUpdate)
- call json%get(p,'MP2Throttle',pval)
- call json%get(pval,data%Equipments%DrillingConsole%MP2Throttle)
- call json%get(p,'DWSwitch',pval)
- call json%get(pval,data%Equipments%DrillingConsole%DWSwitch)
- call json%get(p,'DWThrottle',pval)
- call json%get(pval,data%Equipments%DrillingConsole%DWThrottle)
- call json%get(p,'RTSwitch',pval)
- call json%get(pval,data%Equipments%DrillingConsole%RTSwitch)
- call json%get(p,'RTThrottle',pval)
- call json%get(pval,data%Equipments%DrillingConsole%RTThrottle)
- call json%get(p,'DWBreak',pval)
- call json%get(pval,data%Equipments%DrillingConsole%DWBreak)
- call json%get(p,'PreviousDWBreak',pval)
- call json%get(pval,data%Equipments%DrillingConsole%PreviousDWBreak)
- call json%get(p,'ForceBreak',pval)
- call json%get(pval,data%Equipments%DrillingConsole%ForceBreak)
- call json%get(p,'DWAcceleretor',pval)
- call json%get(pval,data%Equipments%DrillingConsole%DWAcceleretor)
- call json%get(p,'DWTransmisionLever',pval)
- call json%get(pval,data%Equipments%DrillingConsole%DWTransmisionLever)
- call json%get(p,'DWPowerLever',pval)
- call json%get(pval,data%Equipments%DrillingConsole%DWPowerLever)
- call json%get(p,'TongLever',pval)
- call json%get(pval,data%Equipments%DrillingConsole%TongLever)
- call json%get(p,'RTTransmissionLever',pval)
- call json%get(pval,data%Equipments%DrillingConsole%RTTransmissionLever)
- call json%get(p,'DWClutchLever',pval)
- call json%get(pval,data%Equipments%DrillingConsole%DWClutchLever)
- call json%get(p,'EddyBreakLever',pval)
- call json%get(pval,data%Equipments%DrillingConsole%EddyBreakLever)
- call json%get(p,'AutoDW',pval)
- call json%get(pval,data%Equipments%DrillingConsole%AutoDW)
- call json%get(p,'GEN1',pval)
- call json%get(pval,data%Equipments%DrillingConsole%GEN1)
- call json%get(p,'GEN2',pval)
- call json%get(pval,data%Equipments%DrillingConsole%GEN2)
- call json%get(p,'GEN3',pval)
- call json%get(pval,data%Equipments%DrillingConsole%GEN3)
- call json%get(p,'GEN4',pval)
- call json%get(pval,data%Equipments%DrillingConsole%GEN4)
- call json%get(p,'Permission_OpenKellyCock',pval)
- call json%get(pval,data%Equipments%DrillingConsole%Permission_OpenKellyCock)
- call json%get(p,'OpenKellyCock',pval)
- call json%get(pval,data%Equipments%DrillingConsole%OpenKellyCock)
- call json%get(p,'Permission_CloseKellyCock',pval)
- call json%get(pval,data%Equipments%DrillingConsole%Permission_CloseKellyCock)
- call json%get(p,'CloseKellyCock',pval)
- call json%get(pval,data%Equipments%DrillingConsole%CloseKellyCock)
- call json%get(p,'Permission_OpenSafetyValve',pval)
- call json%get(pval,data%Equipments%DrillingConsole%Permission_OpenSafetyValve)
- call json%get(p,'OpenSafetyValve',pval)
- call json%get(pval,data%Equipments%DrillingConsole%OpenSafetyValve)
- call json%get(p,'Permission_CloseSafetyValve',pval)
- call json%get(pval,data%Equipments%DrillingConsole%Permission_CloseSafetyValve)
- call json%get(p,'CloseSafetyValve',pval)
- call json%get(pval,data%Equipments%DrillingConsole%CloseSafetyValve)
- call json%get(p,'Permission_IRSafetyValve',pval)
- call json%get(pval,data%Equipments%DrillingConsole%Permission_IRSafetyValve)
- call json%get(p,'IRSafetyValve',pval)
- call json%get(pval,data%Equipments%DrillingConsole%IRSafetyValve)
- call json%get(p,'Permission_IRIBop',pval)
- call json%get(pval,data%Equipments%DrillingConsole%Permission_IRIBop)
- call json%get(p,'IRIBop',pval)
- call json%get(pval,data%Equipments%DrillingConsole%IRIBop)
- call json%get(p,'LatchPipe',pval)
- call json%get(pval,data%Equipments%DrillingConsole%LatchPipe)
- call json%get(p,'UnlatchPipe',pval)
- call json%get(pval,data%Equipments%DrillingConsole%UnlatchPipe)
- call json%get(p,'Swing',pval)
- call json%get(pval,data%Equipments%DrillingConsole%Swing)
- call json%get(p,'FillMouseHole',pval)
- call json%get(pval,data%Equipments%DrillingConsole%FillMouseHole)
- call json%get(p,'Slips',pval)
- call json%get(pval,data%Equipments%DrillingConsole%Slips)
- call json%get(p,'BrakeLeverCoefficient',pval)
- call json%get(pval,data%Equipments%DrillingConsole%BrakeLeverCoefficient)
- call json%get(p,'HideDrillingBrake',pval)
- call json%get(pval,data%Equipments%DrillingConsole%HideDrillingBrake)
- call json%get(p,'ParkingBrakeBtn',pval)
- call json%get(pval,data%Equipments%DrillingConsole%ParkingBrakeBtn)
+ call jsonfile%get('Equipments.Drilling.AssignmentSwitch',data%Equipments%DrillingConsole%AssignmentSwitch,found)
+ if ( .not. found ) call logg(4,"Not found: AssignmentSwitch")
+ call jsonfile%get('Equipments.Drilling.EmergencySwitch',data%Equipments%DrillingConsole%EmergencySwitch,found)
+ if ( .not. found ) call logg(4,"Not found: EmergencySwitch")
+ call jsonfile%get('Equipments.Drilling.RTTorqueLimitKnob',data%Equipments%DrillingConsole%RTTorqueLimitKnob,found)
+ if ( .not. found ) call logg(4,"Not found: RTTorqueLimitKnob")
+ call jsonfile%get('Equipments.Drilling.MP1CPSwitchI',data%Equipments%DrillingConsole%MP1CPSwitchI,found)
+ if ( .not. found ) call logg(4,"Not found: MP1CPSwitchI")
+ call jsonfile%get('Equipments.Drilling.MP1CPSwitchT',data%Equipments%DrillingConsole%MP1CPSwitchT,found)
+ if ( .not. found ) call logg(4,"Not found: MP1CPSwitchT")
+ call jsonfile%get('Equipments.Drilling.MP1CPSwitch',data%Equipments%DrillingConsole%MP1CPSwitch,found)
+ if ( .not. found ) call logg(4,"Not found: MP1CPSwitch")
+ call jsonfile%get('Equipments.Drilling.MP1ThrottleUpdate',data%Equipments%DrillingConsole%MP1ThrottleUpdate,found)
+ if ( .not. found ) call logg(4,"Not found: MP1ThrottleUpdate")
+ call jsonfile%get('Equipments.Drilling.MP1Throttle',data%Equipments%DrillingConsole%MP1Throttle,found)
+ if ( .not. found ) then
+ call logg(4,"Not found: MP1Throttle")
+ endif
+ call jsonfile%get('Equipments.Drilling.MP2SwitchI',data%Equipments%DrillingConsole%MP2SwitchI,found)
+ if ( .not. found ) call logg(4,"Not found: MP2SwitchI")
+ call jsonfile%get('Equipments.Drilling.MP2SwitchT',data%Equipments%DrillingConsole%MP2SwitchT,found)
+ if ( .not. found ) call logg(4,"Not found: MP2SwitchT")
+ call jsonfile%get('Equipments.Drilling.MP2Switch',data%Equipments%DrillingConsole%MP2Switch,found)
+ if ( .not. found ) call logg(4,"Not found: MP2Switch")
+ call jsonfile%get('Equipments.Drilling.MP2ThrottleUpdate',data%Equipments%DrillingConsole%MP2ThrottleUpdate,found)
+ if ( .not. found ) call logg(4,"Not found: MP2ThrottleUpdate")
+ call jsonfile%get('Equipments.Drilling.MP2Throttle',data%Equipments%DrillingConsole%MP2Throttle,found)
+ if ( .not. found ) call logg(4,"Not found: MP2Throttle")
+ ! call jsonfile%get('Equipments.Drilling.DWSwitch',data%Equipments%DrillingConsole%DWSwitch,found)
+ ! if ( .not. found ) call logg(4,"Not found: DWSwitch")
+ call jsonfile%get('Equipments.Drilling.DWThrottle',data%Equipments%DrillingConsole%DWThrottle,found)
+ if ( .not. found ) call logg(4,"Not found: DWThrottle")
+ call jsonfile%get('Equipments.Drilling.RTSwitch',data%Equipments%DrillingConsole%RTSwitch,found)
+ if ( .not. found ) call logg(4,"Not found: RTSwitch")
+ call jsonfile%get('Equipments.Drilling.RTThrottle',data%Equipments%DrillingConsole%RTThrottle,found)
+ if ( .not. found ) call logg(4,"Not found: RTThrottle")
+ call jsonfile%get('Equipments.Drilling.DWBreak',data%Equipments%DrillingConsole%DWBreak,found)
+ if ( .not. found ) call logg(4,"Not found: DWBreak")
+ call jsonfile%get('Equipments.Drilling.PreviousDWBreak',data%Equipments%DrillingConsole%PreviousDWBreak,found)
+ if ( .not. found ) call logg(4,"Not found: PreviousDWBreak")
+ call jsonfile%get('Equipments.Drilling.ForceBreak',data%Equipments%DrillingConsole%ForceBreak,found)
+ if ( .not. found ) call logg(4,"Not found: ForceBreak")
+ call jsonfile%get('Equipments.Drilling.DWAcceleretor',data%Equipments%DrillingConsole%DWAcceleretor,found)
+ if ( .not. found ) call logg(4,"Not found: DWAcceleretor")
+ call jsonfile%get('Equipments.Drilling.DWTransmisionLever',data%Equipments%DrillingConsole%DWTransmisionLever,found)
+ if ( .not. found ) call logg(4,"Not found: DWTransmisionLever")
+ call jsonfile%get('Equipments.Drilling.DWPowerLever',data%Equipments%DrillingConsole%DWPowerLever,found)
+ if ( .not. found ) call logg(4,"Not found: DWPowerLever")
+ call jsonfile%get('Equipments.Drilling.TongLever',data%Equipments%DrillingConsole%TongLever,found)
+ if ( .not. found ) call logg(4,"Not found: TongLever")
+ call jsonfile%get('Equipments.Drilling.RTTransmissionLever',data%Equipments%DrillingConsole%RTTransmissionLever,found)
+ if ( .not. found ) call logg(4,"Not found: RTTransmissionLever")
+ call jsonfile%get('Equipments.Drilling.DWClutchLever',data%Equipments%DrillingConsole%DWClutchLever,found)
+ if ( .not. found ) call logg(4,"Not found: DWClutchLever")
+ call jsonfile%get('Equipments.Drilling.EddyBreakLever',data%Equipments%DrillingConsole%EddyBreakLever,found)
+ if ( .not. found ) call logg(4,"Not found: EddyBreakLever")
+ call jsonfile%get('Equipments.Drilling.AutoDW',data%Equipments%DrillingConsole%AutoDW,found)
+ if ( .not. found ) call logg(4,"Not found: AutoDW")
+ call jsonfile%get('Equipments.Drilling.GEN1',data%Equipments%DrillingConsole%GEN1,found)
+ if ( .not. found ) call logg(4,"Not found: GEN1")
+ call jsonfile%get('Equipments.Drilling.GEN2',data%Equipments%DrillingConsole%GEN2,found)
+ if ( .not. found ) call logg(4,"Not found: GEN2")
+ call jsonfile%get('Equipments.Drilling.GEN3',data%Equipments%DrillingConsole%GEN3,found)
+ if ( .not. found ) call logg(4,"Not found: GEN3")
+ call jsonfile%get('Equipments.Drilling.GEN4',data%Equipments%DrillingConsole%GEN4,found)
+ if ( .not. found ) call logg(4,"Not found: GEN4")
+ call jsonfile%get('Equipments.Drilling.Permission_OpenKellyCock',data%Equipments%DrillingConsole%Permission_OpenKellyCock,found)
+ if ( .not. found ) call logg(4,"Not found: Permission_OpenKellyCock")
+ call jsonfile%get('Equipments.Drilling.OpenKellyCock',data%Equipments%DrillingConsole%OpenKellyCock,found)
+ if ( .not. found ) call logg(4,"Not found: OpenKellyCock")
+ call jsonfile%get('Equipments.Drilling.Permission_CloseKellyCock',data%Equipments%DrillingConsole%Permission_CloseKellyCock,found)
+ if ( .not. found ) call logg(4,"Not found: Permission_CloseKellyCock")
+ call jsonfile%get('Equipments.Drilling.CloseKellyCock',data%Equipments%DrillingConsole%CloseKellyCock,found)
+ if ( .not. found ) call logg(4,"Not found: CloseKellyCock")
+ call jsonfile%get('Equipments.Drilling.Permission_OpenSafetyValve',data%Equipments%DrillingConsole%Permission_OpenSafetyValve,found)
+ if ( .not. found ) call logg(4,"Not found: Permission_OpenSafetyValve")
+ call jsonfile%get('Equipments.Drilling.OpenSafetyValve',data%Equipments%DrillingConsole%OpenSafetyValve,found)
+ if ( .not. found ) call logg(4,"Not found: OpenSafetyValve")
+ call jsonfile%get('Equipments.Drilling.Permission_CloseSafetyValve',data%Equipments%DrillingConsole%Permission_CloseSafetyValve,found)
+ if ( .not. found ) call logg(4,"Not found: Permission_CloseSafetyValve")
+ call jsonfile%get('Equipments.Drilling.CloseSafetyValve',data%Equipments%DrillingConsole%CloseSafetyValve,found)
+ if ( .not. found ) call logg(4,"Not found: CloseSafetyValve")
+ call jsonfile%get('Equipments.Drilling.Permission_IRSafetyValve',data%Equipments%DrillingConsole%Permission_IRSafetyValve,found)
+ if ( .not. found ) call logg(4,"Not found: Permission_IRSafetyValve")
+ call jsonfile%get('Equipments.Drilling.IRSafetyValve',data%Equipments%DrillingConsole%IRSafetyValve,found)
+ if ( .not. found ) call logg(4,"Not found: IRSafetyValve")
+ call jsonfile%get('Equipments.Drilling.Permission_IRIBop',data%Equipments%DrillingConsole%Permission_IRIBop,found)
+ if ( .not. found ) call logg(4,"Not found: Permission_IRIBop")
+ call jsonfile%get('Equipments.Drilling.IRIBop',data%Equipments%DrillingConsole%IRIBop,found)
+ if ( .not. found ) call logg(4,"Not found: IRIBop")
+ call jsonfile%get('Equipments.Drilling.LatchPipe',data%Equipments%DrillingConsole%LatchPipe,found)
+ if ( .not. found ) call logg(4,"Not found: LatchPipe")
+ call jsonfile%get('Equipments.Drilling.UnlatchPipe',data%Equipments%DrillingConsole%UnlatchPipe,found)
+ if ( .not. found ) call logg(4,"Not found: UnlatchPipe")
+ call jsonfile%get('Equipments.Drilling.Swing',data%Equipments%DrillingConsole%Swing,found)
+ if ( .not. found ) call logg(4,"Not found: Swing")
+ call jsonfile%get('Equipments.Drilling.FillMouseHole',data%Equipments%DrillingConsole%FillMouseHole,found)
+ if ( .not. found ) call logg(4,"Not found: FillMouseHole")
+ call jsonfile%get('Equipments.Drilling.Slips',data%Equipments%DrillingConsole%Slips,found)
+ if ( .not. found ) call logg(4,"Not found: Slips")
+ call jsonfile%get('Equipments.Drilling.BrakeLeverCoefficient',data%Equipments%DrillingConsole%BrakeLeverCoefficient,found)
+ if ( .not. found ) call logg(4,"Not found: BrakeLeverCoefficient")
+ call jsonfile%get('Equipments.Drilling.HideDrillingBrake',data%Equipments%DrillingConsole%HideDrillingBrake,found)
+ if ( .not. found ) call logg(4,"Not found: HideDrillingBrake")
+ call jsonfile%get('Equipments.Drilling.ParkingBrakeBtn',data%Equipments%DrillingConsole%ParkingBrakeBtn,found)
+ if ( .not. found ) call logg(4,"Not found: ParkingBrakeBtn")
- ! call json%get(p,'ParkingBrakeLed',pval)
- ! call json%get(pval,data%Equipments%DrillingConsole%ParkingBrakeLed)
- ! call json%get(p,'GEN1LED',pval)
- ! call json%get(pval,data%Equipments%DrillingConsole%GEN1LED)
- ! call json%get(p,'GEN2LED',pval)
- ! call json%get(pval,data%Equipments%DrillingConsole%GEN2LED)
- ! call json%get(p,'GEN3LED',pval)
- ! call json%get(pval,data%Equipments%DrillingConsole%GEN3LED)
- ! call json%get(p,'GEN4LED',pval)
- ! call json%get(pval,data%Equipments%DrillingConsole%GEN4LED)
- ! call json%get(p,'SCR1LED',pval)
- ! call json%get(pval,data%Equipments%DrillingConsole%SCR1LED)
- ! call json%get(p,'SCR2LED',pval)
- ! call json%get(pval,data%Equipments%DrillingConsole%SCR2LED)
- ! call json%get(p,'SCR3LED',pval)
- ! call json%get(pval,data%Equipments%DrillingConsole%SCR3LED)
- ! call json%get(p,'SCR4LED',pval)
- ! call json%get(pval,data%Equipments%DrillingConsole%SCR4LED)
- ! call json%get(p,'MP1BLWR',pval)
- ! call json%get(pval,data%Equipments%DrillingConsole%MP1BLWR)
- ! call json%get(p,'MP2BLWR',pval)
- ! call json%get(pval,data%Equipments%DrillingConsole%MP2BLWR)
- ! call json%get(p,'DWBLWR',pval)
- ! call json%get(pval,data%Equipments%DrillingConsole%DWBLWR)
- ! call json%get(p,'RTBLWR',pval)
- ! call json%get(pval,data%Equipments%DrillingConsole%RTBLWR)
- ! call json%get(p,'PWRLIM',pval)
- ! call json%get(pval,data%Equipments%DrillingConsole%PWRLIM)
- ! call json%get(p,'PWRLIMMTR',pval)
- ! call json%get(pval,data%Equipments%DrillingConsole%PWRLIMMTR)
- ! call json%get(p,'RTTorqueLimitGauge',pval)
- ! call json%get(pval,data%Equipments%DrillingConsole%RTTorqueLimitGauge)
- ! call json%get(p,'AutoDWLED',pval)
- ! call json%get(pval,data%Equipments%DrillingConsole%AutoDWLED)
- ! call json%get(p,'GEN1BTNLED',pval)
- ! call json%get(pval,data%Equipments%DrillingConsole%GEN1BTNLED)
- ! call json%get(p,'GEN2BTNLED',pval)
- ! call json%get(pval,data%Equipments%DrillingConsole%GEN2BTNLED)
- ! call json%get(p,'GEN3BTNLED',pval)
- ! call json%get(pval,data%Equipments%DrillingConsole%GEN3BTNLED)
- ! call json%get(p,'GEN4BTNLED',pval)
- ! call json%get(pval,data%Equipments%DrillingConsole%GEN4BTNLED)
- ! call json%get(p,'OpenKellyCockLed',pval)
- ! call json%get(pval,data%Equipments%DrillingConsole%OpenKellyCockLed)
- ! call json%get(p,'CloseKellyCockLed',pval)
- ! call json%get(pval,data%Equipments%DrillingConsole%CloseKellyCockLed)
- ! call json%get(p,'OpenSafetyValveLed',pval)
- ! call json%get(pval,data%Equipments%DrillingConsole%OpenSafetyValveLed)
- ! call json%get(p,'CloseSafetyValveLed',pval)
- ! call json%get(pval,data%Equipments%DrillingConsole%CloseSafetyValveLed)
- ! call json%get(p,'IRSafetyValveLed',pval)
- ! call json%get(pval,data%Equipments%DrillingConsole%IRSafetyValveLed)
- ! call json%get(p,'IRIBopLed',pval)
- ! call json%get(pval,data%Equipments%DrillingConsole%IRIBopLed)
- ! call json%get(p,'LatchPipeLED',pval)
- ! call json%get(pval,data%Equipments%DrillingConsole%LatchPipeLED)
- ! call json%get(p,'UnlatchPipeLED',pval)
- ! call json%get(pval,data%Equipments%DrillingConsole%UnlatchPipeLED)
- ! call json%get(p,'SwingLed',pval)
- ! call json%get(pval,data%Equipments%DrillingConsole%SwingLed)
- ! call json%get(p,'FillMouseHoleLed',pval)
- ! call json%get(pval,data%Equipments%DrillingConsole%FillMouseHoleLed)
+ data%Equipments%DrillingConsole%DWSwitch = -1
+ data%Equipments%DrillingConsole%AssignmentSwitch = 1
+ data%Equipments%DrillingConsole%MP1CPSwitch = -1
+ data%Equipments%DrillingConsole%MP2Switch = -1
+ data%Equipments%DrillingConsole%RTSwitch = -1
end subroutine
subroutine DrillingConsoleToJson(parent)
@@ -196,61 +139,7 @@ module CDrillingConsole
! 1. create new node
call json%create_object(p,'Drilling')
- ! call json%add(p,"AssignmentSwitch",data%Equipments%DrillingConsole%AssignmentSwitch)
- ! call json%add(p,"EmergencySwitch",data%Equipments%DrillingConsole%EmergencySwitch)
- ! call json%add(p,"RTTorqueLimitKnob",data%Equipments%DrillingConsole%RTTorqueLimitKnob)
- ! call json%add(p,"MP1CPSwitchI",data%Equipments%DrillingConsole%MP1CPSwitchI)
- ! call json%add(p,"MP1CPSwitchT",data%Equipments%DrillingConsole%MP1CPSwitchT)
- ! call json%add(p,"MP1CPSwitch",data%Equipments%DrillingConsole%MP1CPSwitch)
- ! call json%add(p,"MP1ThrottleUpdate",data%Equipments%DrillingConsole%MP1ThrottleUpdate)
- ! call json%add(p,"MP1Throttle",data%Equipments%DrillingConsole%MP1Throttle)
- ! call json%add(p,"MP2SwitchI",data%Equipments%DrillingConsole%MP2SwitchI)
- ! call json%add(p,"MP2SwitchT",data%Equipments%DrillingConsole%MP2SwitchT)
- ! call json%add(p,"MP2Switch",data%Equipments%DrillingConsole%MP2Switch)
- ! call json%add(p,"MP2ThrottleUpdate",data%Equipments%DrillingConsole%MP2ThrottleUpdate)
- ! call json%add(p,"MP2Throttle",data%Equipments%DrillingConsole%MP2Throttle)
- ! call json%add(p,"DWSwitch",data%Equipments%DrillingConsole%DWSwitch)
- ! call json%add(p,"DWThrottle",data%Equipments%DrillingConsole%DWThrottle)
- ! call json%add(p,"RTSwitch",data%Equipments%DrillingConsole%RTSwitch)
- ! call json%add(p,"RTThrottle",data%Equipments%DrillingConsole%RTThrottle)
- ! call json%add(p,"DWBreak",data%Equipments%DrillingConsole%DWBreak)
- ! call json%add(p,"PreviousDWBreak",data%Equipments%DrillingConsole%PreviousDWBreak)
- ! call json%add(p,"ForceBreak",data%Equipments%DrillingConsole%ForceBreak)
- ! call json%add(p,"DWAcceleretor",data%Equipments%DrillingConsole%DWAcceleretor)
- ! call json%add(p,"DWTransmisionLever",data%Equipments%DrillingConsole%DWTransmisionLever)
- ! call json%add(p,"DWPowerLever",data%Equipments%DrillingConsole%DWPowerLever)
- ! call json%add(p,"TongLever",data%Equipments%DrillingConsole%TongLever)
- ! call json%add(p,"RTTransmissionLever",data%Equipments%DrillingConsole%RTTransmissionLever)
- ! call json%add(p,"DWClutchLever",data%Equipments%DrillingConsole%DWClutchLever)
- ! call json%add(p,"EddyBreakLever",data%Equipments%DrillingConsole%EddyBreakLever)
- ! call json%add(p,"AutoDW",data%Equipments%DrillingConsole%AutoDW)
- ! call json%add(p,"GEN1",data%Equipments%DrillingConsole%GEN1)
- ! call json%add(p,"GEN2",data%Equipments%DrillingConsole%GEN2)
- ! call json%add(p,"GEN3",data%Equipments%DrillingConsole%GEN3)
- ! call json%add(p,"GEN4",data%Equipments%DrillingConsole%GEN4)
- ! call json%add(p,"Permission_OpenKellyCock",data%Equipments%DrillingConsole%Permission_OpenKellyCock)
- ! call json%add(p,"OpenKellyCock",data%Equipments%DrillingConsole%OpenKellyCock)
- ! call json%add(p,"Permission_CloseKellyCock",data%Equipments%DrillingConsole%Permission_CloseKellyCock)
- ! call json%add(p,"CloseKellyCock",data%Equipments%DrillingConsole%CloseKellyCock)
- ! call json%add(p,"Permission_OpenSafetyValve",data%Equipments%DrillingConsole%Permission_OpenSafetyValve)
- ! call json%add(p,"OpenSafetyValve",data%Equipments%DrillingConsole%OpenSafetyValve)
- ! call json%add(p,"Permission_CloseSafetyValve",data%Equipments%DrillingConsole%Permission_CloseSafetyValve)
- ! call json%add(p,"CloseSafetyValve",data%Equipments%DrillingConsole%CloseSafetyValve)
- ! call json%add(p,"Permission_IRSafetyValve",data%Equipments%DrillingConsole%Permission_IRSafetyValve)
- ! call json%add(p,"IRSafetyValve",data%Equipments%DrillingConsole%IRSafetyValve)
- ! call json%add(p,"Permission_IRIBop",data%Equipments%DrillingConsole%Permission_IRIBop)
- ! call json%add(p,"IRIBop",data%Equipments%DrillingConsole%IRIBop)
- ! call json%add(p,"LatchPipe",data%Equipments%DrillingConsole%LatchPipe)
- ! call json%add(p,"UnlatchPipe",data%Equipments%DrillingConsole%UnlatchPipe)
- ! call json%add(p,"Swing",data%Equipments%DrillingConsole%Swing)
- ! call json%add(p,"FillMouseHole",data%Equipments%DrillingConsole%FillMouseHole)
- ! call json%add(p,"Slips",data%Equipments%DrillingConsole%Slips)
- ! call json%add(p,"BrakeLeverCoefficient",data%Equipments%DrillingConsole%BrakeLeverCoefficient)
- ! call json%add(p,"HideDrillingBrake",data%Equipments%DrillingConsole%HideDrillingBrake)
- ! call json%add(p,"ParkingBrakeBtn",data%Equipments%DrillingConsole%ParkingBrakeBtn)
-
-
-
+
call json%add(p,"ParkingBrakeLed",data%Equipments%DrillingConsole%ParkingBrakeLed)
call json%add(p,"GEN1LED",data%Equipments%DrillingConsole%GEN1LED)
call json%add(p,"GEN2LED",data%Equipments%DrillingConsole%GEN2LED)
diff --git a/CSharp/Equipments/ControlPanels/CDrillingConsole.i90 b/CSharp/Equipments/ControlPanels/CDrillingConsole.i90
index 41ff42b..f4b31d1 100644
--- a/CSharp/Equipments/ControlPanels/CDrillingConsole.i90
+++ b/CSharp/Equipments/ControlPanels/CDrillingConsole.i90
@@ -1,4 +1,4 @@
-# 1 "/mnt/c/Projects/VSIM/SimulationCore2/CSharp/Equipments/ControlPanels/CDrillingConsole.f90"
+# 1 "/home/admin/SimulationCore2/CSharp/Equipments/ControlPanels/CDrillingConsole.f90"
module CDrillingConsole
use CDrillingConsoleVariables
use SimulationVariables
@@ -11,182 +11,125 @@ module CDrillingConsole
contains
- subroutine DrillingConsoleFromJson(parent)
+ subroutine DrillingConsoleFromJson(jsonfile)
type(json_value),pointer :: parent
type(json_core) :: json
type(json_value),pointer :: p,pval
+ type(json_file)::jsonfile
+ logical::found
-! 1. get related root
- call json%get(parent,'Drilling',p)
-
-! 2. get member of data type from node
- call json%get(p,'AssignmentSwitch',pval)
- call json%get(pval,data%Equipments%DrillingConsole%AssignmentSwitch)
- call json%get(p,'EmergencySwitch',pval)
- call json%get(pval,data%Equipments%DrillingConsole%EmergencySwitch)
- call json%get(p,'RTTorqueLimitKnob',pval)
- call json%get(pval,data%Equipments%DrillingConsole%RTTorqueLimitKnob)
- call json%get(p,'MP1CPSwitchI',pval)
- call json%get(pval,data%Equipments%DrillingConsole%MP1CPSwitchI)
- call json%get(p,'MP1CPSwitchT',pval)
- call json%get(pval,data%Equipments%DrillingConsole%MP1CPSwitchT)
- call json%get(p,'MP1CPSwitch',pval)
- call json%get(pval,data%Equipments%DrillingConsole%MP1CPSwitch)
- call json%get(p,'MP1ThrottleUpdate',pval)
- call json%get(pval,data%Equipments%DrillingConsole%MP1ThrottleUpdate)
- call json%get(p,'MP1Throttle',pval)
- call json%get(pval,data%Equipments%DrillingConsole%MP1Throttle)
- call json%get(p,'MP2SwitchI',pval)
- call json%get(pval,data%Equipments%DrillingConsole%MP2SwitchI)
- call json%get(p,'MP2SwitchT',pval)
- call json%get(pval,data%Equipments%DrillingConsole%MP2SwitchT)
- call json%get(p,'MP2Switch',pval)
- call json%get(pval,data%Equipments%DrillingConsole%MP2Switch)
- call json%get(p,'MP2ThrottleUpdate',pval)
- call json%get(pval,data%Equipments%DrillingConsole%MP2ThrottleUpdate)
- call json%get(p,'MP2Throttle',pval)
- call json%get(pval,data%Equipments%DrillingConsole%MP2Throttle)
- call json%get(p,'DWSwitch',pval)
- call json%get(pval,data%Equipments%DrillingConsole%DWSwitch)
- call json%get(p,'DWThrottle',pval)
- call json%get(pval,data%Equipments%DrillingConsole%DWThrottle)
- call json%get(p,'RTSwitch',pval)
- call json%get(pval,data%Equipments%DrillingConsole%RTSwitch)
- call json%get(p,'RTThrottle',pval)
- call json%get(pval,data%Equipments%DrillingConsole%RTThrottle)
- call json%get(p,'DWBreak',pval)
- call json%get(pval,data%Equipments%DrillingConsole%DWBreak)
- call json%get(p,'PreviousDWBreak',pval)
- call json%get(pval,data%Equipments%DrillingConsole%PreviousDWBreak)
- call json%get(p,'ForceBreak',pval)
- call json%get(pval,data%Equipments%DrillingConsole%ForceBreak)
- call json%get(p,'DWAcceleretor',pval)
- call json%get(pval,data%Equipments%DrillingConsole%DWAcceleretor)
- call json%get(p,'DWTransmisionLever',pval)
- call json%get(pval,data%Equipments%DrillingConsole%DWTransmisionLever)
- call json%get(p,'DWPowerLever',pval)
- call json%get(pval,data%Equipments%DrillingConsole%DWPowerLever)
- call json%get(p,'TongLever',pval)
- call json%get(pval,data%Equipments%DrillingConsole%TongLever)
- call json%get(p,'RTTransmissionLever',pval)
- call json%get(pval,data%Equipments%DrillingConsole%RTTransmissionLever)
- call json%get(p,'DWClutchLever',pval)
- call json%get(pval,data%Equipments%DrillingConsole%DWClutchLever)
- call json%get(p,'EddyBreakLever',pval)
- call json%get(pval,data%Equipments%DrillingConsole%EddyBreakLever)
- call json%get(p,'AutoDW',pval)
- call json%get(pval,data%Equipments%DrillingConsole%AutoDW)
- call json%get(p,'GEN1',pval)
- call json%get(pval,data%Equipments%DrillingConsole%GEN1)
- call json%get(p,'GEN2',pval)
- call json%get(pval,data%Equipments%DrillingConsole%GEN2)
- call json%get(p,'GEN3',pval)
- call json%get(pval,data%Equipments%DrillingConsole%GEN3)
- call json%get(p,'GEN4',pval)
- call json%get(pval,data%Equipments%DrillingConsole%GEN4)
- call json%get(p,'Permission_OpenKellyCock',pval)
- call json%get(pval,data%Equipments%DrillingConsole%Permission_OpenKellyCock)
- call json%get(p,'OpenKellyCock',pval)
- call json%get(pval,data%Equipments%DrillingConsole%OpenKellyCock)
- call json%get(p,'Permission_CloseKellyCock',pval)
- call json%get(pval,data%Equipments%DrillingConsole%Permission_CloseKellyCock)
- call json%get(p,'CloseKellyCock',pval)
- call json%get(pval,data%Equipments%DrillingConsole%CloseKellyCock)
- call json%get(p,'Permission_OpenSafetyValve',pval)
- call json%get(pval,data%Equipments%DrillingConsole%Permission_OpenSafetyValve)
- call json%get(p,'OpenSafetyValve',pval)
- call json%get(pval,data%Equipments%DrillingConsole%OpenSafetyValve)
- call json%get(p,'Permission_CloseSafetyValve',pval)
- call json%get(pval,data%Equipments%DrillingConsole%Permission_CloseSafetyValve)
- call json%get(p,'CloseSafetyValve',pval)
- call json%get(pval,data%Equipments%DrillingConsole%CloseSafetyValve)
- call json%get(p,'Permission_IRSafetyValve',pval)
- call json%get(pval,data%Equipments%DrillingConsole%Permission_IRSafetyValve)
- call json%get(p,'IRSafetyValve',pval)
- call json%get(pval,data%Equipments%DrillingConsole%IRSafetyValve)
- call json%get(p,'Permission_IRIBop',pval)
- call json%get(pval,data%Equipments%DrillingConsole%Permission_IRIBop)
- call json%get(p,'IRIBop',pval)
- call json%get(pval,data%Equipments%DrillingConsole%IRIBop)
- call json%get(p,'LatchPipe',pval)
- call json%get(pval,data%Equipments%DrillingConsole%LatchPipe)
- call json%get(p,'UnlatchPipe',pval)
- call json%get(pval,data%Equipments%DrillingConsole%UnlatchPipe)
- call json%get(p,'Swing',pval)
- call json%get(pval,data%Equipments%DrillingConsole%Swing)
- call json%get(p,'FillMouseHole',pval)
- call json%get(pval,data%Equipments%DrillingConsole%FillMouseHole)
- call json%get(p,'Slips',pval)
- call json%get(pval,data%Equipments%DrillingConsole%Slips)
- call json%get(p,'BrakeLeverCoefficient',pval)
- call json%get(pval,data%Equipments%DrillingConsole%BrakeLeverCoefficient)
- call json%get(p,'HideDrillingBrake',pval)
- call json%get(pval,data%Equipments%DrillingConsole%HideDrillingBrake)
- call json%get(p,'ParkingBrakeBtn',pval)
- call json%get(pval,data%Equipments%DrillingConsole%ParkingBrakeBtn)
+ call jsonfile%get('Equipments.Drilling.AssignmentSwitch',data%Equipments%DrillingConsole%AssignmentSwitch,found)
+ if ( .not. found ) call logg(4,"Not found: AssignmentSwitch")
+ call jsonfile%get('Equipments.Drilling.EmergencySwitch',data%Equipments%DrillingConsole%EmergencySwitch,found)
+ if ( .not. found ) call logg(4,"Not found: EmergencySwitch")
+ call jsonfile%get('Equipments.Drilling.RTTorqueLimitKnob',data%Equipments%DrillingConsole%RTTorqueLimitKnob,found)
+ if ( .not. found ) call logg(4,"Not found: RTTorqueLimitKnob")
+ call jsonfile%get('Equipments.Drilling.MP1CPSwitchI',data%Equipments%DrillingConsole%MP1CPSwitchI,found)
+ if ( .not. found ) call logg(4,"Not found: MP1CPSwitchI")
+ call jsonfile%get('Equipments.Drilling.MP1CPSwitchT',data%Equipments%DrillingConsole%MP1CPSwitchT,found)
+ if ( .not. found ) call logg(4,"Not found: MP1CPSwitchT")
+ call jsonfile%get('Equipments.Drilling.MP1CPSwitch',data%Equipments%DrillingConsole%MP1CPSwitch,found)
+ if ( .not. found ) call logg(4,"Not found: MP1CPSwitch")
+ call jsonfile%get('Equipments.Drilling.MP1ThrottleUpdate',data%Equipments%DrillingConsole%MP1ThrottleUpdate,found)
+ if ( .not. found ) call logg(4,"Not found: MP1ThrottleUpdate")
+ call jsonfile%get('Equipments.Drilling.MP1Throttle',data%Equipments%DrillingConsole%MP1Throttle,found)
+ if ( .not. found ) then
+ call logg(4,"Not found: MP1Throttle")
+ endif
+ call jsonfile%get('Equipments.Drilling.MP2SwitchI',data%Equipments%DrillingConsole%MP2SwitchI,found)
+ if ( .not. found ) call logg(4,"Not found: MP2SwitchI")
+ call jsonfile%get('Equipments.Drilling.MP2SwitchT',data%Equipments%DrillingConsole%MP2SwitchT,found)
+ if ( .not. found ) call logg(4,"Not found: MP2SwitchT")
+ call jsonfile%get('Equipments.Drilling.MP2Switch',data%Equipments%DrillingConsole%MP2Switch,found)
+ if ( .not. found ) call logg(4,"Not found: MP2Switch")
+ call jsonfile%get('Equipments.Drilling.MP2ThrottleUpdate',data%Equipments%DrillingConsole%MP2ThrottleUpdate,found)
+ if ( .not. found ) call logg(4,"Not found: MP2ThrottleUpdate")
+ call jsonfile%get('Equipments.Drilling.MP2Throttle',data%Equipments%DrillingConsole%MP2Throttle,found)
+ if ( .not. found ) call logg(4,"Not found: MP2Throttle")
+! call jsonfile%get('Equipments.Drilling.DWSwitch',data%Equipments%DrillingConsole%DWSwitch,found)
+! if ( .not. found ) call logg(4,"Not found: DWSwitch")
+ call jsonfile%get('Equipments.Drilling.DWThrottle',data%Equipments%DrillingConsole%DWThrottle,found)
+ if ( .not. found ) call logg(4,"Not found: DWThrottle")
+ call jsonfile%get('Equipments.Drilling.RTSwitch',data%Equipments%DrillingConsole%RTSwitch,found)
+ if ( .not. found ) call logg(4,"Not found: RTSwitch")
+ call jsonfile%get('Equipments.Drilling.RTThrottle',data%Equipments%DrillingConsole%RTThrottle,found)
+ if ( .not. found ) call logg(4,"Not found: RTThrottle")
+ call jsonfile%get('Equipments.Drilling.DWBreak',data%Equipments%DrillingConsole%DWBreak,found)
+ if ( .not. found ) call logg(4,"Not found: DWBreak")
+ call jsonfile%get('Equipments.Drilling.PreviousDWBreak',data%Equipments%DrillingConsole%PreviousDWBreak,found)
+ if ( .not. found ) call logg(4,"Not found: PreviousDWBreak")
+ call jsonfile%get('Equipments.Drilling.ForceBreak',data%Equipments%DrillingConsole%ForceBreak,found)
+ if ( .not. found ) call logg(4,"Not found: ForceBreak")
+ call jsonfile%get('Equipments.Drilling.DWAcceleretor',data%Equipments%DrillingConsole%DWAcceleretor,found)
+ if ( .not. found ) call logg(4,"Not found: DWAcceleretor")
+ call jsonfile%get('Equipments.Drilling.DWTransmisionLever',data%Equipments%DrillingConsole%DWTransmisionLever,found)
+ if ( .not. found ) call logg(4,"Not found: DWTransmisionLever")
+ call jsonfile%get('Equipments.Drilling.DWPowerLever',data%Equipments%DrillingConsole%DWPowerLever,found)
+ if ( .not. found ) call logg(4,"Not found: DWPowerLever")
+ call jsonfile%get('Equipments.Drilling.TongLever',data%Equipments%DrillingConsole%TongLever,found)
+ if ( .not. found ) call logg(4,"Not found: TongLever")
+ call jsonfile%get('Equipments.Drilling.RTTransmissionLever',data%Equipments%DrillingConsole%RTTransmissionLever,found)
+ if ( .not. found ) call logg(4,"Not found: RTTransmissionLever")
+ call jsonfile%get('Equipments.Drilling.DWClutchLever',data%Equipments%DrillingConsole%DWClutchLever,found)
+ if ( .not. found ) call logg(4,"Not found: DWClutchLever")
+ call jsonfile%get('Equipments.Drilling.EddyBreakLever',data%Equipments%DrillingConsole%EddyBreakLever,found)
+ if ( .not. found ) call logg(4,"Not found: EddyBreakLever")
+ call jsonfile%get('Equipments.Drilling.AutoDW',data%Equipments%DrillingConsole%AutoDW,found)
+ if ( .not. found ) call logg(4,"Not found: AutoDW")
+ call jsonfile%get('Equipments.Drilling.GEN1',data%Equipments%DrillingConsole%GEN1,found)
+ if ( .not. found ) call logg(4,"Not found: GEN1")
+ call jsonfile%get('Equipments.Drilling.GEN2',data%Equipments%DrillingConsole%GEN2,found)
+ if ( .not. found ) call logg(4,"Not found: GEN2")
+ call jsonfile%get('Equipments.Drilling.GEN3',data%Equipments%DrillingConsole%GEN3,found)
+ if ( .not. found ) call logg(4,"Not found: GEN3")
+ call jsonfile%get('Equipments.Drilling.GEN4',data%Equipments%DrillingConsole%GEN4,found)
+ if ( .not. found ) call logg(4,"Not found: GEN4")
+ call jsonfile%get('Equipments.Drilling.Permission_OpenKellyCock',data%Equipments%DrillingConsole%Permission_OpenKellyCock,found)
+ if ( .not. found ) call logg(4,"Not found: Permission_OpenKellyCock")
+ call jsonfile%get('Equipments.Drilling.OpenKellyCock',data%Equipments%DrillingConsole%OpenKellyCock,found)
+ if ( .not. found ) call logg(4,"Not found: OpenKellyCock")
+ call jsonfile%get('Equipments.Drilling.Permission_CloseKellyCock',data%Equipments%DrillingConsole%Permission_CloseKellyCock,found)
+ if ( .not. found ) call logg(4,"Not found: Permission_CloseKellyCock")
+ call jsonfile%get('Equipments.Drilling.CloseKellyCock',data%Equipments%DrillingConsole%CloseKellyCock,found)
+ if ( .not. found ) call logg(4,"Not found: CloseKellyCock")
+ call jsonfile%get('Equipments.Drilling.Permission_OpenSafetyValve',data%Equipments%DrillingConsole%Permission_OpenSafetyValve,found)
+ if ( .not. found ) call logg(4,"Not found: Permission_OpenSafetyValve")
+ call jsonfile%get('Equipments.Drilling.OpenSafetyValve',data%Equipments%DrillingConsole%OpenSafetyValve,found)
+ if ( .not. found ) call logg(4,"Not found: OpenSafetyValve")
+ call jsonfile%get('Equipments.Drilling.Permission_CloseSafetyValve',data%Equipments%DrillingConsole%Permission_CloseSafetyValve,found)
+ if ( .not. found ) call logg(4,"Not found: Permission_CloseSafetyValve")
+ call jsonfile%get('Equipments.Drilling.CloseSafetyValve',data%Equipments%DrillingConsole%CloseSafetyValve,found)
+ if ( .not. found ) call logg(4,"Not found: CloseSafetyValve")
+ call jsonfile%get('Equipments.Drilling.Permission_IRSafetyValve',data%Equipments%DrillingConsole%Permission_IRSafetyValve,found)
+ if ( .not. found ) call logg(4,"Not found: Permission_IRSafetyValve")
+ call jsonfile%get('Equipments.Drilling.IRSafetyValve',data%Equipments%DrillingConsole%IRSafetyValve,found)
+ if ( .not. found ) call logg(4,"Not found: IRSafetyValve")
+ call jsonfile%get('Equipments.Drilling.Permission_IRIBop',data%Equipments%DrillingConsole%Permission_IRIBop,found)
+ if ( .not. found ) call logg(4,"Not found: Permission_IRIBop")
+ call jsonfile%get('Equipments.Drilling.IRIBop',data%Equipments%DrillingConsole%IRIBop,found)
+ if ( .not. found ) call logg(4,"Not found: IRIBop")
+ call jsonfile%get('Equipments.Drilling.LatchPipe',data%Equipments%DrillingConsole%LatchPipe,found)
+ if ( .not. found ) call logg(4,"Not found: LatchPipe")
+ call jsonfile%get('Equipments.Drilling.UnlatchPipe',data%Equipments%DrillingConsole%UnlatchPipe,found)
+ if ( .not. found ) call logg(4,"Not found: UnlatchPipe")
+ call jsonfile%get('Equipments.Drilling.Swing',data%Equipments%DrillingConsole%Swing,found)
+ if ( .not. found ) call logg(4,"Not found: Swing")
+ call jsonfile%get('Equipments.Drilling.FillMouseHole',data%Equipments%DrillingConsole%FillMouseHole,found)
+ if ( .not. found ) call logg(4,"Not found: FillMouseHole")
+ call jsonfile%get('Equipments.Drilling.Slips',data%Equipments%DrillingConsole%Slips,found)
+ if ( .not. found ) call logg(4,"Not found: Slips")
+ call jsonfile%get('Equipments.Drilling.BrakeLeverCoefficient',data%Equipments%DrillingConsole%BrakeLeverCoefficient,found)
+ if ( .not. found ) call logg(4,"Not found: BrakeLeverCoefficient")
+ call jsonfile%get('Equipments.Drilling.HideDrillingBrake',data%Equipments%DrillingConsole%HideDrillingBrake,found)
+ if ( .not. found ) call logg(4,"Not found: HideDrillingBrake")
+ call jsonfile%get('Equipments.Drilling.ParkingBrakeBtn',data%Equipments%DrillingConsole%ParkingBrakeBtn,found)
+ if ( .not. found ) call logg(4,"Not found: ParkingBrakeBtn")
-! call json%get(p,'ParkingBrakeLed',pval)
-! call json%get(pval,data%Equipments%DrillingConsole%ParkingBrakeLed)
-! call json%get(p,'GEN1LED',pval)
-! call json%get(pval,data%Equipments%DrillingConsole%GEN1LED)
-! call json%get(p,'GEN2LED',pval)
-! call json%get(pval,data%Equipments%DrillingConsole%GEN2LED)
-! call json%get(p,'GEN3LED',pval)
-! call json%get(pval,data%Equipments%DrillingConsole%GEN3LED)
-! call json%get(p,'GEN4LED',pval)
-! call json%get(pval,data%Equipments%DrillingConsole%GEN4LED)
-! call json%get(p,'SCR1LED',pval)
-! call json%get(pval,data%Equipments%DrillingConsole%SCR1LED)
-! call json%get(p,'SCR2LED',pval)
-! call json%get(pval,data%Equipments%DrillingConsole%SCR2LED)
-! call json%get(p,'SCR3LED',pval)
-! call json%get(pval,data%Equipments%DrillingConsole%SCR3LED)
-! call json%get(p,'SCR4LED',pval)
-! call json%get(pval,data%Equipments%DrillingConsole%SCR4LED)
-! call json%get(p,'MP1BLWR',pval)
-! call json%get(pval,data%Equipments%DrillingConsole%MP1BLWR)
-! call json%get(p,'MP2BLWR',pval)
-! call json%get(pval,data%Equipments%DrillingConsole%MP2BLWR)
-! call json%get(p,'DWBLWR',pval)
-! call json%get(pval,data%Equipments%DrillingConsole%DWBLWR)
-! call json%get(p,'RTBLWR',pval)
-! call json%get(pval,data%Equipments%DrillingConsole%RTBLWR)
-! call json%get(p,'PWRLIM',pval)
-! call json%get(pval,data%Equipments%DrillingConsole%PWRLIM)
-! call json%get(p,'PWRLIMMTR',pval)
-! call json%get(pval,data%Equipments%DrillingConsole%PWRLIMMTR)
-! call json%get(p,'RTTorqueLimitGauge',pval)
-! call json%get(pval,data%Equipments%DrillingConsole%RTTorqueLimitGauge)
-! call json%get(p,'AutoDWLED',pval)
-! call json%get(pval,data%Equipments%DrillingConsole%AutoDWLED)
-! call json%get(p,'GEN1BTNLED',pval)
-! call json%get(pval,data%Equipments%DrillingConsole%GEN1BTNLED)
-! call json%get(p,'GEN2BTNLED',pval)
-! call json%get(pval,data%Equipments%DrillingConsole%GEN2BTNLED)
-! call json%get(p,'GEN3BTNLED',pval)
-! call json%get(pval,data%Equipments%DrillingConsole%GEN3BTNLED)
-! call json%get(p,'GEN4BTNLED',pval)
-! call json%get(pval,data%Equipments%DrillingConsole%GEN4BTNLED)
-! call json%get(p,'OpenKellyCockLed',pval)
-! call json%get(pval,data%Equipments%DrillingConsole%OpenKellyCockLed)
-! call json%get(p,'CloseKellyCockLed',pval)
-! call json%get(pval,data%Equipments%DrillingConsole%CloseKellyCockLed)
-! call json%get(p,'OpenSafetyValveLed',pval)
-! call json%get(pval,data%Equipments%DrillingConsole%OpenSafetyValveLed)
-! call json%get(p,'CloseSafetyValveLed',pval)
-! call json%get(pval,data%Equipments%DrillingConsole%CloseSafetyValveLed)
-! call json%get(p,'IRSafetyValveLed',pval)
-! call json%get(pval,data%Equipments%DrillingConsole%IRSafetyValveLed)
-! call json%get(p,'IRIBopLed',pval)
-! call json%get(pval,data%Equipments%DrillingConsole%IRIBopLed)
-! call json%get(p,'LatchPipeLED',pval)
-! call json%get(pval,data%Equipments%DrillingConsole%LatchPipeLED)
-! call json%get(p,'UnlatchPipeLED',pval)
-! call json%get(pval,data%Equipments%DrillingConsole%UnlatchPipeLED)
-! call json%get(p,'SwingLed',pval)
-! call json%get(pval,data%Equipments%DrillingConsole%SwingLed)
-! call json%get(p,'FillMouseHoleLed',pval)
-! call json%get(pval,data%Equipments%DrillingConsole%FillMouseHoleLed)
+ data%Equipments%DrillingConsole%DWSwitch = -1
+ data%Equipments%DrillingConsole%AssignmentSwitch = 1
+ data%Equipments%DrillingConsole%MP1CPSwitch = -1
+ data%Equipments%DrillingConsole%MP2Switch = -1
+ data%Equipments%DrillingConsole%RTSwitch = -1
end subroutine
subroutine DrillingConsoleToJson(parent)
@@ -197,61 +140,7 @@ module CDrillingConsole
! 1. create new node
call json%create_object(p,'Drilling')
-! call json%add(p,"AssignmentSwitch",data%Equipments%DrillingConsole%AssignmentSwitch)
-! call json%add(p,"EmergencySwitch",data%Equipments%DrillingConsole%EmergencySwitch)
-! call json%add(p,"RTTorqueLimitKnob",data%Equipments%DrillingConsole%RTTorqueLimitKnob)
-! call json%add(p,"MP1CPSwitchI",data%Equipments%DrillingConsole%MP1CPSwitchI)
-! call json%add(p,"MP1CPSwitchT",data%Equipments%DrillingConsole%MP1CPSwitchT)
-! call json%add(p,"MP1CPSwitch",data%Equipments%DrillingConsole%MP1CPSwitch)
-! call json%add(p,"MP1ThrottleUpdate",data%Equipments%DrillingConsole%MP1ThrottleUpdate)
-! call json%add(p,"MP1Throttle",data%Equipments%DrillingConsole%MP1Throttle)
-! call json%add(p,"MP2SwitchI",data%Equipments%DrillingConsole%MP2SwitchI)
-! call json%add(p,"MP2SwitchT",data%Equipments%DrillingConsole%MP2SwitchT)
-! call json%add(p,"MP2Switch",data%Equipments%DrillingConsole%MP2Switch)
-! call json%add(p,"MP2ThrottleUpdate",data%Equipments%DrillingConsole%MP2ThrottleUpdate)
-! call json%add(p,"MP2Throttle",data%Equipments%DrillingConsole%MP2Throttle)
-! call json%add(p,"DWSwitch",data%Equipments%DrillingConsole%DWSwitch)
-! call json%add(p,"DWThrottle",data%Equipments%DrillingConsole%DWThrottle)
-! call json%add(p,"RTSwitch",data%Equipments%DrillingConsole%RTSwitch)
-! call json%add(p,"RTThrottle",data%Equipments%DrillingConsole%RTThrottle)
-! call json%add(p,"DWBreak",data%Equipments%DrillingConsole%DWBreak)
-! call json%add(p,"PreviousDWBreak",data%Equipments%DrillingConsole%PreviousDWBreak)
-! call json%add(p,"ForceBreak",data%Equipments%DrillingConsole%ForceBreak)
-! call json%add(p,"DWAcceleretor",data%Equipments%DrillingConsole%DWAcceleretor)
-! call json%add(p,"DWTransmisionLever",data%Equipments%DrillingConsole%DWTransmisionLever)
-! call json%add(p,"DWPowerLever",data%Equipments%DrillingConsole%DWPowerLever)
-! call json%add(p,"TongLever",data%Equipments%DrillingConsole%TongLever)
-! call json%add(p,"RTTransmissionLever",data%Equipments%DrillingConsole%RTTransmissionLever)
-! call json%add(p,"DWClutchLever",data%Equipments%DrillingConsole%DWClutchLever)
-! call json%add(p,"EddyBreakLever",data%Equipments%DrillingConsole%EddyBreakLever)
-! call json%add(p,"AutoDW",data%Equipments%DrillingConsole%AutoDW)
-! call json%add(p,"GEN1",data%Equipments%DrillingConsole%GEN1)
-! call json%add(p,"GEN2",data%Equipments%DrillingConsole%GEN2)
-! call json%add(p,"GEN3",data%Equipments%DrillingConsole%GEN3)
-! call json%add(p,"GEN4",data%Equipments%DrillingConsole%GEN4)
-! call json%add(p,"Permission_OpenKellyCock",data%Equipments%DrillingConsole%Permission_OpenKellyCock)
-! call json%add(p,"OpenKellyCock",data%Equipments%DrillingConsole%OpenKellyCock)
-! call json%add(p,"Permission_CloseKellyCock",data%Equipments%DrillingConsole%Permission_CloseKellyCock)
-! call json%add(p,"CloseKellyCock",data%Equipments%DrillingConsole%CloseKellyCock)
-! call json%add(p,"Permission_OpenSafetyValve",data%Equipments%DrillingConsole%Permission_OpenSafetyValve)
-! call json%add(p,"OpenSafetyValve",data%Equipments%DrillingConsole%OpenSafetyValve)
-! call json%add(p,"Permission_CloseSafetyValve",data%Equipments%DrillingConsole%Permission_CloseSafetyValve)
-! call json%add(p,"CloseSafetyValve",data%Equipments%DrillingConsole%CloseSafetyValve)
-! call json%add(p,"Permission_IRSafetyValve",data%Equipments%DrillingConsole%Permission_IRSafetyValve)
-! call json%add(p,"IRSafetyValve",data%Equipments%DrillingConsole%IRSafetyValve)
-! call json%add(p,"Permission_IRIBop",data%Equipments%DrillingConsole%Permission_IRIBop)
-! call json%add(p,"IRIBop",data%Equipments%DrillingConsole%IRIBop)
-! call json%add(p,"LatchPipe",data%Equipments%DrillingConsole%LatchPipe)
-! call json%add(p,"UnlatchPipe",data%Equipments%DrillingConsole%UnlatchPipe)
-! call json%add(p,"Swing",data%Equipments%DrillingConsole%Swing)
-! call json%add(p,"FillMouseHole",data%Equipments%DrillingConsole%FillMouseHole)
-! call json%add(p,"Slips",data%Equipments%DrillingConsole%Slips)
-! call json%add(p,"BrakeLeverCoefficient",data%Equipments%DrillingConsole%BrakeLeverCoefficient)
-! call json%add(p,"HideDrillingBrake",data%Equipments%DrillingConsole%HideDrillingBrake)
-! call json%add(p,"ParkingBrakeBtn",data%Equipments%DrillingConsole%ParkingBrakeBtn)
-
-
-
+
call json%add(p,"ParkingBrakeLed",data%Equipments%DrillingConsole%ParkingBrakeLed)
call json%add(p,"GEN1LED",data%Equipments%DrillingConsole%GEN1LED)
call json%add(p,"GEN2LED",data%Equipments%DrillingConsole%GEN2LED)
diff --git a/CSharp/Equipments/ControlPanels/CDrillingConsoleVariables.i90 b/CSharp/Equipments/ControlPanels/CDrillingConsoleVariables.i90
index 53acdc0..ea1b61c 100644
--- a/CSharp/Equipments/ControlPanels/CDrillingConsoleVariables.i90
+++ b/CSharp/Equipments/ControlPanels/CDrillingConsoleVariables.i90
@@ -1,4 +1,4 @@
-# 1 "/mnt/c/Projects/VSIM/SimulationCore2/CSharp/Equipments/ControlPanels/CDrillingConsoleVariables.f90"
+# 1 "/home/admin/SimulationCore2/CSharp/Equipments/ControlPanels/CDrillingConsoleVariables.f90"
module CDrillingConsoleVariables
! use CVoidEventHandlerCollection
diff --git a/CSharp/Equipments/ControlPanels/CHook.f90 b/CSharp/Equipments/ControlPanels/CHook.f90
index 16166ca..2a58c99 100644
--- a/CSharp/Equipments/ControlPanels/CHook.f90
+++ b/CSharp/Equipments/ControlPanels/CHook.f90
@@ -39,21 +39,12 @@ module CHook
use SimulationVariables
implicit none
real , intent(in) :: v
-
- #ifdef ExcludeExtraChanges
- if(data%Equipments%Hook%HookHeight == v) return
- #endif
-
- data%Equipments%Hook%HookHeight = 100
+ data%Equipments%Hook%HookHeight = v
! if(associated(HookHeightPtr)) then
! call HookHeightPtr(data%Equipments%Hook%HookHeight)
! end if
-
- #ifdef deb
- print*, 'HookHeight=', data%Equipments%Hook%HookHeight
- #endif
-
+
!**call data%Equipments%Hook%OnHookHeightChange%RunAll(data%Equipments%Hook%HookHeight)
end subroutine
diff --git a/CSharp/Equipments/ControlPanels/CHook.i90 b/CSharp/Equipments/ControlPanels/CHook.i90
index 21ad84c..ef8dc0c 100644
--- a/CSharp/Equipments/ControlPanels/CHook.i90
+++ b/CSharp/Equipments/ControlPanels/CHook.i90
@@ -1,4 +1,4 @@
-# 1 "/mnt/c/Projects/VSIM/SimulationCore2/CSharp/Equipments/ControlPanels/CHook.f90"
+# 1 "/home/admin/SimulationCore2/CSharp/Equipments/ControlPanels/CHook.f90"
module CHook
use CHookVariables
use SimulationVariables
@@ -40,21 +40,12 @@ module CHook
use SimulationVariables
implicit none
real , intent(in) :: v
-
- #ifdef ExcludeExtraChanges
- if(data%Equipments%Hook%HookHeight == v) return
- #endif
-
- data%Equipments%Hook%HookHeight = 100
+ data%Equipments%Hook%HookHeight = v
! if(associated(HookHeightPtr)) then
! call HookHeightPtr(data%Equipments%Hook%HookHeight)
! end if
-
- #ifdef deb
- print*, 'HookHeight=', data%Equipments%Hook%HookHeight
- #endif
-
+
!**call data%Equipments%Hook%OnHookHeightChange%RunAll(data%Equipments%Hook%HookHeight)
end subroutine
diff --git a/CSharp/Equipments/ControlPanels/CStandPipeManifold.f90 b/CSharp/Equipments/ControlPanels/CStandPipeManifold.f90
index c34cd78..664f770 100644
--- a/CSharp/Equipments/ControlPanels/CStandPipeManifold.f90
+++ b/CSharp/Equipments/ControlPanels/CStandPipeManifold.f90
@@ -1,7 +1,6 @@
module CStandPipeManifold
use CStandPipeManifoldVariables
use SimulationVariables
- use CManifolds
implicit none
public
contains
diff --git a/CSharp/Equipments/ControlPanels/CStandPipeManifold.i90 b/CSharp/Equipments/ControlPanels/CStandPipeManifold.i90
index 1922750..8722608 100644
--- a/CSharp/Equipments/ControlPanels/CStandPipeManifold.i90
+++ b/CSharp/Equipments/ControlPanels/CStandPipeManifold.i90
@@ -1,8 +1,7 @@
-# 1 "/mnt/c/Projects/VSIM/SimulationCore2/CSharp/Equipments/ControlPanels/CStandPipeManifold.f90"
+# 1 "/home/admin/SimulationCore2/CSharp/Equipments/ControlPanels/CStandPipeManifold.f90"
module CStandPipeManifold
use CStandPipeManifoldVariables
use SimulationVariables
- use CManifolds
implicit none
public
contains
diff --git a/CSharp/Equipments/ControlPanels/CTopDrivePanel.i90 b/CSharp/Equipments/ControlPanels/CTopDrivePanel.i90
index 149c763..81af42b 100644
--- a/CSharp/Equipments/ControlPanels/CTopDrivePanel.i90
+++ b/CSharp/Equipments/ControlPanels/CTopDrivePanel.i90
@@ -1,4 +1,4 @@
-# 1 "/mnt/c/Projects/VSIM/SimulationCore2/CSharp/Equipments/ControlPanels/CTopDrivePanel.f90"
+# 1 "/home/admin/SimulationCore2/CSharp/Equipments/ControlPanels/CTopDrivePanel.f90"
module CTopDrivePanel
use CTopDrivePanelVariables
use SimulationVariables
diff --git a/CSharp/Equipments/DrillWatch/DrillWatch.f90 b/CSharp/Equipments/DrillWatch/DrillWatch.f90
index feb6e06..d60b7c7 100644
--- a/CSharp/Equipments/DrillWatch/DrillWatch.f90
+++ b/CSharp/Equipments/DrillWatch/DrillWatch.f90
@@ -71,8 +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",50)
- ! 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)
diff --git a/CSharp/Equipments/DrillWatch/DrillWatch.i90 b/CSharp/Equipments/DrillWatch/DrillWatch.i90
index 46ab273..2d2947e 100644
--- a/CSharp/Equipments/DrillWatch/DrillWatch.i90
+++ b/CSharp/Equipments/DrillWatch/DrillWatch.i90
@@ -1,4 +1,4 @@
-# 1 "/mnt/c/Projects/VSIM/SimulationCore2/CSharp/Equipments/DrillWatch/DrillWatch.f90"
+# 1 "/home/admin/SimulationCore2/CSharp/Equipments/DrillWatch/DrillWatch.f90"
module DrillingWatchModule
use SimulationVariables
contains
@@ -72,8 +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",50)
-! 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)
diff --git a/CSharp/Equipments/MudPathFinding/CManifolds.f90 b/CSharp/Equipments/MudPathFinding/CManifolds.f90
index 48cddbf..af556bb 100644
--- a/CSharp/Equipments/MudPathFinding/CManifolds.f90
+++ b/CSharp/Equipments/MudPathFinding/CManifolds.f90
@@ -1,10 +1,7 @@
module CManifolds
use CStack
use CArrangement
- ! use CPathChangeEvents
- ! use CDrillingConsoleVariables
use SimulationVariables
- ! use ConfigurationVariables, only: EquipmentControl
implicit none
diff --git a/CSharp/Equipments/MudPathFinding/CManifolds.i90 b/CSharp/Equipments/MudPathFinding/CManifolds.i90
index 9cef151..5803e2d 100644
--- a/CSharp/Equipments/MudPathFinding/CManifolds.i90
+++ b/CSharp/Equipments/MudPathFinding/CManifolds.i90
@@ -1,11 +1,8 @@
-# 1 "/mnt/c/Projects/VSIM/SimulationCore2/CSharp/Equipments/MudPathFinding/CManifolds.f90"
+# 1 "/home/admin/SimulationCore2/CSharp/Equipments/MudPathFinding/CManifolds.f90"
module CManifolds
use CStack
use CArrangement
-! use CPathChangeEvents
-! use CDrillingConsoleVariables
use SimulationVariables
-! use ConfigurationVariables, only: EquipmentControl
implicit none
@@ -108,7 +105,7 @@ end subroutine PathFinding_Step
Manifold%IsTraverse = .true.
!TODO: clean up
-# 118
+# 115
endsubroutine
@@ -699,7 +696,7 @@ end subroutine PathFinding_Step
call Manifold%Valve(127)%AdjacentTo(103)
call Manifold%Valve(103)%AdjacentTo(127)
-# 711
+# 708
Manifold%IsPathsDirty = .true.
end subroutine
@@ -713,7 +710,7 @@ end subroutine PathFinding_Step
call Manifold%Valve(127)%AdjacentTo(78)
-# 727
+# 724
Manifold%IsPathsDirty = .true.
@@ -756,7 +753,7 @@ end subroutine PathFinding_Step
call Manifold%Valve(127)%AdjacentTo(56)
-# 771
+# 768
data%Equipments%DrillingConsole%IRSafetyValveLed = 1
@@ -781,7 +778,7 @@ end subroutine PathFinding_Step
data%Equipments%DrillingConsole%OpenSafetyValveLed = 0
data%Equipments%DrillingConsole%CloseSafetyValveLed = 0
-# 797
+# 794
end subroutine
@@ -794,7 +791,7 @@ end subroutine PathFinding_Step
Manifold%SafetyValve = .true.
call ChangeValve(56, Manifold%SafetyValve)
-# 811
+# 808
end subroutine
@@ -807,7 +804,7 @@ end subroutine PathFinding_Step
Manifold%SafetyValve = .false.
call ChangeValve(56, Manifold%SafetyValve)
-# 825
+# 822
end subroutine
@@ -847,7 +844,7 @@ end subroutine PathFinding_Step
data%Equipments%DrillingConsole%IRSafetyValveLed = 1
call OpenSafetyValve_TripMode()
-# 866
+# 863
end subroutine
@@ -870,7 +867,7 @@ end subroutine PathFinding_Step
data%Equipments%DrillingConsole%OpenSafetyValveLed = 0
data%Equipments%DrillingConsole%CloseSafetyValveLed = 0
-# 890
+# 887
end subroutine
@@ -883,7 +880,7 @@ end subroutine PathFinding_Step
Manifold%SafetyValve = .true.
call ChangeValve(54, Manifold%SafetyValve)
-# 904
+# 901
end subroutine
@@ -896,7 +893,7 @@ end subroutine PathFinding_Step
Manifold%SafetyValve = .false.
call ChangeValve(54, Manifold%SafetyValve)
-# 918
+# 915
end subroutine
@@ -930,7 +927,7 @@ end subroutine PathFinding_Step
data%Equipments%DrillingConsole%IRSafetyValveLed = 1
call OpenSafetyValve_TopDrive()
-# 953
+# 950
end subroutine
@@ -953,7 +950,7 @@ end subroutine PathFinding_Step
data%Equipments%DrillingConsole%OpenSafetyValveLed = 0
data%Equipments%DrillingConsole%CloseSafetyValveLed = 0
-# 977
+# 974
end subroutine
@@ -965,7 +962,7 @@ end subroutine PathFinding_Step
data%Equipments%DrillingConsole%CloseSafetyValveLed = 0
Manifold%SafetyValve = .true.
-# 990
+# 987
call ChangeValve(54, Manifold%SafetyValve)
@@ -978,7 +975,7 @@ end subroutine PathFinding_Step
data%Equipments%DrillingConsole%OpenSafetyValveLed = 0
Manifold%SafetyValve = .false.
-# 1004
+# 1001
call ChangeValve(54, Manifold%SafetyValve)
@@ -1005,7 +1002,7 @@ end subroutine PathFinding_Step
call Manifold%Valve(103)%AdjacentTo(55)
call Manifold%Valve(124)%AdjacentTo(55)
-# 1032
+# 1029
data%Equipments%DrillingConsole%IRIBopLed = 1
@@ -1025,7 +1022,7 @@ end subroutine PathFinding_Step
call Manifold%Valve(103)%AdjacentTo(124)
call Manifold%Valve(124)%AdjacentTo(103)
-# 1053
+# 1050
data%Equipments%DrillingConsole%IRIBopLed = 0
@@ -1038,7 +1035,7 @@ end subroutine PathFinding_Step
if(.not.Manifold%IsIBopInstalled) return
Manifold%IBop = .true.
-# 1067
+# 1064
call ChangeValve(55, Manifold%IBop)
@@ -1049,7 +1046,7 @@ end subroutine PathFinding_Step
if(.not.Manifold%IsIBopInstalled) return
Manifold%IBop = .false.
-# 1079
+# 1076
call ChangeValve(55, Manifold%IBop)
@@ -1074,7 +1071,7 @@ end subroutine PathFinding_Step
call Manifold%Valve(126)%AdjacentTo(68)
-# 1105
+# 1102
call OpenKellyCock()
@@ -1098,7 +1095,7 @@ end subroutine PathFinding_Step
data%Equipments%DrillingConsole%CloseKellyCockLed = 0
data%Equipments%DrillingConsole%OpenKellyCockLed = 0
-# 1130
+# 1127
end subroutine
@@ -1110,7 +1107,7 @@ end subroutine PathFinding_Step
data%Equipments%DrillingConsole%CloseKellyCockLed = 0
Manifold%KellyCock = .true.
-# 1143
+# 1140
call ChangeValve(68, Manifold%KellyCock)
@@ -1123,7 +1120,7 @@ end subroutine PathFinding_Step
data%Equipments%DrillingConsole%OpenKellyCockLed = 0
Manifold%KellyCock = .false.
-# 1157
+# 1154
call ChangeValve(68, Manifold%KellyCock)
@@ -1150,7 +1147,7 @@ end subroutine PathFinding_Step
call Manifold%Valve(128)%AdjacentTo(70)
call Manifold%Valve(70)%AdjacentTo(128)
-# 1185
+# 1182
call OpenTopDriveIBop()
end subroutine
@@ -1168,7 +1165,7 @@ end subroutine PathFinding_Step
call Manifold%Valve(126)%AdjacentTo(128)
call Manifold%Valve(128)%AdjacentTo(126)
-# 1204
+# 1201
Manifold%TopDriveIBop = .false.
call ChangeValve(70, Manifold%TopDriveIBop)
@@ -1179,7 +1176,7 @@ end subroutine PathFinding_Step
if(.not.Manifold%IsTopDriveIBopInstalled) return
Manifold%TopDriveIBop = .true.
call ChangeValve(70, Manifold%TopDriveIBop)
-# 1216
+# 1213
end subroutine
@@ -1188,7 +1185,7 @@ end subroutine PathFinding_Step
if(.not.Manifold%IsTopDriveIBopInstalled) return
Manifold%TopDriveIBop = .false.
call ChangeValve(70, Manifold%TopDriveIBop)
-# 1226
+# 1223
end subroutine
@@ -1212,7 +1209,7 @@ end subroutine PathFinding_Step
call Manifold%Valve(69)%AdjacentTo(48)
call Manifold%Valve(79)%AdjacentTo(48)
-# 1251
+# 1248
call OpenFloatValve()
end subroutine
@@ -1229,7 +1226,7 @@ end subroutine PathFinding_Step
call Manifold%Valve(69)%AdjacentTo(79)
call Manifold%Valve(79)%AdjacentTo(69)
-# 1269
+# 1266
Manifold%FloatValve = .false.
call ChangeValve(48, Manifold%FloatValve)
@@ -1239,7 +1236,7 @@ end subroutine PathFinding_Step
implicit none
if(.not.Manifold%IsFloatValveInstalled) return
Manifold%FloatValve = .true.
-# 1280
+# 1277
call ChangeValve(48, Manifold%FloatValve)
end subroutine
@@ -1248,7 +1245,7 @@ end subroutine PathFinding_Step
implicit none
if(.not.Manifold%IsFloatValveInstalled) return
Manifold%FloatValve = .false.
-# 1290
+# 1287
call ChangeValve(48, Manifold%FloatValve)
end subroutine
@@ -1324,7 +1321,7 @@ end subroutine PathFinding_Step
Manifold%Valve(60)%Status = .false.
endif
endif
-# 1367
+# 1364
!call Traverse()
Manifold%IsPathsDirty = .true.
diff --git a/CSharp/OperationScenarios/Unity/UnityModule.f90 b/CSharp/OperationScenarios/Unity/UnityModule.f90
index f1d552b..2e7e9bb 100644
--- a/CSharp/OperationScenarios/Unity/UnityModule.f90
+++ b/CSharp/OperationScenarios/Unity/UnityModule.f90
@@ -79,7 +79,7 @@ subroutine Set_NearFloorPosition(v)
! #endif
data%Equipments%UnityInputs%NearFloorPosition = v
!**call data%Equipments%UnityInputs%OnNearFloorPositionChange%RunAll()
- if(logging>4) then
+ if(log_level>4) then
print*, 'NearFloorPosition =', data%Equipments%UnityInputs%NearFloorPosition
endif
end subroutine
diff --git a/CSharp/OperationScenarios/Unity/UnityModule.i90 b/CSharp/OperationScenarios/Unity/UnityModule.i90
index 0d0e92c..2065d43 100644
--- a/CSharp/OperationScenarios/Unity/UnityModule.i90
+++ b/CSharp/OperationScenarios/Unity/UnityModule.i90
@@ -1,4 +1,4 @@
-# 1 "/mnt/c/Projects/VSIM/SimulationCore2/CSharp/OperationScenarios/Unity/UnityModule.f90"
+# 1 "/home/admin/SimulationCore2/CSharp/OperationScenarios/Unity/UnityModule.f90"
module UnityModule
use SimulationVariables
implicit none
@@ -80,7 +80,7 @@ subroutine Set_NearFloorPosition(v)
! #endif
data%Equipments%UnityInputs%NearFloorPosition = v
!**call data%Equipments%UnityInputs%OnNearFloorPositionChange%RunAll()
- if(logging>4) then
+ if(log_level>4) then
print*, 'NearFloorPosition =', data%Equipments%UnityInputs%NearFloorPosition
endif
end subroutine
diff --git a/Common/json-fortran/json_value_module.i90 b/Common/json-fortran/json_value_module.i90
index d471808..02895fe 100644
--- a/Common/json-fortran/json_value_module.i90
+++ b/Common/json-fortran/json_value_module.i90
@@ -1,4 +1,4 @@
-# 1 "/mnt/c/Projects/VSIM/SimulationCore2/Common/json-fortran/json_value_module.F90"
+# 1 "/home/admin/SimulationCore2/Common/json-fortran/json_value_module.F90"
!*****************************************************************************************
!> author: Jacob Williams
! license: BSD
@@ -25,7 +25,7 @@
private
-# 1 "/mnt/c/Projects/VSIM/SimulationCore2/Common/json-fortran/json_macros.inc" 1
+# 1 "/home/admin/SimulationCore2/Common/json-fortran/json_macros.inc" 1
! JSON-Fortran preprocessor macros.
!
! License
@@ -63,7 +63,7 @@
!*********************************************************
-# 28 "/mnt/c/Projects/VSIM/SimulationCore2/Common/json-fortran/json_value_module.F90" 2
+# 28 "/home/admin/SimulationCore2/Common/json-fortran/json_value_module.F90" 2
!*********************************************************
!>
@@ -972,7 +972,7 @@
! all have a similar interface.
function initialize_json_core(&
-# 1 "/mnt/c/Projects/VSIM/SimulationCore2/Common/json-fortran/json_initialize_dummy_arguments.inc" 1
+# 1 "/home/admin/SimulationCore2/Common/json-fortran/json_initialize_dummy_arguments.inc" 1
! The dummy argument list for the various `initialize` subroutines.
!
! See also: json_initialize_argument.inc
@@ -998,13 +998,13 @@ null_to_real_mode,&
non_normal_mode,&
use_quiet_nan, &
strict_integer_type_checking &
-# 983 "/mnt/c/Projects/VSIM/SimulationCore2/Common/json-fortran/json_value_module.F90" 2
+# 983 "/home/admin/SimulationCore2/Common/json-fortran/json_value_module.F90" 2
) result(json_core_object)
implicit none
type(json_core) :: json_core_object
-# 1 "/mnt/c/Projects/VSIM/SimulationCore2/Common/json-fortran/json_initialize_arguments.inc" 1
+# 1 "/home/admin/SimulationCore2/Common/json-fortran/json_initialize_arguments.inc" 1
! The argument list for the various `initialize` subroutines.
!
! See also: json_initialize_dummy_arguments.inc
@@ -1119,10 +1119,10 @@ logical(LK),intent(in),optional :: strict_integer_type_checking
!! value cannot be read.
!!
!! (default is true)
-# 989 "/mnt/c/Projects/VSIM/SimulationCore2/Common/json-fortran/json_value_module.F90" 2
+# 989 "/home/admin/SimulationCore2/Common/json-fortran/json_value_module.F90" 2
call json_core_object%initialize(&
-# 1 "/mnt/c/Projects/VSIM/SimulationCore2/Common/json-fortran/json_initialize_dummy_arguments.inc" 1
+# 1 "/home/admin/SimulationCore2/Common/json-fortran/json_initialize_dummy_arguments.inc" 1
! The dummy argument list for the various `initialize` subroutines.
!
! See also: json_initialize_argument.inc
@@ -1148,7 +1148,7 @@ null_to_real_mode,&
non_normal_mode,&
use_quiet_nan, &
strict_integer_type_checking &
-# 992 "/mnt/c/Projects/VSIM/SimulationCore2/Common/json-fortran/json_value_module.F90" 2
+# 992 "/home/admin/SimulationCore2/Common/json-fortran/json_value_module.F90" 2
)
end function initialize_json_core
@@ -1174,7 +1174,7 @@ strict_integer_type_checking &
! all have a similar interface.
subroutine json_initialize(me,&
-# 1 "/mnt/c/Projects/VSIM/SimulationCore2/Common/json-fortran/json_initialize_dummy_arguments.inc" 1
+# 1 "/home/admin/SimulationCore2/Common/json-fortran/json_initialize_dummy_arguments.inc" 1
! The dummy argument list for the various `initialize` subroutines.
!
! See also: json_initialize_argument.inc
@@ -1200,13 +1200,13 @@ null_to_real_mode,&
non_normal_mode,&
use_quiet_nan, &
strict_integer_type_checking &
-# 1018 "/mnt/c/Projects/VSIM/SimulationCore2/Common/json-fortran/json_value_module.F90" 2
+# 1018 "/home/admin/SimulationCore2/Common/json-fortran/json_value_module.F90" 2
)
implicit none
class(json_core),intent(inout) :: me
-# 1 "/mnt/c/Projects/VSIM/SimulationCore2/Common/json-fortran/json_initialize_arguments.inc" 1
+# 1 "/home/admin/SimulationCore2/Common/json-fortran/json_initialize_arguments.inc" 1
! The argument list for the various `initialize` subroutines.
!
! See also: json_initialize_dummy_arguments.inc
@@ -1321,7 +1321,7 @@ logical(LK),intent(in),optional :: strict_integer_type_checking
!! value cannot be read.
!!
!! (default is true)
-# 1024 "/mnt/c/Projects/VSIM/SimulationCore2/Common/json-fortran/json_value_module.F90" 2
+# 1024 "/home/admin/SimulationCore2/Common/json-fortran/json_value_module.F90" 2
character(kind=CDK,len=10) :: w !! max string length
character(kind=CDK,len=10) :: d !! real precision digits
@@ -8262,7 +8262,7 @@ logical(LK),intent(in),optional :: strict_integer_type_checking
integer(IK),parameter :: default_if_not_specified = 0_IK
character(kind=CK,len=*),parameter :: routine = CK_'json_get_integer_by_path'
-# 1 "/mnt/c/Projects/VSIM/SimulationCore2/Common/json-fortran/json_get_scalar_by_path.inc" 1
+# 1 "/home/admin/SimulationCore2/Common/json-fortran/json_get_scalar_by_path.inc" 1
type(json_value),pointer :: p
if (present(default)) then
@@ -8295,7 +8295,7 @@ logical(LK),intent(in),optional :: strict_integer_type_checking
else
if ( present(found) ) found = .true.
end if
-# 8210 "/mnt/c/Projects/VSIM/SimulationCore2/Common/json-fortran/json_value_module.F90" 2
+# 8210 "/home/admin/SimulationCore2/Common/json-fortran/json_value_module.F90" 2
end subroutine json_get_integer_by_path
!*****************************************************************************************
@@ -8413,7 +8413,7 @@ logical(LK),intent(in),optional :: strict_integer_type_checking
character(kind=CK,len=*),parameter :: routine = CK_'json_get_integer_vec_by_path'
-# 1 "/mnt/c/Projects/VSIM/SimulationCore2/Common/json-fortran/json_get_vec_by_path.inc" 1
+# 1 "/home/admin/SimulationCore2/Common/json-fortran/json_get_vec_by_path.inc" 1
type(json_value),pointer :: p
if ( json%exception_thrown ) then
@@ -8441,7 +8441,7 @@ logical(LK),intent(in),optional :: strict_integer_type_checking
else
if ( present(found) ) found = .true.
end if
-# 8328 "/mnt/c/Projects/VSIM/SimulationCore2/Common/json-fortran/json_value_module.F90" 2
+# 8328 "/home/admin/SimulationCore2/Common/json-fortran/json_value_module.F90" 2
end subroutine json_get_integer_vec_by_path
!*****************************************************************************************
@@ -8573,7 +8573,7 @@ logical(LK),intent(in),optional :: strict_integer_type_checking
real(RK),parameter :: default_if_not_specified = 0.0_RK
character(kind=CK,len=*),parameter :: routine = CK_'json_get_real_by_path'
-# 1 "/mnt/c/Projects/VSIM/SimulationCore2/Common/json-fortran/json_get_scalar_by_path.inc" 1
+# 1 "/home/admin/SimulationCore2/Common/json-fortran/json_get_scalar_by_path.inc" 1
type(json_value),pointer :: p
if (present(default)) then
@@ -8606,7 +8606,7 @@ logical(LK),intent(in),optional :: strict_integer_type_checking
else
if ( present(found) ) found = .true.
end if
-# 8460 "/mnt/c/Projects/VSIM/SimulationCore2/Common/json-fortran/json_value_module.F90" 2
+# 8460 "/home/admin/SimulationCore2/Common/json-fortran/json_value_module.F90" 2
end subroutine json_get_real_by_path
!*****************************************************************************************
@@ -8709,7 +8709,7 @@ logical(LK),intent(in),optional :: strict_integer_type_checking
character(kind=CK,len=*),parameter :: routine = CK_'json_get_real_vec_by_path'
-# 1 "/mnt/c/Projects/VSIM/SimulationCore2/Common/json-fortran/json_get_vec_by_path.inc" 1
+# 1 "/home/admin/SimulationCore2/Common/json-fortran/json_get_vec_by_path.inc" 1
type(json_value),pointer :: p
if ( json%exception_thrown ) then
@@ -8737,7 +8737,7 @@ logical(LK),intent(in),optional :: strict_integer_type_checking
else
if ( present(found) ) found = .true.
end if
-# 8563 "/mnt/c/Projects/VSIM/SimulationCore2/Common/json-fortran/json_value_module.F90" 2
+# 8563 "/home/admin/SimulationCore2/Common/json-fortran/json_value_module.F90" 2
end subroutine json_get_real_vec_by_path
!*****************************************************************************************
@@ -8984,7 +8984,7 @@ logical(LK),intent(in),optional :: strict_integer_type_checking
logical(LK),parameter :: default_if_not_specified = .false.
character(kind=CK,len=*),parameter :: routine = CK_'json_get_logical_by_path'
-# 1 "/mnt/c/Projects/VSIM/SimulationCore2/Common/json-fortran/json_get_scalar_by_path.inc" 1
+# 1 "/home/admin/SimulationCore2/Common/json-fortran/json_get_scalar_by_path.inc" 1
type(json_value),pointer :: p
if (present(default)) then
@@ -9017,7 +9017,7 @@ logical(LK),intent(in),optional :: strict_integer_type_checking
else
if ( present(found) ) found = .true.
end if
-# 8935 "/mnt/c/Projects/VSIM/SimulationCore2/Common/json-fortran/json_value_module.F90" 2
+# 8935 "/home/admin/SimulationCore2/Common/json-fortran/json_value_module.F90" 2
end subroutine json_get_logical_by_path
!*****************************************************************************************
@@ -9120,7 +9120,7 @@ logical(LK),intent(in),optional :: strict_integer_type_checking
character(kind=CK,len=*),parameter :: routine = CK_'json_get_logical_vec_by_path'
-# 1 "/mnt/c/Projects/VSIM/SimulationCore2/Common/json-fortran/json_get_vec_by_path.inc" 1
+# 1 "/home/admin/SimulationCore2/Common/json-fortran/json_get_vec_by_path.inc" 1
type(json_value),pointer :: p
if ( json%exception_thrown ) then
@@ -9148,7 +9148,7 @@ logical(LK),intent(in),optional :: strict_integer_type_checking
else
if ( present(found) ) found = .true.
end if
-# 9038 "/mnt/c/Projects/VSIM/SimulationCore2/Common/json-fortran/json_value_module.F90" 2
+# 9038 "/home/admin/SimulationCore2/Common/json-fortran/json_value_module.F90" 2
end subroutine json_get_logical_vec_by_path
!*****************************************************************************************
@@ -9295,7 +9295,7 @@ logical(LK),intent(in),optional :: strict_integer_type_checking
character(kind=CK,len=*),parameter :: default_if_not_specified = CK_''
character(kind=CK,len=*),parameter :: routine = CK_'json_get_string_by_path'
-# 1 "/mnt/c/Projects/VSIM/SimulationCore2/Common/json-fortran/json_get_scalar_by_path.inc" 1
+# 1 "/home/admin/SimulationCore2/Common/json-fortran/json_get_scalar_by_path.inc" 1
type(json_value),pointer :: p
if (present(default)) then
@@ -9328,7 +9328,7 @@ logical(LK),intent(in),optional :: strict_integer_type_checking
else
if ( present(found) ) found = .true.
end if
-# 9185 "/mnt/c/Projects/VSIM/SimulationCore2/Common/json-fortran/json_value_module.F90" 2
+# 9185 "/home/admin/SimulationCore2/Common/json-fortran/json_value_module.F90" 2
end subroutine json_get_string_by_path
!*****************************************************************************************
@@ -9439,7 +9439,7 @@ logical(LK),intent(in),optional :: strict_integer_type_checking
character(kind=CK,len=*),parameter :: routine = CK_'json_get_string_vec_by_path'
-# 1 "/mnt/c/Projects/VSIM/SimulationCore2/Common/json-fortran/json_get_vec_by_path.inc" 1
+# 1 "/home/admin/SimulationCore2/Common/json-fortran/json_get_vec_by_path.inc" 1
type(json_value),pointer :: p
if ( json%exception_thrown ) then
@@ -9467,7 +9467,7 @@ logical(LK),intent(in),optional :: strict_integer_type_checking
else
if ( present(found) ) found = .true.
end if
-# 9296 "/mnt/c/Projects/VSIM/SimulationCore2/Common/json-fortran/json_value_module.F90" 2
+# 9296 "/home/admin/SimulationCore2/Common/json-fortran/json_value_module.F90" 2
end subroutine json_get_string_vec_by_path
!*****************************************************************************************
@@ -9622,7 +9622,7 @@ logical(LK),intent(in),optional :: strict_integer_type_checking
character(kind=CK,len=*),parameter :: routine = CK_'json_get_alloc_string_vec_by_path'
-# 1 "/mnt/c/Projects/VSIM/SimulationCore2/Common/json-fortran/json_get_vec_by_path_alloc.inc" 1
+# 1 "/home/admin/SimulationCore2/Common/json-fortran/json_get_vec_by_path_alloc.inc" 1
type(json_value),pointer :: p
if ( json%exception_thrown ) then
@@ -9666,7 +9666,7 @@ logical(LK),intent(in),optional :: strict_integer_type_checking
else
if ( present(found) ) found = .true.
end if
-# 9451 "/mnt/c/Projects/VSIM/SimulationCore2/Common/json-fortran/json_value_module.F90" 2
+# 9451 "/home/admin/SimulationCore2/Common/json-fortran/json_value_module.F90" 2
end subroutine json_get_alloc_string_vec_by_path
!*****************************************************************************************
diff --git a/Equipments/ChokeControl/ChokeControlMain.i90 b/Equipments/ChokeControl/ChokeControlMain.i90
index c5c379a..d32e938 100644
--- a/Equipments/ChokeControl/ChokeControlMain.i90
+++ b/Equipments/ChokeControl/ChokeControlMain.i90
@@ -1,4 +1,4 @@
-# 1 "/mnt/c/Projects/VSIM/SimulationCore2/Equipments/ChokeControl/ChokeControlMain.f90"
+# 1 "/home/admin/SimulationCore2/Equipments/ChokeControl/ChokeControlMain.f90"
module ChokeControlMain
USE CHOKEVARIABLES
use SimulationVariables !@
diff --git a/Equipments/Drawworks/Drawworks_INPUTS.i90 b/Equipments/Drawworks/Drawworks_INPUTS.i90
index 033f5a1..82bdd2a 100644
--- a/Equipments/Drawworks/Drawworks_INPUTS.i90
+++ b/Equipments/Drawworks/Drawworks_INPUTS.i90
@@ -1,4 +1,4 @@
-# 1 "/mnt/c/Projects/VSIM/SimulationCore2/Equipments/Drawworks/Drawworks_INPUTS.f90"
+# 1 "/home/admin/SimulationCore2/Equipments/Drawworks/Drawworks_INPUTS.f90"
subroutine Drawworks_Inputs
use CDrillingConsoleVariables
diff --git a/Equipments/Drawworks/Drawworks_MainSolver.i90 b/Equipments/Drawworks/Drawworks_MainSolver.i90
index a7609ce..7e01260 100644
--- a/Equipments/Drawworks/Drawworks_MainSolver.i90
+++ b/Equipments/Drawworks/Drawworks_MainSolver.i90
@@ -1,4 +1,4 @@
-# 1 "/mnt/c/Projects/VSIM/SimulationCore2/Equipments/Drawworks/Drawworks_MainSolver.f90"
+# 1 "/home/admin/SimulationCore2/Equipments/Drawworks/Drawworks_MainSolver.f90"
subroutine Drawworks_MainSolver
use SimulationVariables !@
diff --git a/Equipments/Drawworks/Drawworks_Outputs.i90 b/Equipments/Drawworks/Drawworks_Outputs.i90
index faceeff..586d559 100644
--- a/Equipments/Drawworks/Drawworks_Outputs.i90
+++ b/Equipments/Drawworks/Drawworks_Outputs.i90
@@ -1,4 +1,4 @@
-# 1 "/mnt/c/Projects/VSIM/SimulationCore2/Equipments/Drawworks/Drawworks_Outputs.f90"
+# 1 "/home/admin/SimulationCore2/Equipments/Drawworks/Drawworks_Outputs.f90"
subroutine Drawworks_Outputs
Use CSounds
diff --git a/Equipments/MudSystem/Elements_Creation.i90 b/Equipments/MudSystem/Elements_Creation.i90
index 00c07b0..0ba94de 100644
--- a/Equipments/MudSystem/Elements_Creation.i90
+++ b/Equipments/MudSystem/Elements_Creation.i90
@@ -1,4 +1,4 @@
-# 1 "/mnt/c/Projects/VSIM/SimulationCore2/Equipments/MudSystem/Elements_Creation.f90"
+# 1 "/home/admin/SimulationCore2/Equipments/MudSystem/Elements_Creation.f90"
subroutine ElementsCreation ! is called in subroutine Fluid_Flow_Solver
Use GeoElements_FluidModule
diff --git a/Equipments/MudSystem/Kick_Influx.i90 b/Equipments/MudSystem/Kick_Influx.i90
index 3e1669f..a7d24c2 100644
--- a/Equipments/MudSystem/Kick_Influx.i90
+++ b/Equipments/MudSystem/Kick_Influx.i90
@@ -1,4 +1,4 @@
-# 1 "/mnt/c/Projects/VSIM/SimulationCore2/Equipments/MudSystem/Kick_Influx.f90"
+# 1 "/home/admin/SimulationCore2/Equipments/MudSystem/Kick_Influx.f90"
subroutine Kick_Influx ! is called in subroutine CirculationCodeSelect
Use GeoElements_FluidModule
diff --git a/Equipments/MudSystem/MudSystem.i90 b/Equipments/MudSystem/MudSystem.i90
index 3de8fc2..9410ba8 100644
--- a/Equipments/MudSystem/MudSystem.i90
+++ b/Equipments/MudSystem/MudSystem.i90
@@ -1,4 +1,4 @@
-# 1 "/mnt/c/Projects/VSIM/SimulationCore2/Equipments/MudSystem/MudSystem.f90"
+# 1 "/home/admin/SimulationCore2/Equipments/MudSystem/MudSystem.f90"
module MudSystemModule
USE MudSystemVARIABLES
diff --git a/Equipments/MudSystem/MudSystemStartup.i90 b/Equipments/MudSystem/MudSystemStartup.i90
index 382ebe7..173b04e 100644
--- a/Equipments/MudSystem/MudSystemStartup.i90
+++ b/Equipments/MudSystem/MudSystemStartup.i90
@@ -1,4 +1,4 @@
-# 1 "/mnt/c/Projects/VSIM/SimulationCore2/Equipments/MudSystem/MudSystemStartup.f90"
+# 1 "/home/admin/SimulationCore2/Equipments/MudSystem/MudSystemStartup.f90"
SUBROUTINE NormalCirculation_StartUp() ! is called in module FluidFlowMain
USE MudSystemVARIABLES
diff --git a/Equipments/MudSystem/MudSystem_Variables.i90 b/Equipments/MudSystem/MudSystem_Variables.i90
index 5d0d8dd..5a75fe4 100644
--- a/Equipments/MudSystem/MudSystem_Variables.i90
+++ b/Equipments/MudSystem/MudSystem_Variables.i90
@@ -1,4 +1,4 @@
-# 1 "/mnt/c/Projects/VSIM/SimulationCore2/Equipments/MudSystem/MudSystem_Variables.f90"
+# 1 "/home/admin/SimulationCore2/Equipments/MudSystem/MudSystem_Variables.f90"
MODULE MudSystemVARIABLES
use DynamicDoubleArray, only:DynamicDoubleArrayType
diff --git a/Equipments/MudSystem/Plot_Final_Mud_Elements.f90 b/Equipments/MudSystem/Plot_Final_Mud_Elements.f90
index e916871..c61c17d 100644
--- a/Equipments/MudSystem/Plot_Final_Mud_Elements.f90
+++ b/Equipments/MudSystem/Plot_Final_Mud_Elements.f90
@@ -3,19 +3,9 @@ subroutine PlotFinalMudElements ! is called in subroutine CirculationCodeSel
Use GeoElements_FluidModule
USE CMudPropertiesVariables
USE MudSystemVARIABLES
-use SimulationVariables !@@@
use SimulationVariables
Use TD_StringConnectionData
USE CHOKEVARIABLES
-!use ConfigurationVariables !@
- !use CDataDisplayConsole
- !@ use ConfigurationVariables , StandPipePressureDataDisplay=>StandPipePressure
- !use CManifolds
- use SimulationVariables !@
- USE CHOKEVARIABLES
-!use ConfigurationVariables !@
- !use CChokeManifoldVariables
- use SimulationVariables
!use CTanks
!@use ConfigurationVariables, TripTankVolume2 => data%Equipments%DrillingWatch%TripTankVolume, TripTankDensity2 => TripTankDensity
USE sROP_Other_Variables
@@ -271,8 +261,7 @@ endif
data%State%MudSystem%icasing=0
data%State%MudSystem%BitMudDensity= data%State%MudSystem%Density_MudElement%Array(data%State%MudSystem%NoHorizontalMudElements+data%State%MudSystem%NoStringMudElements) ! (for ROP module)
- !================================================================
-
+ !================================================================
!============================ UTUBE =============================
!IF (UtubePossibility== .true. .and. Get_KellyConnection() /= KELLY_CONNECTION_STRING .and. WellHeadIsOpen) THEN
diff --git a/Equipments/MudSystem/Plot_Final_Mud_Elements.i90 b/Equipments/MudSystem/Plot_Final_Mud_Elements.i90
index 1866b0c..2f9da21 100644
--- a/Equipments/MudSystem/Plot_Final_Mud_Elements.i90
+++ b/Equipments/MudSystem/Plot_Final_Mud_Elements.i90
@@ -1,22 +1,12 @@
-# 1 "/mnt/c/Projects/VSIM/SimulationCore2/Equipments/MudSystem/Plot_Final_Mud_Elements.f90"
+# 1 "/home/admin/SimulationCore2/Equipments/MudSystem/Plot_Final_Mud_Elements.f90"
subroutine PlotFinalMudElements ! is called in subroutine CirculationCodeSelect
Use GeoElements_FluidModule
USE CMudPropertiesVariables
USE MudSystemVARIABLES
-use SimulationVariables !@@@
use SimulationVariables
Use TD_StringConnectionData
USE CHOKEVARIABLES
-!use ConfigurationVariables !@
-!use CDataDisplayConsole
-!@ use ConfigurationVariables , StandPipePressureDataDisplay=>StandPipePressure
-!use CManifolds
- use SimulationVariables !@
- USE CHOKEVARIABLES
-!use ConfigurationVariables !@
-!use CChokeManifoldVariables
- use SimulationVariables
!use CTanks
!@use ConfigurationVariables, TripTankVolume2 => data%Equipments%DrillingWatch%TripTankVolume, TripTankDensity2 => TripTankDensity
USE sROP_Other_Variables
@@ -273,7 +263,6 @@ endif
data%State%MudSystem%BitMudDensity= data%State%MudSystem%Density_MudElement%Array(data%State%MudSystem%NoHorizontalMudElements+data%State%MudSystem%NoStringMudElements) ! (for ROP module)
!================================================================
-
!============================ UTUBE =============================
!IF (UtubePossibility== .true. .and. Get_KellyConnection() /= KELLY_CONNECTION_STRING .and. WellHeadIsOpen) THEN
diff --git a/Equipments/MudSystem/Pump_and_Trip_In.i90 b/Equipments/MudSystem/Pump_and_Trip_In.i90
index 05dd885..6a36e5d 100644
--- a/Equipments/MudSystem/Pump_and_Trip_In.i90
+++ b/Equipments/MudSystem/Pump_and_Trip_In.i90
@@ -1,4 +1,4 @@
-# 1 "/mnt/c/Projects/VSIM/SimulationCore2/Equipments/MudSystem/Pump_and_Trip_In.f90"
+# 1 "/home/admin/SimulationCore2/Equipments/MudSystem/Pump_and_Trip_In.f90"
subroutine Pump_and_TripIn ! is called in subroutine CirculationCodeSelect
Use GeoElements_FluidModule
diff --git a/Equipments/MudSystem/Trip_Out_andPump.i90 b/Equipments/MudSystem/Trip_Out_andPump.i90
index cdd51e4..e13f43c 100644
--- a/Equipments/MudSystem/Trip_Out_andPump.i90
+++ b/Equipments/MudSystem/Trip_Out_andPump.i90
@@ -1,4 +1,4 @@
-# 1 "/mnt/c/Projects/VSIM/SimulationCore2/Equipments/MudSystem/Trip_Out_andPump.f90"
+# 1 "/home/admin/SimulationCore2/Equipments/MudSystem/Trip_Out_andPump.f90"
subroutine TripOut_and_Pump ! is called in subroutine CirculationCodeSelect
Use GeoElements_FluidModule
diff --git a/Equipments/Pumps/PumpsMain.i90 b/Equipments/Pumps/PumpsMain.i90
index 3c316cb..e15ba42 100644
--- a/Equipments/Pumps/PumpsMain.i90
+++ b/Equipments/Pumps/PumpsMain.i90
@@ -1,4 +1,4 @@
-# 1 "/mnt/c/Projects/VSIM/SimulationCore2/Equipments/Pumps/PumpsMain.f90"
+# 1 "/home/admin/SimulationCore2/Equipments/Pumps/PumpsMain.f90"
module PumpsMain
use SimulationVariables
implicit none
diff --git a/Equipments/Pumps/Pumps_Inputs.i90 b/Equipments/Pumps/Pumps_Inputs.i90
index 879e75c..ad03173 100644
--- a/Equipments/Pumps/Pumps_Inputs.i90
+++ b/Equipments/Pumps/Pumps_Inputs.i90
@@ -1,4 +1,4 @@
-# 1 "/mnt/c/Projects/VSIM/SimulationCore2/Equipments/Pumps/Pumps_Inputs.f90"
+# 1 "/home/admin/SimulationCore2/Equipments/Pumps/Pumps_Inputs.f90"
subroutine Pumps_Inputs
use CDrillingConsoleVariables
diff --git a/Equipments/Pumps/Pumps_Outputs.i90 b/Equipments/Pumps/Pumps_Outputs.i90
index 3cc54b5..3b9ec1d 100644
--- a/Equipments/Pumps/Pumps_Outputs.i90
+++ b/Equipments/Pumps/Pumps_Outputs.i90
@@ -1,4 +1,4 @@
-# 1 "/mnt/c/Projects/VSIM/SimulationCore2/Equipments/Pumps/Pumps_Outputs.f90"
+# 1 "/home/admin/SimulationCore2/Equipments/Pumps/Pumps_Outputs.f90"
subroutine Pumps_Outputs
use CDataDisplayConsole
diff --git a/Equipments/Pumps/Pumps_StartUp.i90 b/Equipments/Pumps/Pumps_StartUp.i90
index 7f89c9c..809e9af 100644
--- a/Equipments/Pumps/Pumps_StartUp.i90
+++ b/Equipments/Pumps/Pumps_StartUp.i90
@@ -1,4 +1,4 @@
-# 1 "/mnt/c/Projects/VSIM/SimulationCore2/Equipments/Pumps/Pumps_StartUp.f90"
+# 1 "/home/admin/SimulationCore2/Equipments/Pumps/Pumps_StartUp.f90"
subroutine Pumps_StartUp
use CPumpsVariables
use CPumps
diff --git a/Equipments/Pumps/Pumps_VARIABLES.i90 b/Equipments/Pumps/Pumps_VARIABLES.i90
index 08973a1..5d5d3d0 100644
--- a/Equipments/Pumps/Pumps_VARIABLES.i90
+++ b/Equipments/Pumps/Pumps_VARIABLES.i90
@@ -1,4 +1,4 @@
-# 1 "/mnt/c/Projects/VSIM/SimulationCore2/Equipments/Pumps/Pumps_VARIABLES.f90"
+# 1 "/home/admin/SimulationCore2/Equipments/Pumps/Pumps_VARIABLES.f90"
MODULE Pumps_VARIABLES
IMPLICIT NONE
diff --git a/Equipments/RotaryTable/RTable_INPUTS.f90 b/Equipments/RotaryTable/RTable_INPUTS.f90
deleted file mode 100644
index d0abaa5..0000000
--- a/Equipments/RotaryTable/RTable_INPUTS.f90
+++ /dev/null
@@ -1,77 +0,0 @@
-subroutine RTable_INPUTS
-
- use CDrillingConsoleVariables
- use SimulationVariables
- ! use CSimulationVariables
- use UnitySignalsModule
- ! use CTdsElevatorModesEnumVariables
- use CHoistingVariables
- use TD_DrillStemComponents
- use UnityModule
- use CWarnings
- use UnitySignalVariables
- use UnitySignalsModule
-
- IMPLICIT NONE
- integer :: i
-
-
-
- data%State%RTable%AssignmentSwitch = data%Equipments%DrillingConsole%AssignmentSwitch
- data%State%RTable%Switch = data%Equipments%DrillingConsole%RTSwitch
- !data%State%RTable%GearsAbuse = RotaryGearsAbuse
- data%State%RTable%Throttle = data%Equipments%DrillingConsole%RTThrottle ![RPM]
- data%State%RTable%String_Torque = data%State%TD_String%StringTorque*12.d0 ![lb.ft]*12 ---> [lb.in] ?????????
- !data%State%RTable%RpmGaugeMalf !:dar module haye C meghdardehi mishe
-
-
-
-
- data%State%RTable%N_new = data%State%RTable%Throttle
- if ( data%State%RTable%MotorFaileMalf==1 ) then
- data%State%RTable%N_new = 0.d0
- end if
- data%State%RTable%String_Torque = 0.112984d0*data%State%RTable%String_Torque ![N.m]
-
-
-
- !===> String_JCoef Calculation
- if ( data%Configuration%Hoisting%DriveType==0 ) then
- if ( Get_TdsConnectionModes()==TDS_CONNECTION_NOTHING .and. Get_TdsElevatorModes()==TDS_ELEVATOR_CONNECTION_NOTHING ) then
- data%State%RTable%RotaryMode = 1
- data%State%RTable%String_JCoef = 0.d0
- Do i = 1,data%State%TD_String%StringConfigurationCount
- data%State%RTable%String_JCoef = data%State%RTable%String_JCoef+( (data%State%TD_DrillStem(i)%TotalWeight*((data%State%TD_DrillStem(i)%Id**2.d0)+(data%State%TD_DrillStem(i)%Od**2.d0)))/8.d0 ) ![lb.ft^2] , Jz=(1/2)*m*(r1^2+r2^2)
- End Do
- data%State%RTable%String_JCoef = data%State%RTable%String_JCoef*0.0421401d0 ![kg.m^2]
- else if ( Get_Slips() /= SLIPS_SET_END ) then
- data%State%RTable%RotaryMode = 2
- data%State%RTable%String_JCoef = 0.d0
- data%State%RTable%String_Torque = 0.d0
- else
- data%State%RTable%RotaryMode = 3
- data%State%RTable%String_JCoef = 0.d0
- data%State%RTable%String_Torque = 0.d0
- end if
- else if ( data%Configuration%Hoisting%DriveType==1 ) then
- if ( Get_IsKellyBushingSetInTable() .or. Get_Slips() == SLIPS_SET_END ) then !if rotary connected to string
- data%State%RTable%RotaryMode = 4
- data%State%RTable%String_JCoef = 0.d0
- Do i = 1,data%State%TD_String%StringConfigurationCount
- data%State%RTable%String_JCoef = data%State%RTable%String_JCoef+( (data%State%TD_DrillStem(i)%TotalWeight*((data%State%TD_DrillStem(i)%Id**2.d0)+(data%State%TD_DrillStem(i)%Od**2.d0)))/8.d0 ) ![lb.ft^2] , Jz=(1/2)*m*(r1^2+r2^2)
- End Do
- data%State%RTable%String_JCoef = data%State%RTable%String_JCoef*0.0421401e0 ![kg.m^2]
- else
- data%State%RTable%RotaryMode = 5
- data%State%RTable%String_JCoef = 0.d0
- data%State%RTable%String_Torque = 0.d0
- end if
- end if
-
-
- !===> Transmission Mode
- data%State%RTable%Conv_Ratio = data%State%RTable%High_Conv_Ratio
-
-
-
-end subroutine RTable_INPUTS
\ No newline at end of file
diff --git a/Equipments/RotaryTable/RTable_Inputs.i90 b/Equipments/RotaryTable/RTable_Inputs.i90
index 8372744..7d97012 100644
--- a/Equipments/RotaryTable/RTable_Inputs.i90
+++ b/Equipments/RotaryTable/RTable_Inputs.i90
@@ -1,4 +1,4 @@
-# 1 "/mnt/c/Projects/VSIM/SimulationCore2/Equipments/RotaryTable/RTable_Inputs.f90"
+# 1 "/home/admin/SimulationCore2/Equipments/RotaryTable/RTable_Inputs.f90"
subroutine RTable_INPUTS
use CDrillingConsoleVariables
diff --git a/Equipments/RotaryTable/RTable_Outputs.i90 b/Equipments/RotaryTable/RTable_Outputs.i90
index 08980fe..d2a549f 100644
--- a/Equipments/RotaryTable/RTable_Outputs.i90
+++ b/Equipments/RotaryTable/RTable_Outputs.i90
@@ -1,4 +1,4 @@
-# 1 "/mnt/c/Projects/VSIM/SimulationCore2/Equipments/RotaryTable/RTable_Outputs.f90"
+# 1 "/home/admin/SimulationCore2/Equipments/RotaryTable/RTable_Outputs.f90"
subroutine RTable_Outputs
use CDrillingConsoleVariables
diff --git a/Equipments/RotaryTable/Rtable_MainSolver.f90 b/Equipments/RotaryTable/Rtable_MainSolver.f90
deleted file mode 100644
index 11267a5..0000000
--- a/Equipments/RotaryTable/Rtable_MainSolver.f90
+++ /dev/null
@@ -1,67 +0,0 @@
-subroutine RTable_MainSolver
-
-
- use SimulationVariables !@
-
- IMPLICIT NONE
-
-
- Call RTable_Inputs
-
- if (data%State%RTable%Throttle<=0.d0) then
- data%State%RTable%K_throttle = 1
- end if
-
-
- if ( (any(data%State%RTable%AssignmentSwitch==(/1,2,3,4,5,8,9,10,11/))) .and. (data%State%RTable%Switch==-1) ) then
-
- data%State%RTable%SoundBlower = .true.
- data%State%RTable%BLWR = 1
- !======================= Rotary Table Rate_limit =======================
- if (((data%State%RTable%N_new-data%State%RTable%N_old)/data%State%RTable%time_step)>data%State%RTable%RateChange) then
- data%State%RTable%N_ref = (data%State%RTable%RateChange*data%State%RTable%time_step)+data%State%RTable%N_old
- else if (((data%State%RTable%N_old-data%State%RTable%N_new)/data%State%RTable%time_step)>data%State%RTable%RateChange) then
- data%State%RTable%N_ref = (-data%State%RTable%RateChange*data%State%RTable%time_step)+data%State%RTable%N_old
- else
- data%State%RTable%N_ref = data%State%RTable%N_new
- end if
- !=======================================================================
- CALL RTable_OnModeSolver
-
- else if ( (any(data%State%RTable%AssignmentSwitch==(/1,2,3,4,5,8,9,10,11/))) .and. (data%State%RTable%Switch==1) .and. (data%State%RTable%K_throttle==1) ) then
-
- data%State%RTable%SoundBlower = .true.
- data%State%RTable%BLWR = 1
- !======================= Rotary Table Rate_limit =======================
- if (((data%State%RTable%N_new-data%State%RTable%N_old)/data%State%RTable%time_step)>data%State%RTable%RateChange) then
- data%State%RTable%N_ref = (data%State%RTable%RateChange*data%State%RTable%time_step)+data%State%RTable%N_old
- else if (((data%State%RTable%N_old-data%State%RTable%N_new)/data%State%RTable%time_step)>data%State%RTable%RateChange) then
- data%State%RTable%N_ref = (-data%State%RTable%RateChange*data%State%RTable%time_step)+data%State%RTable%N_old
- else
- data%State%RTable%N_ref = data%State%RTable%N_new
- end if
- !=======================================================================
- CALL RTable_OnModeSolver
-
- else
-
- if((any(data%State%RTable%AssignmentSwitch==(/1,2,3,4,5,8,9,10,11/))) .and. (data%State%RTable%Switch/=0)) then
- data%State%RTable%SoundBlower = .true.
- data%State%RTable%BLWR = 1
- else
- data%State%RTable%SoundBlower = .false.
- data%State%RTable%BLWR = 0
- end if
- Call RTable_OffMode
- data%State%RTable%K_throttle = 0
-
- end if
-
-
- Call RTable_Outputs
-
- data%State%RTable%N_old = data%State%RTable%N_ref
-
-
-
-end subroutine RTable_MainSolver
\ No newline at end of file
diff --git a/Equipments/TopDrive/TopDrive_INPUTS.f90 b/Equipments/TopDrive/TopDrive_INPUTS.f90
deleted file mode 100644
index 72f3665..0000000
--- a/Equipments/TopDrive/TopDrive_INPUTS.f90
+++ /dev/null
@@ -1,45 +0,0 @@
-subroutine TopDrive_Inputs
-
- ! Use CSimulationVariables
- use CTopDrivePanelVariables
- use SimulationVariables
- use UnitySignalsModule
- use SimulationVariables
- Use TD_DrillStemComponents
-
- IMPLICIT NONE
-
- integer :: i
-
-
-
- data%State%TDS%String_Torque = data%State%TD_String%StringTorque*12.d0 ![lb.ft]*12 ---> [lb.in] ?????????
- !data%State%TDS%String_Torque = 20000.
- data%State%TDS%String_Torque = 0.112984829d0*data%State%TDS%String_Torque ![N.m]
- data%State%TDS%PowerState = data%Equipments%TopDrivePanel%TopDriveTdsPowerState
- data%State%TDS%RpmKnob = data%Equipments%TopDrivePanel%RpmKnob
- !data%State%TDS%MotorFaileMalf ! jayi meghdardehi nashode ??????????????????
- data%State%TDS%RateChange = 193.d0 ![RPM/s] motaghayere voroudi ???
- data%State%TDS%DrillTorqueState = data%Equipments%TopDrivePanel%TopDriveDrillTorqueState
- data%State%TDS%TorqueLimitKnob = data%Equipments%TopDrivePanel%TopDriveTorqueLimitKnob ! bayad hazf shavad??????????????/
-
-
-
- !===> data%State%TDS%String_JCoef Calculation
- if ( (data%State%TDS%DrillTorqueState==-1) .and. ((Get_TdsConnectionModes()==TDS_CONNECTION_STRING).or.(Get_TdsConnectionModes()==TDS_CONNECTION_SPINE)) ) then !if TopDrive connected to string
- data%State%TDS%String_JCoef = 0.d0
- Do i = 1,data%State%TD_String%StringConfigurationCount
- data%State%TDS%String_JCoef = data%State%TDS%String_JCoef+( (data%State%TD_DrillStem(i)%TotalWeight*((data%State%TD_DrillStem(i)%Id**2.d0)+(data%State%TD_DrillStem(i)%Od**2.d0)))/8.d0 ) ![lb.ft^2] , Jz=(1/2)*m*(r1^2+r2^2)
- End Do
- data%State%TDS%String_JCoef = data%State%TDS%String_JCoef*0.0421401d0 ![kg.m^2]
- else
- data%State%TDS%String_JCoef = 0.d0
- data%State%TDS%String_Torque = 0.d0
- end if
- data%State%TDS%String_JCoef = data%State%TDS%String_JCoef/10.d0 !???????? /10: bi dalil, check it
-
-
-
-
-
-end subroutine
\ No newline at end of file
diff --git a/Equipments/TopDrive/TopDrive_Inputs.i90 b/Equipments/TopDrive/TopDrive_Inputs.i90
index e5f26af..d9cc57f 100644
--- a/Equipments/TopDrive/TopDrive_Inputs.i90
+++ b/Equipments/TopDrive/TopDrive_Inputs.i90
@@ -1,4 +1,4 @@
-# 1 "/mnt/c/Projects/VSIM/SimulationCore2/Equipments/TopDrive/TopDrive_Inputs.f90"
+# 1 "/home/admin/SimulationCore2/Equipments/TopDrive/TopDrive_Inputs.f90"
subroutine TopDrive_Inputs
! Use CSimulationVariables
diff --git a/FluidFlow/Flow_Startup.i90 b/FluidFlow/Flow_Startup.i90
index 6a5bdc7..f92920b 100644
--- a/FluidFlow/Flow_Startup.i90
+++ b/FluidFlow/Flow_Startup.i90
@@ -1,4 +1,4 @@
-# 1 "/mnt/c/Projects/VSIM/SimulationCore2/FluidFlow/Flow_Startup.f90"
+# 1 "/home/admin/SimulationCore2/FluidFlow/Flow_Startup.f90"
SUBROUTINE FlowStartup
USE Fluid_Flow_Startup_Vars
diff --git a/FluidFlow/FluidFlowMain.i90 b/FluidFlow/FluidFlowMain.i90
index 598ff98..631fd1b 100644
--- a/FluidFlow/FluidFlowMain.i90
+++ b/FluidFlow/FluidFlowMain.i90
@@ -1,4 +1,4 @@
-# 1 "/mnt/c/Projects/VSIM/SimulationCore2/FluidFlow/FluidFlowMain.f90"
+# 1 "/home/admin/SimulationCore2/FluidFlow/FluidFlowMain.f90"
module FluidFlowMain
implicit none
public
diff --git a/FluidFlow/Horizontal_and_String_Pressure_Distribution.i90 b/FluidFlow/Horizontal_and_String_Pressure_Distribution.i90
index fce03c8..ac0c2f7 100644
--- a/FluidFlow/Horizontal_and_String_Pressure_Distribution.i90
+++ b/FluidFlow/Horizontal_and_String_Pressure_Distribution.i90
@@ -1,4 +1,4 @@
-# 1 "/mnt/c/Projects/VSIM/SimulationCore2/FluidFlow/Horizontal_and_String_Pressure_Distribution.f90"
+# 1 "/home/admin/SimulationCore2/FluidFlow/Horizontal_and_String_Pressure_Distribution.f90"
SUBROUTINE PressureHorizAndStringDistribution
diff --git a/Makefile b/Makefile
index 066c845..b29d9ff 100644
--- a/Makefile
+++ b/Makefile
@@ -66,11 +66,12 @@ OBJ_DIR = $(TOP_DIR)/obj
# FCFLAGS = -g -J$(MOD_DIR) -fimplicit-none -Wall -cpp -ffree-line-length-256
# FCFLAGS = /module:$(MOD_DIR) /fpp
-FCFLAGS = -module $(MOD_DIR) -fpp -debug all -g -traceback -D IFORT
+FCFLAGS = -module $(MOD_DIR) -Ilib -fpp -debug all -g -traceback -D IFORT
TARGET = SimulationCore2
SRCS_F =\
+ Simulation/logging.f90 \
CSharp/OperationScenarios/Common/COperationScenariosVariables.f90 \
TorqueDrag/TD_Modules/TD_WellGeometry.f90 \
TorqueDrag/TD_Modules/TD_WellElements.f90 \
diff --git a/Redis/Redis_Interface.f90 b/Redis/Redis_Interface.f90
index 6f4aa9f..392d383 100644
--- a/Redis/Redis_Interface.f90
+++ b/Redis/Redis_Interface.f90
@@ -73,7 +73,7 @@ Module RedisInterface
character(len=4)::part
part = "out"//c_null_char
c_str = str//c_null_char
- if(logging>4) print *,"setting Data: ",len_trim(str)
+ if(log_level>4) print *,"setting Data: ",len_trim(str)
call setData_C(part,c_str)
END SUBROUTINE setData
@@ -85,7 +85,7 @@ Module RedisInterface
character(len=4)::part
part = "in"//c_null_char
c_str = str//c_null_char
- if(logging>4) print *,"setting Data: ",len_trim(str)
+ if(log_level>4) print *,"setting Data: ",len_trim(str)
call setData_C(part,c_str)
END SUBROUTINE setInput
diff --git a/Redis/Redis_Interface.i90 b/Redis/Redis_Interface.i90
index 81a27b0..32f8fae 100644
--- a/Redis/Redis_Interface.i90
+++ b/Redis/Redis_Interface.i90
@@ -1,4 +1,4 @@
-# 1 "/mnt/c/Projects/VSIM/SimulationCore2/Redis/Redis_Interface.f90"
+# 1 "/home/admin/SimulationCore2/Redis/Redis_Interface.f90"
Module RedisInterface
! use iso_c_binding, only: c_char
Interface
@@ -74,7 +74,7 @@ Module RedisInterface
character(len=4)::part
part = "out"//c_null_char
c_str = str//c_null_char
- if(logging>4) print *,"setting Data: ",len_trim(str)
+ if(log_level>4) print *,"setting Data: ",len_trim(str)
call setData_C(part,c_str)
END SUBROUTINE setData
@@ -86,7 +86,7 @@ Module RedisInterface
character(len=4)::part
part = "in"//c_null_char
c_str = str//c_null_char
- if(logging>4) print *,"setting Data: ",len_trim(str)
+ if(log_level>4) print *,"setting Data: ",len_trim(str)
call setData_C(part,c_str)
END SUBROUTINE setInput
diff --git a/Redis/redis_io.c b/Redis/redis_io.c
index c55c8d9..74fc56f 100644
--- a/Redis/redis_io.c
+++ b/Redis/redis_io.c
@@ -28,6 +28,7 @@ void initConnection(char *address, int *port,char * password,char *datakey,int *
printf("Connection Stablished to %s\n",address);
if(strlen(password)>0)
{
+ // printf("Authenticating with password %s (len={%zu})",password,strlen(password));
redisReply *reply= redisCommand(context, "AUTH %s", password);
if (reply->type == REDIS_REPLY_ERROR) {
printf("Authentication failed.\n");
diff --git a/Rop/Bit_Database.txt b/Rop/Bit_Database.txt
deleted file mode 100644
index 0820a8d..0000000
--- a/Rop/Bit_Database.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-Bit Class H1 H2 H3 (w/d)max
-11 , 1.9 , 7. , 1. , 7.
-12 , 1.9 , 7. , 1. , 7.
-13 , 1.84 , 6. , 0.8 , 8.
-14 , 1.84 , 6. , 0.8 , 8.
-21 , 1.8 , 5. , 0.6 , 8.5
-22 , 1.8 , 5. , 0.6 , 8.5
-23 , 1.76 , 4. , 0.48 , 9.
-24 , 1.76 , 4. , 0.48 , 9.
-31 , 1.7 , 3. , 0.36 , 10.
-32 , 1.65 , 2. , 0.26 , 10.
-33 , 1.6 , 2. , 0.2 , 10.
-34 , 1.6 , 2. , 0.2 , 10.
-41 , 1.5 , 2. , 0.18 , 10.
-10 , 1.5 , 1. , 0.02 , 10.
\ No newline at end of file
diff --git a/Rop/ROP_MainCalculation.i90 b/Rop/ROP_MainCalculation.i90
index 66670ea..7d9ff83 100644
--- a/Rop/ROP_MainCalculation.i90
+++ b/Rop/ROP_MainCalculation.i90
@@ -1,4 +1,4 @@
-# 1 "/mnt/c/Projects/VSIM/SimulationCore2/Rop/ROP_MainCalculation.f90"
+# 1 "/home/admin/SimulationCore2/Rop/ROP_MainCalculation.f90"
subroutine ROP_MainCalculation
use SimulationVariables
use sROP_Other_Variables
diff --git a/Simulation/SimulationVariables.f90 b/Simulation/SimulationVariables.f90
index fff4f9f..ee5ce32 100644
--- a/Simulation/SimulationVariables.f90
+++ b/Simulation/SimulationVariables.f90
@@ -1,5 +1,6 @@
module SimulationVariables
use Constants
+ use logging
use json_module
use CUnityInputs
@@ -214,7 +215,6 @@ module SimulationVariables
end type SimulationDataType
type(SimulationDataType)::data
- integer::logging=0
contains
end module SimulationVariables
\ No newline at end of file
diff --git a/Simulation/SimulationVariables.i90 b/Simulation/SimulationVariables.i90
index af88ae0..7d03ce6 100644
--- a/Simulation/SimulationVariables.i90
+++ b/Simulation/SimulationVariables.i90
@@ -1,6 +1,7 @@
-# 1 "/mnt/c/Projects/VSIM/SimulationCore2/Simulation/SimulationVariables.f90"
+# 1 "/home/admin/SimulationCore2/Simulation/SimulationVariables.f90"
module SimulationVariables
use Constants
+ use logging
use json_module
use CUnityInputs
@@ -215,7 +216,6 @@ module SimulationVariables
end type SimulationDataType
type(SimulationDataType)::data
- integer::logging=0
contains
end module SimulationVariables
diff --git a/SimulationCore2 b/SimulationCore2
old mode 100644
new mode 100755
index d99a06a..c5aeaf6
Binary files a/SimulationCore2 and b/SimulationCore2 differ
diff --git a/SimulationCore2.0 b/SimulationCore2.0
deleted file mode 100644
index 7f64c08..0000000
Binary files a/SimulationCore2.0 and /dev/null differ
diff --git a/SimulationCore2.f90 b/SimulationCore2.f90
index b1dd546..c778248 100644
--- a/SimulationCore2.f90
+++ b/SimulationCore2.f90
@@ -15,10 +15,11 @@ program SimulationCore2
use Simulator
use RedisInterface
+ use logging
!use testRedisModule
implicit none
character(len=100) :: redis_host,redis_password, sim_id, temp
- integer :: redis_port, log_level, status,stepTime
+ integer :: redis_port, status,stepTime
! Variables
! Body of SimulationCore2
@@ -38,6 +39,6 @@ program SimulationCore2
call get_command_argument(6, temp)
read(temp,*,iostat=status) stepTime
- call simulate(trim(redis_host),redis_port,trim(redis_password), trim(sim_id),log_level,stepTime)
+ call simulate(trim(redis_host),redis_port,trim(redis_password), trim(sim_id),stepTime)
end program SimulationCore2
diff --git a/SimulationCore2.i90 b/SimulationCore2.i90
index 2a18567..8fccbf1 100644
--- a/SimulationCore2.i90
+++ b/SimulationCore2.i90
@@ -1,4 +1,4 @@
-# 1 "/mnt/c/Projects/VSIM/SimulationCore2/SimulationCore2.f90"
+# 1 "/home/admin/SimulationCore2/SimulationCore2.f90"
! SimulationCore2.f90
!
! FUNCTIONS:
@@ -16,10 +16,11 @@ program SimulationCore2
use Simulator
use RedisInterface
+ use logging
!use testRedisModule
implicit none
character(len=100) :: redis_host,redis_password, sim_id, temp
- integer :: redis_port, log_level, status,stepTime
+ integer :: redis_port, status,stepTime
! Variables
! Body of SimulationCore2
@@ -39,6 +40,6 @@ program SimulationCore2
call get_command_argument(6, temp)
read(temp,*,iostat=status) stepTime
- call simulate(trim(redis_host),redis_port,trim(redis_password), trim(sim_id),log_level,stepTime)
+ call simulate(trim(redis_host),redis_port,trim(redis_password), trim(sim_id),stepTime)
end program SimulationCore2
diff --git a/SimulationCore2_DEBUG b/SimulationCore2_DEBUG
deleted file mode 100644
index 48ce417..0000000
Binary files a/SimulationCore2_DEBUG and /dev/null differ
diff --git a/Simulator.f90 b/Simulator.f90
index ca2514a..b636938 100644
--- a/Simulator.f90
+++ b/Simulator.f90
@@ -85,16 +85,15 @@ module Simulator
RETURN
END FUNCTION
- subroutine Simulate(redis_host,redis_port,redis_password, sim_id,log_level,stepTime)
+ subroutine Simulate(redis_host,redis_port,redis_password, sim_id,stepTime)
character(len=*) :: redis_host,redis_password, sim_id
- integer::t0,t1,t2,t3,t_read=0,t_write=0,t_exec=0,i,status,redis_port,log_level,stepTime
+ integer::t0,t1,t2,t3,t_read=0,t_write=0,t_exec=0,i,status,redis_port,stepTime
integer(8),dimension(12)::t,t_modules
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
do i=1,size(t_modules)
t_modules(i)=0
end do
- logging = log_level
! call initSimulation(configFilename)
call initConnection(redis_host,redis_port,redis_password, sim_id,status)
if (status<0) then
@@ -116,19 +115,21 @@ module Simulator
if(simulationStatus==PLAY_TO_DETERMINED_TIME .and. simulationStep>simulationEnd) exit
if(simulationStatus==STOP) exit
if(simulationStatus==PAUSE) then
- print *, "paused"
+ print *, "paused"
+ call sleepqq(stepTime)
go to 211
endif
- if(logging>4) print *,"end reading"
+ call logg(4,"end reading")
t1 = time_ms()
t_read = t_read+t1-t0
- if(logging>4) print *,"read completed"
+ call logg(4,"read completed")
!! Rafiee, nothing changed
call BopStack_Step()
t(1) = time_ms()
t_modules(1) = t_modules(1)+t(1)-t1
+
!! Tarmigh, now is rewritten
- call Pump1_Step()
+ call Pumps_MainSolver()
t(2) = time_ms()
t_modules(2) = t_modules(2)+t(2)-t(1)
!call Pump2_Step()
@@ -183,10 +184,10 @@ module Simulator
t(11) = time_ms()
t_modules(11) = t_modules(11)+t(11)-t(10)
- !! Sheikh
- call FluidFlow_Step()
!! Ahmadi
call OperationScenarios_Step()
+ !! Sheikh
+ call FluidFlow_Step()
!! Write variables to shared files
t2 = time_ms()
! stepTime = t2-t1
@@ -194,7 +195,7 @@ module Simulator
t_exec = t_exec+t2-t1
! call date_and_time(values=timearray)
- ! t0 = time_ms()
+ ! t0 = time_ms()
call write_variables()
t3 = time_ms()
if(t3-t0 < stepTime) then
@@ -240,8 +241,8 @@ module Simulator
! endif
! ! print *,"file read"
! call jsonfile%json_file_get_root(jsonvalue)
- ! call jsoncore%get(jsonvalue,'logging',logging)
- ! print *,"logging=",logging
+ ! call jsoncore%get(jsonvalue,'log_level',log_level)
+ ! print *,"log_level=",log_level
! end subroutine
subroutine write_variables()
@@ -249,6 +250,8 @@ module Simulator
use json_module
implicit none
type(json_value),pointer :: jsonroot
+ character(len=10)::str
+
call jsoncore%initialize()
call jsoncore%create_object(jsonroot,'')
! print *,"status=",simulationStatus
@@ -263,10 +266,11 @@ module Simulator
call EquipmentsToJson(jsonroot)
call jsoncore%print_to_string(jsonroot,redisInput)
- if(logging>4) then
- print *,"Writing to redis:",len(redisInput)
- call jsoncore%print(jsonroot,'data_out.json')
+ if(log_level>4) then
+ write(str, '(I0)') len(redisInput)
+ print *,"Writing to redis:"//trim(str)
endif
+
call setData(redisInput)
! nullify(redisContent)
! deallocate(redisContent)
@@ -287,7 +291,6 @@ module Simulator
call jsonfile%initialize()
call jsonfile%get_core(json)
- ! call jsonfile%load_file('redisContent.json'); if (jsonfile%failed()) stop
call jsonfile%deserialize(redisOutput)
call jsonfile%json_file_get_root(jsonroot)
! call json%info(jsonvalue, n_children=n_children)
@@ -301,67 +304,48 @@ module Simulator
call json%get(jsonroot,'endstep',pval)
call json%get(pval,simulationEnd)
call ConfigurationFromJson(jsonfile)
- ! nullify(jsonroot)
- ! print *,"jsonroot freed"
- ! nullify(pval)
- ! print *,"pval freed"
- ! call WarningsFromJson(jsonroot)
- ! call ProblemsFromJson(jsonvalue)
- ! call EquipmentsFromJson(jsonroot)
- ! deallocate(redisContent)
- ! call json%destroy(pval)
call jsonfile%destroy()
- print *,"jsonfile destroyed"
- ! call json%destroy(pval)
- ! call json%destroy(jsonroot)
- ! nullify(jsonroot)
end subroutine
subroutine read_variables()
type(json_value),pointer :: jsonroot,pval
type(json_file) :: jsonfile
+ type(json_core)::json
integer::stat
call getData(redisOutput)
- ! print *,len(redisOutput)," bytes read from redis"
- ! open(1,file="redisContent.json",status="REPLACE")
- ! write(1,"(A)") redisContent
- ! close(1)
- call jsoncore%initialize()
- call jsonfile%initialize(jsoncore)
+ print *,len(redisOutput)," bytes read from redis"
+ open(1,file="redisContent.json",status="REPLACE")
+ write(1,"(A)") redisOutput
+ close(1)
+ call jsonfile%initialize()
+ call jsonfile%get_core(json)
call jsonfile%deserialize(redisOutput)
call jsonfile%json_file_get_root(jsonroot)
! call json%info(jsonvalue, n_children=n_children)
! print *,"n_children =",n_children
- call jsoncore%get(jsonroot,'status',pval)
- call jsoncore%get(pval,stat)
+ call json%get(jsonroot,'status',pval)
+ call json%get(pval,stat)
if (stat==0) then
return
endif
simulationStatus = stat
- call jsoncore%get(jsonroot,'speed',pval)
- call jsoncore%get(pval,simulationSpeed)
+ call json%get(jsonroot,'speed',pval)
+ call json%get(pval,simulationSpeed)
if(simulationSpeed==0) simulationSpeed = 1
msPerStep = 100/simulationSpeed
- call jsoncore%get(jsonroot,'endstep',pval)
- call jsoncore%get(pval,simulationEnd)
+ call json%get(jsonroot,'endstep',pval)
+ call json%get(pval,simulationEnd)
print *,simulationStep,"/",simulationEnd
- ! call ConfigurationFromJson(jsonroot)
- ! call WarningsFromJson(jsonroot)
- call ProblemsFromJson(jsonfile)
+ ! call ProblemsFromJson(jsonfile)
call EquipmentsFromJson(jsonfile)
- ! deallocate(redisContent)
- ! call json%destroy(pval)
- ! call jsoncore%destroy(pval)
- ! call jsoncore%destroy(jsonroot)
- ! call jsonfile%destroy()
- ! nullify(jsonroot)
+ call jsonfile%destroy()
end subroutine
subroutine init_modules
print *,"initializing modules"
!Tarmigh
- call Pump1_Init()
+ call Pumps_StartUp()
print *,"pump1 initialized"
!call Pump2_Init()
call RotaryTable_Init()
@@ -402,18 +386,23 @@ module Simulator
type(json_value),pointer :: parent
type(json_value),pointer :: p
type(json_file)::jsonfile
-
+ integer::n_children
+ logical::is_found
! 1. get related root
- call jsonfile%json_file_get_root(parent)
- call jsoncore%get(parent,"Equipments",p)
+ ! call jsonfile%json_file_get_root(parent)
+ ! call jsoncore%get(parent,"Equipments",p)
+ call jsonfile%get("Equipments",p,is_found)
+
+ ! call jsoncore%info(p, n_children=n_children)
+ ! print *,"number of Equipments =",n_children
! 2. add member of data type to new node
call BopControlPanelFromJson(p)
call ChokeControlPanelFromJson(p)
call ChokeManifoldFromJson(p)
call DataDisplayConsoleFromJson(p)
- call DrillingConsoleFromJson(p)
+ call DrillingConsoleFromJson(jsonfile)
! call HookFromJson(p)
call StandPipeManifoldFromJson(p)
call TopDrivePanelFromJson(p)
@@ -446,37 +435,37 @@ module Simulator
call jsoncore%add(parent,p)
end subroutine
- subroutine ConfigurationToJson(parent)
- type(json_value),pointer :: parent
- type(json_value),pointer :: p
+ ! subroutine ConfigurationToJson(parent)
+ ! type(json_value),pointer :: parent
+ ! type(json_value),pointer :: p
- ! 1. create new node
- call jsoncore%create_object(p,'Configuration')
+ ! ! 1. create new node
+ ! call jsoncore%create_object(p,'Configuration')
- ! 2. add member of data type to new node
- call StringConfigurationToJson(p)
- call FormationToJson(p)
- call ReservoirToJson(p)
- call ShoeToJson(p)
- call AccumulatorToJson(p)
- call BopStackToJson(p)
- call HoistingToJson(p)
- call PowerToJson(p)
- call PumpsToJson(p)
- call RigSizeToJson(p)
- call CasingLinerChokeToJson(p)
- call PathGenerationToJson(p)
- ! call WellSurveyDataToJson(p)
- call MudPropertiesToJson(p)
- call UnityOutputsToJson(p)
- ! 3. add new node to parent
- call jsoncore%add(parent,p)
- end subroutine
+ ! ! 2. add member of data type to new node
+ ! call StringConfigurationToJson(p)
+ ! call FormationToJson(p)
+ ! call ReservoirToJson(p)
+ ! call ShoeToJson(p)
+ ! call AccumulatorToJson(p)
+ ! call BopStackToJson(p)
+ ! call HoistingToJson(p)
+ ! call PowerToJson(p)
+ ! call PumpsToJson(p)
+ ! call RigSizeToJson(p)
+ ! call CasingLinerChokeToJson(p)
+ ! call PathGenerationToJson(p)
+ ! ! call WellSurveyDataToJson(p)
+ ! call MudPropertiesToJson(p)
+ ! call UnityOutputsToJson(p)
+
+ ! ! 3. add new node to parent
+ ! call jsoncore%add(parent,p)
+ ! end subroutine
subroutine WarningsToJson(parent)
- type(json_value),pointer :: parent
-
+ type(json_value),pointer :: parent
type(json_value),pointer :: p
! 1. create new node
diff --git a/Simulator.i90 b/Simulator.i90
index 6a2788e..afc4e1d 100644
--- a/Simulator.i90
+++ b/Simulator.i90
@@ -1,4 +1,4 @@
-# 1 "/mnt/c/Projects/VSIM/SimulationCore2/Simulator.f90"
+# 1 "/home/admin/SimulationCore2/Simulator.f90"
module Simulator
use IFPORT
use RedisInterface
@@ -86,16 +86,15 @@ module Simulator
RETURN
END FUNCTION
- subroutine Simulate(redis_host,redis_port,redis_password, sim_id,log_level,stepTime)
+ subroutine Simulate(redis_host,redis_port,redis_password, sim_id,stepTime)
character(len=*) :: redis_host,redis_password, sim_id
- integer::t0,t1,t2,t3,t_read=0,t_write=0,t_exec=0,i,status,redis_port,log_level,stepTime
+ integer::t0,t1,t2,t3,t_read=0,t_write=0,t_exec=0,i,status,redis_port,stepTime
integer(8),dimension(12)::t,t_modules
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
do i=1,size(t_modules)
t_modules(i)=0
end do
- logging = log_level
! call initSimulation(configFilename)
call initConnection(redis_host,redis_port,redis_password, sim_id,status)
if (status<0) then
@@ -117,19 +116,21 @@ module Simulator
if(simulationStatus==PLAY_TO_DETERMINED_TIME .and. simulationStep>simulationEnd) exit
if(simulationStatus==STOP) exit
if(simulationStatus==PAUSE) then
- print *, "paused"
+ print *, "paused"
+ call sleepqq(stepTime)
go to 211
endif
- if(logging>4) print *,"end reading"
+ call logg(4,"end reading")
t1 = time_ms()
t_read = t_read+t1-t0
- if(logging>4) print *,"read completed"
+ call logg(4,"read completed")
!! Rafiee, nothing changed
call BopStack_Step()
t(1) = time_ms()
t_modules(1) = t_modules(1)+t(1)-t1
+
!! Tarmigh, now is rewritten
- call Pump1_Step()
+ call Pumps_MainSolver()
t(2) = time_ms()
t_modules(2) = t_modules(2)+t(2)-t(1)
!call Pump2_Step()
@@ -184,10 +185,10 @@ module Simulator
t(11) = time_ms()
t_modules(11) = t_modules(11)+t(11)-t(10)
-!! Sheikh
- call FluidFlow_Step()
!! Ahmadi
call OperationScenarios_Step()
+!! Sheikh
+ call FluidFlow_Step()
!! Write variables to shared files
t2 = time_ms()
! stepTime = t2-t1
@@ -241,8 +242,8 @@ module Simulator
! endif
! ! print *,"file read"
! call jsonfile%json_file_get_root(jsonvalue)
-! call jsoncore%get(jsonvalue,'logging',logging)
-! print *,"logging=",logging
+! call jsoncore%get(jsonvalue,'log_level',log_level)
+! print *,"log_level=",log_level
! end subroutine
subroutine write_variables()
@@ -250,6 +251,8 @@ module Simulator
use json_module
implicit none
type(json_value),pointer :: jsonroot
+ character(len=10)::str
+
call jsoncore%initialize()
call jsoncore%create_object(jsonroot,'')
! print *,"status=",simulationStatus
@@ -264,10 +267,11 @@ module Simulator
call EquipmentsToJson(jsonroot)
call jsoncore%print_to_string(jsonroot,redisInput)
- if(logging>4) then
- print *,"Writing to redis:",len(redisInput)
- call jsoncore%print(jsonroot,'data_out.json')
+ if(log_level>4) then
+ write(str, '(I0)') len(redisInput)
+ print *,"Writing to redis:"//trim(str)
endif
+
call setData(redisInput)
! nullify(redisContent)
! deallocate(redisContent)
@@ -288,7 +292,6 @@ module Simulator
call jsonfile%initialize()
call jsonfile%get_core(json)
-! call jsonfile%load_file('redisContent.json'); if (jsonfile%failed()) stop
call jsonfile%deserialize(redisOutput)
call jsonfile%json_file_get_root(jsonroot)
! call json%info(jsonvalue, n_children=n_children)
@@ -302,67 +305,48 @@ module Simulator
call json%get(jsonroot,'endstep',pval)
call json%get(pval,simulationEnd)
call ConfigurationFromJson(jsonfile)
-! nullify(jsonroot)
-! print *,"jsonroot freed"
-! nullify(pval)
-! print *,"pval freed"
-! call WarningsFromJson(jsonroot)
-! call ProblemsFromJson(jsonvalue)
-! call EquipmentsFromJson(jsonroot)
-! deallocate(redisContent)
-! call json%destroy(pval)
call jsonfile%destroy()
- print *,"jsonfile destroyed"
-! call json%destroy(pval)
-! call json%destroy(jsonroot)
-! nullify(jsonroot)
end subroutine
subroutine read_variables()
type(json_value),pointer :: jsonroot,pval
type(json_file) :: jsonfile
+ type(json_core)::json
integer::stat
call getData(redisOutput)
-! print *,len(redisOutput)," bytes read from redis"
-! open(1,file="redisContent.json",status="REPLACE")
-! write(1,"(A)") redisContent
-! close(1)
- call jsoncore%initialize()
- call jsonfile%initialize(jsoncore)
+ print *,len(redisOutput)," bytes read from redis"
+ open(1,file="redisContent.json",status="REPLACE")
+ write(1,"(A)") redisOutput
+ close(1)
+ call jsonfile%initialize()
+ call jsonfile%get_core(json)
call jsonfile%deserialize(redisOutput)
call jsonfile%json_file_get_root(jsonroot)
! call json%info(jsonvalue, n_children=n_children)
! print *,"n_children =",n_children
- call jsoncore%get(jsonroot,'status',pval)
- call jsoncore%get(pval,stat)
+ call json%get(jsonroot,'status',pval)
+ call json%get(pval,stat)
if (stat==0) then
return
endif
simulationStatus = stat
- call jsoncore%get(jsonroot,'speed',pval)
- call jsoncore%get(pval,simulationSpeed)
+ call json%get(jsonroot,'speed',pval)
+ call json%get(pval,simulationSpeed)
if(simulationSpeed==0) simulationSpeed = 1
msPerStep = 100/simulationSpeed
- call jsoncore%get(jsonroot,'endstep',pval)
- call jsoncore%get(pval,simulationEnd)
+ call json%get(jsonroot,'endstep',pval)
+ call json%get(pval,simulationEnd)
print *,simulationStep,"/",simulationEnd
-! call ConfigurationFromJson(jsonroot)
-! call WarningsFromJson(jsonroot)
- call ProblemsFromJson(jsonfile)
+! call ProblemsFromJson(jsonfile)
call EquipmentsFromJson(jsonfile)
-! deallocate(redisContent)
-! call json%destroy(pval)
-! call jsoncore%destroy(pval)
-! call jsoncore%destroy(jsonroot)
-! call jsonfile%destroy()
-! nullify(jsonroot)
+ call jsonfile%destroy()
end subroutine
subroutine init_modules
print *,"initializing modules"
!Tarmigh
- call Pump1_Init()
+ call Pumps_StartUp()
print *,"pump1 initialized"
!call Pump2_Init()
call RotaryTable_Init()
@@ -403,18 +387,23 @@ module Simulator
type(json_value),pointer :: parent
type(json_value),pointer :: p
type(json_file)::jsonfile
-
+ integer::n_children
+ logical::is_found
! 1. get related root
- call jsonfile%json_file_get_root(parent)
- call jsoncore%get(parent,"Equipments",p)
+! call jsonfile%json_file_get_root(parent)
+! call jsoncore%get(parent,"Equipments",p)
+ call jsonfile%get("Equipments",p,is_found)
+
+! call jsoncore%info(p, n_children=n_children)
+! print *,"number of Equipments =",n_children
! 2. add member of data type to new node
call BopControlPanelFromJson(p)
call ChokeControlPanelFromJson(p)
call ChokeManifoldFromJson(p)
call DataDisplayConsoleFromJson(p)
- call DrillingConsoleFromJson(p)
+ call DrillingConsoleFromJson(jsonfile)
! call HookFromJson(p)
call StandPipeManifoldFromJson(p)
call TopDrivePanelFromJson(p)
@@ -447,37 +436,37 @@ module Simulator
call jsoncore%add(parent,p)
end subroutine
- subroutine ConfigurationToJson(parent)
- type(json_value),pointer :: parent
- type(json_value),pointer :: p
+! subroutine ConfigurationToJson(parent)
+! type(json_value),pointer :: parent
+! type(json_value),pointer :: p
-! 1. create new node
- call jsoncore%create_object(p,'Configuration')
+! ! 1. create new node
+! call jsoncore%create_object(p,'Configuration')
-! 2. add member of data type to new node
- call StringConfigurationToJson(p)
- call FormationToJson(p)
- call ReservoirToJson(p)
- call ShoeToJson(p)
- call AccumulatorToJson(p)
- call BopStackToJson(p)
- call HoistingToJson(p)
- call PowerToJson(p)
- call PumpsToJson(p)
- call RigSizeToJson(p)
- call CasingLinerChokeToJson(p)
- call PathGenerationToJson(p)
-! call WellSurveyDataToJson(p)
- call MudPropertiesToJson(p)
- call UnityOutputsToJson(p)
-! 3. add new node to parent
- call jsoncore%add(parent,p)
- end subroutine
+! ! 2. add member of data type to new node
+! call StringConfigurationToJson(p)
+! call FormationToJson(p)
+! call ReservoirToJson(p)
+! call ShoeToJson(p)
+! call AccumulatorToJson(p)
+! call BopStackToJson(p)
+! call HoistingToJson(p)
+! call PowerToJson(p)
+! call PumpsToJson(p)
+! call RigSizeToJson(p)
+! call CasingLinerChokeToJson(p)
+! call PathGenerationToJson(p)
+! ! call WellSurveyDataToJson(p)
+! call MudPropertiesToJson(p)
+! call UnityOutputsToJson(p)
+
+! ! 3. add new node to parent
+! call jsoncore%add(parent,p)
+! end subroutine
subroutine WarningsToJson(parent)
- type(json_value),pointer :: parent
-
+ type(json_value),pointer :: parent
type(json_value),pointer :: p
! 1. create new node
diff --git a/Test/write_vars.i90 b/Test/write_vars.i90
index 2019a1c..80df0af 100644
--- a/Test/write_vars.i90
+++ b/Test/write_vars.i90
@@ -1,4 +1,4 @@
-# 1 "/mnt/c/Projects/VSIM/SimulationCore2/Test/write_vars.f90"
+# 1 "/home/admin/SimulationCore2/Test/write_vars.f90"
module writevarsmodule
use Simulator
use RedisInterface
diff --git a/Test_Json b/Test_Json
deleted file mode 100644
index 6134de6..0000000
Binary files a/Test_Json and /dev/null differ
diff --git a/TorqueDrag/TD_DrillingSubs/MeshGeneration_FluidModule.i90 b/TorqueDrag/TD_DrillingSubs/MeshGeneration_FluidModule.i90
index 67727fe..c27d217 100644
--- a/TorqueDrag/TD_DrillingSubs/MeshGeneration_FluidModule.i90
+++ b/TorqueDrag/TD_DrillingSubs/MeshGeneration_FluidModule.i90
@@ -1,4 +1,4 @@
-# 1 "/mnt/c/Projects/VSIM/SimulationCore2/TorqueDrag/TD_DrillingSubs/MeshGeneration_FluidModule.f90"
+# 1 "/home/admin/SimulationCore2/TorqueDrag/TD_DrillingSubs/MeshGeneration_FluidModule.f90"
subroutine MeshGeneration_FluidModule
Use TD_DrillStemComponents
diff --git a/TorqueDrag/TD_DrillingSubs/TD_DrillStemConfiguration.i90 b/TorqueDrag/TD_DrillingSubs/TD_DrillStemConfiguration.i90
index afab3e8..445f774 100644
--- a/TorqueDrag/TD_DrillingSubs/TD_DrillStemConfiguration.i90
+++ b/TorqueDrag/TD_DrillingSubs/TD_DrillStemConfiguration.i90
@@ -1,4 +1,4 @@
-# 1 "/mnt/c/Projects/VSIM/SimulationCore2/TorqueDrag/TD_DrillingSubs/TD_DrillStemConfiguration.f90"
+# 1 "/home/admin/SimulationCore2/TorqueDrag/TD_DrillingSubs/TD_DrillStemConfiguration.f90"
subroutine TD_DrillStemConfiguration
Use CStringConfigurationVariables
diff --git a/TorqueDrag/TD_DrillingSubs/TD_WellGeoConfiguration.i90 b/TorqueDrag/TD_DrillingSubs/TD_WellGeoConfiguration.i90
index 5e0e5a3..03eab4e 100644
--- a/TorqueDrag/TD_DrillingSubs/TD_WellGeoConfiguration.i90
+++ b/TorqueDrag/TD_DrillingSubs/TD_WellGeoConfiguration.i90
@@ -1,4 +1,4 @@
-# 1 "/mnt/c/Projects/VSIM/SimulationCore2/TorqueDrag/TD_DrillingSubs/TD_WellGeoConfiguration.f90"
+# 1 "/home/admin/SimulationCore2/TorqueDrag/TD_DrillingSubs/TD_WellGeoConfiguration.f90"
subroutine TD_WellGeoConfiguration
Use TD_DrillStemComponents
diff --git a/TorqueDrag/TD_Modules/TD_DrillStem.i90 b/TorqueDrag/TD_Modules/TD_DrillStem.i90
index c68bc1b..c179389 100644
--- a/TorqueDrag/TD_Modules/TD_DrillStem.i90
+++ b/TorqueDrag/TD_Modules/TD_DrillStem.i90
@@ -1,4 +1,4 @@
-# 1 "/mnt/c/Projects/VSIM/SimulationCore2/TorqueDrag/TD_Modules/TD_DrillStem.f90"
+# 1 "/home/admin/SimulationCore2/TorqueDrag/TD_Modules/TD_DrillStem.f90"
MODULE TD_DrillStemComponents
Use CDownHoleVariables
diff --git a/TorqueDrag/TD_ReadDataSubroutines/TD_WellReadData.i90 b/TorqueDrag/TD_ReadDataSubroutines/TD_WellReadData.i90
index cd08433..bcf7500 100644
--- a/TorqueDrag/TD_ReadDataSubroutines/TD_WellReadData.i90
+++ b/TorqueDrag/TD_ReadDataSubroutines/TD_WellReadData.i90
@@ -1,4 +1,4 @@
-# 1 "/mnt/c/Projects/VSIM/SimulationCore2/TorqueDrag/TD_ReadDataSubroutines/TD_WellReadData.f90"
+# 1 "/home/admin/SimulationCore2/TorqueDrag/TD_ReadDataSubroutines/TD_WellReadData.f90"
subroutine TD_WellReadData
use SimulationVariables !@
diff --git a/UpgradeLog.htm b/UpgradeLog.htm
deleted file mode 100644
index 142b170..0000000
--- a/UpgradeLog.htm
+++ /dev/null
@@ -1,273 +0,0 @@
-
-
-
- Migration Report
-
- Migration Report -
Overview
Solution and projects
SimulationCore2
| SimulationCore2.vfproj:
- The application which this project type is based on was not found. Please try this link for further information: 6989167d-11e4-40fe-8c1a-2192a86a7e90 |
Solution
\ No newline at end of file
diff --git a/a.out b/a.out
deleted file mode 100644
index cb979c4..0000000
Binary files a/a.out and /dev/null differ
diff --git a/cbopcontrolpanelvariables.mod b/cbopcontrolpanelvariables.mod
deleted file mode 100644
index fb0946f..0000000
Binary files a/cbopcontrolpanelvariables.mod and /dev/null differ
diff --git a/config-asiatech.json b/config-asiatech.json
index bcef1c3..79f62de 100644
--- a/config-asiatech.json
+++ b/config-asiatech.json
@@ -2,10 +2,9 @@
"redis":{
"address":"85.198.9.229",
"port":6379,
- "password":"1qazxsw2$$",
- "datakey":"data"
+ "password":"1qazxsw2$$"
},
- "logging":4,
+ "logging":3,
"process_name": "SimulationCore2",
"work_dir" : ".",
"step_time" : 1000
diff --git a/cstringconfigurationvariables.mod b/cstringconfigurationvariables.mod
deleted file mode 100644
index 6eb286d..0000000
Binary files a/cstringconfigurationvariables.mod and /dev/null differ
diff --git a/data-witharray.json b/data-witharray.json
deleted file mode 100644
index 47623d8..0000000
--- a/data-witharray.json
+++ /dev/null
@@ -1,249 +0,0 @@
-{
- "Configuration": {
- "StringConfiguration": {
- "StringConfigurationItems": [
- {"ComponentType":1,
- "NumberOfJoint":0,
- "LengthPerJoint":0,
- "NominalOd":0,
- "NominalId":0,
- "WeightPerLength":0,
- "ComponentLength":1.5,
- "NominalToolJointOd":0,
- "Grade":"A"
- },
- {"ComponentType":2,
- "NumberOfJoint":0,
- "LengthPerJoint":0,
- "NominalOd":0,
- "NominalId":0,
- "WeightPerLength":0,
- "ComponentLength":2.6,
- "NominalToolJointOd":0,
- "Grade":"B"
- }
- ],
- "BitDefenition": {
- "BitCodeHundreds": 0,
- "BitCodeOnes": 0,
- "BitCodeTens": 0,
- "BitLength": 0.0E+0,
- "BitNozzleNo": 0,
- "BitNozzleSize": 0.0E+0,
- "BitSize": 0.0E+0,
- "BitType": 0,
- "BitWeightPerLength": 0.0E+0,
- "FloatValve": false
- }
- },
- "Fromations": [
- {"Top":0,
- "Thickness":0,
- "Drillablity":0,
- "Abrasiveness":0,
- "ThresholdWeight":0,
- "PorePressureGradient":0
- },
- {"Top":0,
- "Thickness":0,
- "Drillablity":0,
- "Abrasiveness":0,
- "ThresholdWeight":0,
- "PorePressureGradient":0
- }
- ],
- "Reservoir": {
- "AutoMigrationRate": 0.0E+0,
- "FluidGradient": 0.0E+0,
- "FluidType": 0,
- "FluidViscosity": 0.0E+0,
- "FormationNo": 0,
- "FormationPermeability": 0.0E+0,
- "FormationTop": 0.0E+0,
- "GeothermalGradient": 0.0E+0,
- "InactiveInflux": false,
- "IsAutoMigrationRateSelected": false,
- "MakeKickSinglePacket": false,
- "PressureGradient": 0.0E+0
- },
- "Shoe": {
- "Breakdown": 0.0E+0,
- "FormationNo": 0,
- "FracturePropagation": 0.0E+0,
- "InactiveFracture": false,
- "LeakOff": 0.0E+0,
- "ShoeDepth": 0.0E+0
- },
- "Accumulator": {
- "AccumulatorMinimumOperatingPressure": 0.0E+0,
- "AccumulatorSystemSize": 0.0E+0,
- "AirPlungerPumpOutput": 0.0E+0,
- "ElectricPumpOutput": 0.0E+0,
- "NumberOfBottels": 0,
- "OilTankVolume": 0.0E+0,
- "PrechargePressure": 0.0E+0,
- "StartPressure": 0.0E+0,
- "StartPressure2": 0.0E+0,
- "StopPressure": 0.0E+0,
- "StopPressure2": 0.0E+0
- },
- "BopStack": {
- "AboveAnnularHeight": 0.1E+2,
- "AnnularPreventerClose": 0.0E+0,
- "AnnularPreventerHeight": 0.10199999999999999E+2,
- "AnnularPreventerOpen": 0.0E+0,
- "AnnularStringDrag": 0.0E+0,
- "BlindRamClose": 0.0E+0,
- "BlindRamHeight": 0.16239999999999998E+2,
- "BlindRamOpen": 0.0E+0,
- "ChokeClose": 0.0E+0,
- "ChokeLineId": 0.0E+0,
- "ChokeLineLength": 0.0E+0,
- "ChokeOpen": 0.0E+0,
- "GroundLevel": 0.3E+2,
- "KillClose": 0.15E+1,
- "KillHeight": 0.18800000000000001E+2,
- "KillOpen": 0.15E+1,
- "LowerRamClose": 0.0E+0,
- "LowerRamHeight": 0.21350000000000001E+2,
- "LowerRamOpen": 0.0E+0,
- "RamStringDrag": 0.0E+0,
- "UpperRamClose": 0.0E+0,
- "UpperRamHeight": 0.14632E+2,
- "UpperRamOpen": 0.0E+0
- },
- "Hoisting": {
- "DrillingLineBreakingLoadAbrasiveness": 0.0E+0,
- "DriveTypeAbrasiveness": 0,
- "KellyWeightAbrasiveness": 0.0E+0,
- "NumberOfLineAbrasiveness": 0,
- "TopDriveWeightAbrasiveness": 0.0E+0,
- "TravelingBlockWeightAbrasiveness": 0.0E+0
- },
- "Power": {
- "CementPump": 0.0E+0,
- "Drawworks": 0.0E+0,
- "GeneratorPowerRating": 0.0E+0,
- "MudPump1": 0.0E+0,
- "MudPump2": 0.0E+0,
- "NumberOfgenerators": 0,
- "RotaryTable": 0.0E+0,
- "TopDrive": 0.0E+0
- },
- "Pumps": {
- "MudPump1LinerDiameter": 0.0E+0,
- "MudPump1Stroke": 0.0E+0,
- "MudPump1MechanicalEfficiency": 0.0E+0,
- "MudPump1VolumetricEfficiency": 0.0E+0,
- "MudPump1Output": 0.0E+0,
- "MudPump1OutputBblStroke": 0.0E+0,
- "MudPump1Maximum": 0.0E+0,
- "MudPump1ReliefValvePressure": 0.0E+0,
- "MudPump2LinerDiameter": 0.0E+0,
- "MudPump2Stroke": 0.0E+0,
- "MudPump2MechanicalEfficiency": 0.0E+0,
- "MudPump2VolumetricEfficiency": 0.0E+0,
- "MudPump2Output": 0.0E+0,
- "MudPump2OutputBblStroke": 0.0E+0,
- "MudPump2Maximum": 0.0E+0,
- "MudPump2ReliefValvePressure": 0.0E+0,
- "CementPumpLinerDiameter": 0.0E+0,
- "CementPumpStroke": 0.0E+0,
- "CementPumpMechanicalEfficiency": 0.0E+0,
- "CementPumpVolumetricEfficiency": 0.0E+0,
- "CementPumpOutput": 0.0E+0,
- "CementPumpOutputBblStroke": 0.0E+0,
- "CementPumpMaximum": 0.0E+0,
- "CementPumpReliefValvePressure": 0.0E+0,
- "MudPump1ReliefValveIsSet": false,
- "MudPump2ReliefValveIsSet": false,
- "CementPumpReliefValveIsSet": false,
- "ManualPumpPower": false,
- "Valve1": false,
- "Valve2": false,
- "Valve3": false,
- "Valve4": false,
- "Valve5": false
- },
- "RigSize": {
- "RigType": 0,
- "CrownHeight": 0.0E+0,
- "MonkeyBoandHeight": 0.0E+0,
- "RigFloorHeight": 0.0E+0
- },
- "CasingLinerChoke": {
- "CasingDepth": 0.0E+0,
- "CasingId": 0.0E+0,
- "CasingOd": 0.0E+0,
- "CasingWeight": 0.0E+0,
- "CasingCollapsePressure": 0.0E+0,
- "CasingTensileStrength": 0.0E+0,
- "LinerTopDepth": 0.0E+0,
- "LinerLength": 0.0E+0,
- "LinerId": 0.0E+0,
- "LinerOd": 0.0E+0,
- "LinerWeight": 0.0E+0,
- "LinerCollapsePressure": 0.0E+0,
- "LinerTensileStrength": 0.0E+0,
- "OpenHoleId": 0.0E+0,
- "OpenHoleLength": 0.0E+0
- },
- "Path": {
- "Items": [
- {"HoleType":0,
- "Angle":0,
- "Length":0,
- "FinalAngle":0,
- "TotalLength":0,
- "MeasuredDepth":0,
- "TotalVerticalDepth":0
- },
- {"HoleType":0,
- "Angle":0,
- "Length":0,
- "FinalAngle":0,
- "TotalLength":0,
- "MeasuredDepth":0,
- "TotalVerticalDepth":0
- }
- ],
- "DataPoints": [
- {"X":0,
- "Y":0
- },
- {"X":0,
- "Y":0
- }
- ]
- },
- "Mud": {
- "ActiveMudType": 0,
- "ActiveRheologyModel": 0,
- "ActiveMudVolume": 0.0E+0,
- "ActiveMudVolumeGal": 0.0E+0,
- "ActiveDensity": 0.0E+0,
- "ActivePlasticViscosity": 0.0E+0,
- "ActiveYieldPoint": 0.0E+0,
- "ActiveThetaThreeHundred": 0.0E+0,
- "ActiveThetaSixHundred": 0.0E+0,
- "ReserveMudType": 0,
- "ReserveMudVolume": 0.0E+0,
- "ReserveMudVolumeGal": 0.0E+0,
- "ReserveDensity": 0.0E+0,
- "ReservePlasticViscosity": 0.0E+0,
- "ReserveYieldPoint": 0.0E+0,
- "ReserveThetaThreeHundred": 0.0E+0,
- "ReserveThetaSixHundred": 0.0E+0,
- "ActiveTotalTankCapacity": 0.0E+0,
- "ActiveTotalTankCapacityGal": 0.0E+0,
- "ActiveSettledContents": 0.0E+0,
- "ActiveSettledContentsGal": 0.0E+0,
- "ActiveTotalContents": 0.0E+0,
- "ActiveTotalContentsGal": 0.0E+0,
- "ActiveAutoDensity": false,
- "InitialTripTankMudVolume": 0.0E+0,
- "InitialTripTankMudVolumeGal": 0.0E+0,
- "PedalFlowMeter": 0.0E+0
- }
- }
-}
diff --git a/data.json b/data.json
deleted file mode 100644
index 19e1786..0000000
--- a/data.json
+++ /dev/null
@@ -1,761 +0,0 @@
-{
- "Configuration": {
- "StringConfiguration": {
- "StringConfigurationItems": [],
- "BitDefenition": {
- "BitCodeHundreds": 0,
- "BitCodeOnes": 0,
- "BitCodeTens": 0,
- "BitLength": 0.0E+0,
- "BitNozzleNo": 0,
- "BitNozzleSize": 0.0E+0,
- "BitSize": 0.0E+0,
- "BitType": 0,
- "BitWeightPerLength": 0.0E+0,
- "FloatValve": false
- }
- },
- "Formations": [],
- "Reservoir": {
- "AutoMigrationRate": 0.0E+0,
- "FluidGradient": 0.0E+0,
- "FluidType": 0,
- "FluidViscosity": 0.0E+0,
- "FormationNo": 0,
- "FormationPermeability": 0.0E+0,
- "FormationTop": 0.0E+0,
- "GeothermalGradient": 0.0E+0,
- "InactiveInflux": false,
- "IsAutoMigrationRateSelected": false,
- "MakeKickSinglePacket": false,
- "PressureGradient": 0.0E+0
- },
- "Shoe": {
- "Breakdown": 0.0E+0,
- "FormationNo": 0,
- "FracturePropagation": 0.0E+0,
- "InactiveFracture": false,
- "LeakOff": 0.0E+0,
- "ShoeDepth": 0.0E+0
- },
- "Accumulator": {
- "AccumulatorMinimumOperatingPressure": 0.0E+0,
- "AccumulatorSystemSize": 0.0E+0,
- "AirPlungerPumpOutput": 0.0E+0,
- "ElectricPumpOutput": 0.0E+0,
- "NumberOfBottels": 0,
- "OilTankVolume": 0.0E+0,
- "PrechargePressure": 0.0E+0,
- "StartPressure": 0.0E+0,
- "StartPressure2": 0.0E+0,
- "StopPressure": 0.0E+0,
- "StopPressure2": 0.0E+0
- },
- "BopStack": {
- "AboveAnnularHeight": 0.1E+2,
- "AnnularPreventerClose": 0.0E+0,
- "AnnularPreventerHeight": 0.10199999999999999E+2,
- "AnnularPreventerOpen": 0.0E+0,
- "AnnularStringDrag": 0.0E+0,
- "BlindRamClose": 0.0E+0,
- "BlindRamHeight": 0.16239999999999998E+2,
- "BlindRamOpen": 0.0E+0,
- "ChokeClose": 0.0E+0,
- "ChokeLineId": 0.0E+0,
- "ChokeLineLength": 0.0E+0,
- "ChokeOpen": 0.0E+0,
- "GroundLevel": 0.3E+2,
- "KillClose": 0.15E+1,
- "KillHeight": 0.18800000000000001E+2,
- "KillOpen": 0.15E+1,
- "LowerRamClose": 0.0E+0,
- "LowerRamHeight": 0.21350000000000001E+2,
- "LowerRamOpen": 0.0E+0,
- "RamStringDrag": 0.0E+0,
- "UpperRamClose": 0.0E+0,
- "UpperRamHeight": 0.14632E+2,
- "UpperRamOpen": 0.0E+0
- },
- "Hoisting": {
- "DrillingLineBreakingLoadAbrasiveness": 0.0E+0,
- "DriveTypeAbrasiveness": 0,
- "KellyWeightAbrasiveness": 0.0E+0,
- "NumberOfLineAbrasiveness": 0,
- "TopDriveWeightAbrasiveness": 0.0E+0,
- "TravelingBlockWeightAbrasiveness": 0.0E+0
- },
- "Power": {
- "CementPump": 0.0E+0,
- "Drawworks": 0.0E+0,
- "GeneratorPowerRating": 0.0E+0,
- "MudPump1": 0.0E+0,
- "MudPump2": 0.0E+0,
- "NumberOfgenerators": 0,
- "RotaryTable": 0.0E+0,
- "TopDrive": 0.0E+0
- },
- "Pumps": {
- "MudPump1LinerDiameter": 0.0E+0,
- "MudPump1Stroke": 0.0E+0,
- "MudPump1MechanicalEfficiency": 0.0E+0,
- "MudPump1VolumetricEfficiency": 0.0E+0,
- "MudPump1Output": 0.0E+0,
- "MudPump1OutputBblStroke": 0.0E+0,
- "MudPump1Maximum": 0.0E+0,
- "MudPump1ReliefValvePressure": 0.0E+0,
- "MudPump2LinerDiameter": 0.0E+0,
- "MudPump2Stroke": 0.0E+0,
- "MudPump2MechanicalEfficiency": 0.0E+0,
- "MudPump2VolumetricEfficiency": 0.0E+0,
- "MudPump2Output": 0.0E+0,
- "MudPump2OutputBblStroke": 0.0E+0,
- "MudPump2Maximum": 0.0E+0,
- "MudPump2ReliefValvePressure": 0.0E+0,
- "CementPumpLinerDiameter": 0.0E+0,
- "CementPumpStroke": 0.0E+0,
- "CementPumpMechanicalEfficiency": 0.0E+0,
- "CementPumpVolumetricEfficiency": 0.0E+0,
- "CementPumpOutput": 0.0E+0,
- "CementPumpOutputBblStroke": 0.0E+0,
- "CementPumpMaximum": 0.0E+0,
- "CementPumpReliefValvePressure": 0.0E+0,
- "MudPump1ReliefValveIsSet": false,
- "MudPump2ReliefValveIsSet": false,
- "CementPumpReliefValveIsSet": false,
- "ManualPumpPower": false,
- "Valve1": false,
- "Valve2": false,
- "Valve3": false,
- "Valve4": false,
- "Valve5": false
- },
- "RigSize": {
- "RigType": 0,
- "CrownHeight": 0.0E+0,
- "MonkeyBoandHeight": 0.0E+0,
- "RigFloorHeight": 0.0E+0
- },
- "CasingLinerChoke": {
- "CasingDepth": 0.0E+0,
- "CasingId": 0.0E+0,
- "CasingOd": 0.0E+0,
- "CasingWeight": 0.0E+0,
- "CasingCollapsePressure": 0.0E+0,
- "CasingTensileStrength": 0.0E+0,
- "LinerTopDepth": 0.0E+0,
- "LinerLength": 0.0E+0,
- "LinerId": 0.0E+0,
- "LinerOd": 0.0E+0,
- "LinerWeight": 0.0E+0,
- "LinerCollapsePressure": 0.0E+0,
- "LinerTensileStrength": 0.0E+0,
- "OpenHoleId": 0.0E+0,
- "OpenHoleLength": 0.0E+0
- },
- "Path": {
- "Items": [],
- "DataPoints": []
- },
- "Mud": {
- "ActiveMudType": 0,
- "ActiveRheologyModel": 0,
- "ActiveMudVolume": 0.0E+0,
- "ActiveMudVolumeGal": 0.0E+0,
- "ActiveDensity": 0.0E+0,
- "ActivePlasticViscosity": 0.0E+0,
- "ActiveYieldPoint": 0.0E+0,
- "ActiveThetaThreeHundred": 0.0E+0,
- "ActiveThetaSixHundred": 0.0E+0,
- "ReserveMudType": 0,
- "ReserveMudVolume": 0.0E+0,
- "ReserveMudVolumeGal": 0.0E+0,
- "ReserveDensity": 0.0E+0,
- "ReservePlasticViscosity": 0.0E+0,
- "ReserveYieldPoint": 0.0E+0,
- "ReserveThetaThreeHundred": 0.0E+0,
- "ReserveThetaSixHundred": 0.0E+0,
- "ActiveTotalTankCapacity": 0.0E+0,
- "ActiveTotalTankCapacityGal": 0.0E+0,
- "ActiveSettledContents": 0.0E+0,
- "ActiveSettledContentsGal": 0.0E+0,
- "ActiveTotalContents": 0.0E+0,
- "ActiveTotalContentsGal": 0.0E+0,
- "ActiveAutoDensity": false,
- "InitialTripTankMudVolume": 0.0E+0,
- "InitialTripTankMudVolumeGal": 0.0E+0,
- "PedalFlowMeter": 0.0E+0
- }
- },
- "Warnings": {
- "PumpWithKellyDisconnected": false,
- "PumpWithTopdriveDisconnected": false,
- "Pump1PopOffValveBlown": false,
- "Pump1Failure": false,
- "Pump2PopOffValveBlown": false,
- "Pump2Failure": false,
- "Pump3PopOffValveBlown": false,
- "Pump3Failure": false,
- "DrawworksGearsAbuse": false,
- "RotaryGearsAbuse": false,
- "HoistLineBreak": false,
- "PartedDrillString": false,
- "ActiveTankOverflow": false,
- "ActiveTankUnderVolume": false,
- "TripTankOverflow": false,
- "DrillPipeTwistOff": false,
- "DrillPipeParted": false,
- "TripWithSlipsSet": false,
- "Blowout": false,
- "UndergroundBlowout": false,
- "MaximumWellDepthExceeded": false,
- "CrownCollision": false,
- "FloorCollision": false,
- "TopdriveRotaryTableConfilict": false
- },
- "Problems": {
- "BitProblems": {
- "JetWashout": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "PlugJets": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "JetWashoutCount": 0,
- "PlugJetsCount": 0
- },
- "BopProblems": {
- "AnnularWash": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "AnnularFail": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "AnnularLeak": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "UpperRamWash": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "UpperRamFail": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "UpperRamLeak": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "MiddleRamWash": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "MiddleRamFail": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "MiddleRamLeak": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "LowerRamWash": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "LowerRamFail": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "LowerRamLeak": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "AccumulatorPumpFail": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "AccumulatorPumpLeak": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "AccumulatorSystemFail": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "AccumulatorSystemLeak": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- }
- },
- "ChokeProblems": {
- "HydraulicChoke1Plugged": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "HydraulicChoke1Fail": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "HydraulicChoke1Washout": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "HydraulicChoke2Plugged": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "HydraulicChoke2Fail": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "HydraulicChoke2Washout": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "ManualChoke1Plugged": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "ManualChoke1Fail": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "ManualChoke1Washout": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "ManualChoke2Plugged": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "ManualChoke2Fail": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "ManualChoke2Washout": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "ChokePanelAirFail": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- }
- },
- "DrillStemsProblems": {
- "StringDragIncrease": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "StringTorqueIncrease": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "StringTorqueFluctuation": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "StringDragIncreaseTime": 0.0E+0,
- "StringTorqueIncreaseTime": 0.0E+0
- },
- "GaugesProblems": {
- "WeightIndicator": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "RotaryRpm": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "RotaryTorque": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "StandPipePressure": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "CasingPressure": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "Pump1Strokes": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "Pump2Strokes": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "ReturnLineTemperature": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "TripTank": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "PitGainLoss": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "MudTankVolume": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "ReturnMudFlow": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "TorqueLimit": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "PowerLimit": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "AccumulatorPressure": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "ManifoldPressure": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "AnnularPressure": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "RigAirPressure": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "StandPipe1": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "StandPipe2": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "DrillPipePressure": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "ChokePosition": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "CasingPressure2": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- }
- },
- "HoistingProblems": {
- "MotorFail": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "ClutchEngage": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "ClutchDisengage": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- }
- },
- "KickProblems": {
- "Kick": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "FluidType": 0,
- "FlowRate": 0,
- "OverBalancePressure": 0,
- "IsAutoMigrationRateSelected": false,
- "AutoMigrationRate": 0.0E+0
- },
- "Configuration": {
- "LostCirculation": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "FlowRate": 0.0E+0
- },
- "MudTreatmentProblems": {
- "Degasser": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "ShaleShaker": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "Desander": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "Desilter": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- }
- },
- "OtherProblems": {
- "RigAlarm": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "RigWaterSupply": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "RigAir": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "Gen1": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "Gen2": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "Gen3": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "Gen4": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "Scr1": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "Scr2": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "Scr3": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "Scr4": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- }
- },
- "PumpProblems": {
- "Pump1PowerFail": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "Pump1BlowPopOffValve": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "Pump2PowerFail": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "Pump2BlowPopOffValve": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "CementPumpPowerFail": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "CementPumpBlowPopOffValve": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- }
- },
- "RotaryProblems": {
- "MotorFail": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "OverideTorqueLimit": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- }
- }
- }
-}
diff --git a/data_out.json b/data_out.json
deleted file mode 100644
index 9cc348d..0000000
--- a/data_out.json
+++ /dev/null
@@ -1,173 +0,0 @@
-{
- "step": 53,
- "Warnings": {
- "PumpWithKellyDisconnected": false,
- "PumpWithTopdriveDisconnected": false,
- "Pump1PopOffValveBlown": false,
- "Pump1Failure": false,
- "Pump2PopOffValveBlown": false,
- "Pump2Failure": false,
- "Pump3PopOffValveBlown": false,
- "Pump3Failure": false,
- "DrawworksGearsAbuse": false,
- "RotaryGearsAbuse": false,
- "HoistLineBreak": false,
- "PartedDrillString": false,
- "ActiveTankOverflow": true,
- "ActiveTankUnderVolume": false,
- "TripTankOverflow": false,
- "DrillPipeTwistOff": false,
- "DrillPipeParted": false,
- "TripWithSlipsSet": false,
- "Blowout": false,
- "UndergroundBlowout": true,
- "MaximumWellDepthExceeded": false,
- "CrownCollision": false,
- "FloorCollision": false,
- "TopdriveRotaryTableConfilict": false
- },
- "Equipments": {
- "BopControl": {
- "ManifoldPressureGauge": 0.15E+4,
- "AirSupplyPressureGauge": 0.12E+3,
- "AccumulatorPressureGauge": 0.3E+4,
- "AnnularPressureGauge": 0.0E+0,
- "AnnularOpenLED": 1,
- "AnnularCloseLED": 0,
- "UpperRamsOpenLED": 1,
- "UpperRamsCloseLED": 0,
- "MiddleRamsOpenLED": 1,
- "MiddleRamsCloseLED": 0,
- "KillLineOpenLED": 0,
- "KillLineCloseLED": 1,
- "ChokeLineOpenLED": 0,
- "ChokeLineCloseLED": 1,
- "LowerRamsOpenLED": 1,
- "LowerRamsCloseLED": 0,
- "AnnularStatus": 0.13625E+2,
- "UpperRamsStatus": 0.13625E+2,
- "MiddleRamsStatus": 0.13625E+2,
- "LowerRamsStatus": 0.13625E+2
- },
- "ChokeControl": {
- "StandPipePressure": 0.0E+0,
- "CasingPressure": 0.0E+0,
- "ChokePosition": 0.0E+0,
- "ChokePanelSPMCounter": 0.0E+0,
- "ChokePanelTotalStrokeCounter": 0.0E+0,
- "Choke1LED": 0,
- "Choke2LED": 1
- },
- "ChokeManifold": {
- "HydraulicChock1": 0,
- "HydraulicChock2": 0,
- "HyChock1OnProblem": false,
- "HyChock2OnProblem": false,
- "LeftManChokeOnProblem": false,
- "RightManChokeOnProblem": false
- },
- "DataDisplay": {
- "WOBPointer": 0.0E+0,
- "HookLoadPointer": 0.0E+0,
- "TripTankGauge": 0.0E+0,
- "TripTankAlarmLED": 0,
- "TripTankPumpLED": 0,
- "StandPipePressureGauge": 0.0E+0,
- "CasingPressureGauge": 0.0E+0,
- "MP1SPMGauge": 0.0E+0,
- "MP2SPMGauge": 0.0E+0,
- "ReturnLineTempGauge": 0.0E+0,
- "RotaryTorqueGauge": 0.0E+0,
- "RotaryRPMGauge": 0.0E+0,
- "AcidGasDetectionLED": 0,
- "TotalStrokeCounter": 0.0E+0,
- "PitGainLossGauge": 0.0E+0,
- "MudTanksVolumeGauge": 0.0E+0,
- "MVTAlarmLED": 0,
- "ReturnMudFlowGauge": 0.0E+0,
- "FillStrokeCounter": 0.0E+0,
- "MFFITotalStrokeCounter": 0.0E+0,
- "MFFIAlarmLED": 0,
- "MFFIPumpLED": 0,
- "TotalWellDepth": 0.1E+4,
- "BitDepth": 0.0E+0,
- "HookLoad": 0.0E+0,
- "StandPipePressure": 0.0E+0,
- "CasingPressure": 0.0E+0,
- "MP1SPM": 0.0E+0,
- "MP2SPM": 0.0E+0,
- "RTTorque": 0.0E+0,
- "RTRPM": 0.0E+0,
- "WOP": 0.0E+0,
- "ROP": 0.0E+0,
- "MudWeightIn": 0.0E+0,
- "MudWeightOut": 0.0E+0,
- "Buzzer1": false,
- "Buzzer2": false,
- "Buzzer3": false,
- "Buzzer4": false
- },
- "Drilling": {
- "ParkingBrakeLed": false,
- "GEN1LED": 0,
- "GEN2LED": 0,
- "GEN3LED": 0,
- "GEN4LED": 0,
- "SCR1LED": 0,
- "SCR2LED": 0,
- "SCR3LED": 0,
- "SCR4LED": 0,
- "MP1BLWR": 0,
- "MP2BLWR": 0,
- "DWBLWR": 0,
- "RTBLWR": 0,
- "PWRLIM": 0,
- "PWRLIMMTR": 0.0E+0,
- "RTTorqueLimitGauge": 0.0E+0,
- "AutoDWLED": 0,
- "GEN1BTNLED": 0,
- "GEN2BTNLED": 0,
- "GEN3BTNLED": 0,
- "GEN4BTNLED": 0,
- "OpenKellyCockLed": 0,
- "CloseKellyCockLed": 0,
- "OpenSafetyValveLed": 1,
- "CloseSafetyValveLed": 0,
- "IRSafetyValveLed": 1,
- "IRIBopLed": 0,
- "LatchPipeLED": 0,
- "UnlatchPipeLED": 0,
- "SwingLed": 0,
- "FillMouseHoleLed": 0
- },
- "Hook": {
- "HookHeight_S": 0.0E+0,
- "HookHeight": 0.1E+3
- },
- "StandPipeManifold": {
- "StandPipeGauge1": 0.0E+0,
- "StandPipeGauge2": 0.0E+0
- },
- "DrillingWatch": {
- "Depth": 0.1E+4,
- "BitPosition": -0.348E+1,
- "HookLoad": 0.0E+0,
- "WeightOnBit": 0.0E+0,
- "RPM": 0.0E+0,
- "ROP": 0.0E+0,
- "Torque": 0.0E+0,
- "PumpPressure": 0.0E+0,
- "SPM1": 0.0E+0,
- "SPM2": 0.0E+0,
- "CasingPressure": 0.0E+0,
- "PercentFlow": 50,
- "PitGainLose": 0.0E+0,
- "PitVolume": 0.0E+0,
- "KillMudVolume": 0.0E+0,
- "TripTankVolume": 0.0E+0,
- "MudWeightIn": 0.0E+0,
- "FillVolume": 0.0E+0,
- "MudWeightOut": 0.0E+0
- }
- }
-}
diff --git a/example_redis b/example_redis
deleted file mode 100644
index cb979c4..0000000
Binary files a/example_redis and /dev/null differ
diff --git a/example_redis.c b/example_redis.c
deleted file mode 100644
index b74238b..0000000
--- a/example_redis.c
+++ /dev/null
@@ -1,145 +0,0 @@
-#include
-#include
-#include
-#include "include/hiredis.h"
-
-#ifdef _MSC_VER
-#include /* For struct timeval */
-#endif
-
-static void example_argv_command(redisContext *c, size_t n) {
- char **argv, tmp[42];
- size_t *argvlen;
- redisReply *reply;
-
- /* We're allocating two additional elements for command and key */
- argv = malloc(sizeof(*argv) * (2 + n));
- argvlen = malloc(sizeof(*argvlen) * (2 + n));
-
- /* First the command */
- argv[0] = (char*)"RPUSH";
- argvlen[0] = sizeof("RPUSH") - 1;
-
- /* Now our key */
- argv[1] = (char*)"argvlist";
- argvlen[1] = sizeof("argvlist") - 1;
-
- /* Now add the entries we wish to add to the list */
- for (size_t i = 2; i < (n + 2); i++) {
- argvlen[i] = snprintf(tmp, sizeof(tmp), "argv-element-%zu", i - 2);
- argv[i] = strdup(tmp);
- }
-
- /* Execute the command using redisCommandArgv. We're sending the arguments with
- * two explicit arrays. One for each argument's string, and the other for its
- * length. */
- reply = redisCommandArgv(c, n + 2, (const char **)argv, (const size_t*)argvlen);
-
- if (reply == NULL || c->err) {
- fprintf(stderr, "Error: Couldn't execute redisCommandArgv\n");
- exit(1);
- }
-
- if (reply->type == REDIS_REPLY_INTEGER) {
- printf("%s reply: %lld\n", argv[0], reply->integer);
- }
-
- freeReplyObject(reply);
-
- /* Clean up */
- for (size_t i = 2; i < (n + 2); i++) {
- free(argv[i]);
- }
-
- free(argv);
- free(argvlen);
-}
-
-int main(int argc, char **argv) {
- unsigned int j, isunix = 0;
- redisContext *c;
- redisReply *reply;
- const char *hostname = (argc > 1) ? argv[1] : "127.0.0.1";
-
- if (argc > 2) {
- if (*argv[2] == 'u' || *argv[2] == 'U') {
- isunix = 1;
- /* in this case, host is the path to the unix socket */
- printf("Will connect to unix socket @%s\n", hostname);
- }
- }
-
- int port = (argc > 2) ? atoi(argv[2]) : 6379;
-
- struct timeval timeout = { 1, 500000 }; // 1.5 seconds
- if (isunix) {
- c = redisConnectUnixWithTimeout(hostname, timeout);
- } else {
- c = redisConnectWithTimeout(hostname, port, timeout);
- }
- if (c == NULL || c->err) {
- if (c) {
- printf("Connection error: %s\n", c->errstr);
- redisFree(c);
- } else {
- printf("Connection error: can't allocate redis context\n");
- }
- exit(1);
- }
-
- /* PING server */
- reply = redisCommand(c,"PING");
- printf("PING: %s\n", reply->str);
- freeReplyObject(reply);
-
- /* Set a key */
- reply = redisCommand(c,"SET %s %s", "foo", "hello world");
- printf("SET: %s\n", reply->str);
- freeReplyObject(reply);
-
- /* Set a key using binary safe API */
- reply = redisCommand(c,"SET %b %b", "bar", (size_t) 3, "hello", (size_t) 5);
- printf("SET (binary API): %s\n", reply->str);
- freeReplyObject(reply);
-
- /* Try a GET and two INCR */
- reply = redisCommand(c,"GET foo");
- printf("GET foo: %s\n", reply->str);
- freeReplyObject(reply);
-
- reply = redisCommand(c,"INCR counter");
- printf("INCR counter: %lld\n", reply->integer);
- freeReplyObject(reply);
- /* again ... */
- reply = redisCommand(c,"INCR counter");
- printf("INCR counter: %lld\n", reply->integer);
- freeReplyObject(reply);
-
- /* Create a list of numbers, from 0 to 9 */
- reply = redisCommand(c,"DEL mylist");
- freeReplyObject(reply);
- for (j = 0; j < 10; j++) {
- char buf[64];
-
- snprintf(buf,64,"%u",j);
- reply = redisCommand(c,"LPUSH mylist element-%s", buf);
- freeReplyObject(reply);
- }
-
- /* Let's check what we have inside the list */
- reply = redisCommand(c,"LRANGE mylist 0 -1");
- if (reply->type == REDIS_REPLY_ARRAY) {
- for (j = 0; j < reply->elements; j++) {
- printf("%u) %s\n", j, reply->element[j]->str);
- }
- }
- freeReplyObject(reply);
-
- /* See function for an example of redisCommandArgv */
- example_argv_command(c, 10);
-
- /* Disconnects and frees the context */
- redisFree(c);
-
- return 0;
-}
diff --git a/hier.txt b/hier.txt
deleted file mode 100644
index 06d597e..0000000
--- a/hier.txt
+++ /dev/null
@@ -1,101 +0,0 @@
-type::SimulationDataType
- type(SimulationStateType)::State
- Type(HoistingType)::Hoisting
- type(OperationScenarioType)::OperationScenario
- type(NotificationType)::notifications
- type(PermissionsType):: permissions
- type(UnitySignalsType):: unitySignals
- type(StudentStationType)::StudentStation
- type(BopStackInputType)::BopStackInput
- type(BopStackAccType)::BopStackAcc
- type(RamLineType)::RamLine
- type(AnnularComputationalType)::AnnularComputational
- type(AnnularType)::Annular
- type(PipeRams1Type)::PipeRam1
- type(ShearRamType)::ShearRam
- type(PipeRam2Type)::PipeRam2
- type(ChokeLineType)::ChokeLine
- type(KillLineType)::KillLine
- type(PumpsType)::Pumps
- TYPE(BOP_TypeVars), DIMENSION(1:6) :: RAM
- TYPE(BOP_TypeVars2D) :: RAMS
- type(ChokeType)::Choke
- type(AirDrivenPumpType)::AirDrivenPump
- type(AirPumpLineType)::AirPumpLine
- TYPE(CHOKE_TypeVars), DIMENSION(1:2) :: CHOOKE
- TYPE(Drawworks_Var) :: Drawworks
- type(MudSystemType)::MudSystem
- TYPE(MUD_TypeVars), DIMENSION(1:10) :: MUD
- TYPE(Pump_Var), DIMENSION(1:3) :: PUMP
- TYPE(RTable_Var) :: RTable
- TYPE(TDS_Var) :: TDS
- TYPE(GasData) :: GasType(3)
- TYPE(PressureDisplayVARIABLESTYPE) :: PressureDisplay
- TYPE(ObservationAndGaugePointsInformations) , ALLOCATABLE :: ObservationPoint(:)
- TYPE(FricPressDropVarsTYPE) :: FricPressDrop
- TYPE(ROPSpecificationInfo) :: ROP_Spec
- TYPE(ROPInfo) :: ROP_Bit
- TYPE(Geo_Data) :: TDGeo
- TYPE(F_StringData) , Allocatable :: F_String(:)
- TYPE(F_IntervalsCountsData):: F_Counts
- TYPE(F_IntervalData) , Allocatable :: F_Interval(:)
- TYPE(OD_AnnulusData) :: OD_Annulus(4)
- TYPE(TD_DrillStemInfo), ALLOCATABLE, DIMENSION(:) :: TD_DrillStem
- TYPE(TD_SeparatedDrillStemInfo), ALLOCATABLE, DIMENSION(:) :: TD_DrillStems
- TYPE(TD_StringInfo) :: TD_String
- TYPE(TD_AddRemoveInfo) :: TD_Count
- TYPE(CStringComponents), ALLOCATABLE, DIMENSION(:) :: G_StringElement
- TYPE(TD_RemovedVolumeInfo) :: TD_Vol
- TYPE(TD_GeneralInfo) :: TD_General
- TYPE(TD_BOPInfo) :: TD_BOP
- TYPE(CBopElement) :: TD_BOPElement(4)
- TYPE(TD_StringconnectionInfo) :: TD_StConn
- TYPE(TD_LoadInfo) :: TD_Load
- TYPE(TD_WellElementsInfo) :: TD_WellEl
- TYPE(TD_CasingInfo), ALLOCATABLE, DIMENSION(:) :: TD_Casing
- TYPE(TD_LinerInfo), ALLOCATABLE, DIMENSION(:) :: data%State%TD_Liner
- TYPE(TD_OpenHoleInfo), ALLOCATABLE, DIMENSION(:) :: TD_OpenHole
- TYPE(TD_ROPHoleInfo), ALLOCATABLE, DIMENSION(:) :: TD_ROPHole
- TYPE(TD_WellGeneralInfo) :: TD_WellGeneral
- TYPE(TD_WellGeometryData), Allocatable :: TD_WellGeo(:)
- type(EquipmentControlType)::EquipmentControl
- type(BopControlPanelType) :: BopControlPanel
- Type(ChokeControlPanelType)::ChokeControlPanel
- Type(ChokeManifoldType)::ChokeManifold
- Type(DataDisplayConsoleType) :: DataDisplayConsole
- TYPE(DrillingConsoleType) :: DrillingConsole
- Type(HookType)::Hook
- type(StandPipeManifoldType)::StandPipeManifold
- Type(TopDrivePanelType)::TopDrivePanel
- Type(DrillingWatchType)::DrillingWatch
- Type(TankType)::Tank
- type(ConfigurationType)::Configuration
- Type(StringConfigurationType)::StringConfiguration
- Type(FormationType) :: Formation
- Type(ReservoirType)::Reservoir
- Type(ShoeType)::Shoe
- Type(AccumulatorType)::Accumulator
- Type(BopStackSpecificationType)::BopStackSpecification
- Type(HoistingType)::Hoisting
- Type(PowerType)::Power
- Type(PumpSpecificationType)::PumpsSpecification
- Type(RigSizeType)::RigSize
- Type(CasingLinerChokeType)::CasingLinerChoke
- Type(PathGenerationType)::PathGeneration
- Type(WellSurveyDataType)::WellSurveyData
- Type(MudPropertiesType)::MudProperties
- type(ProblemsType)::problems
- type(BitProblemsType)::BitProblems
- type(BopProblemsType)::BopProblems
- type(ChokeProblemsType)::ChokeProblems
- type(DrillStemProblemsType)::DrillStemProblems
- type(GaugesProblemsType)::GaugesProblems
- type(HoistingProblemsType):: HoistingProblems
- type(KickProblemsType)::KickProblems
- type(LostProblemsType)::LostProblems
- type(MudTreatmentProblemsType)::MudTreatmentProblems
- type(OtherProblemsType)::OtherProblems
- type(PumpProblemsType)::PumpProblems
- type(RotaryProblemsType)::RotaryProblems
- end type SimulationDataType
-
diff --git a/redisContent.json b/redisContent.json
index 8b42430..3cd533e 100644
--- a/redisContent.json
+++ b/redisContent.json
@@ -1 +1 @@
-{"status":0,"speed":0,"endstep":0,"Configuration":{"StringConfiguration":{"StringConfigurationItems":[],"BitDefenition":{"BitCodeHundreds":0,"BitCodeOnes":0,"BitCodeTens":0,"BitLength":0.0,"BitNozzleNo":0,"BitNozzleSize":0.0,"BitSize":0.0,"BitType":0,"BitWeightPerLength":0.0,"FloatValve":false}},"Formations":[],"Reservoir":{"AutoMigrationRate":0.0,"FluidGradient":0.0,"FluidType":0,"FluidViscosity":0.0,"FormationNo":0,"FormationPermeability":0.0,"FormationTop":0.0,"GeothermalGradient":0.0,"InactiveInflux":false,"IsAutoMigrationRateSelected":false,"MakeKickSinglePacket":false,"PressureGradient":0.0},"Shoe":{"Breakdown":0.0,"FormationNo":0,"FracturePropagation":0.0,"InactiveFracture":false,"LeakOff":0.0,"ShoeDepth":0.0},"Accumulator":{"AccumulatorMinimumOperatingPressure":0.0,"AccumulatorSystemSize":0.0,"AirPlungerPumpOutput":0.0,"ElectricPumpOutput":0.0,"NumberOfBottels":0,"OilTankVolume":0.0,"PrechargePressure":0.0,"StartPressure":0.0,"StartPressure2":0.0,"StopPressure":0.0,"StopPressure2":0.0},"BopStack":{"AboveAnnularHeight":0.0,"AnnularPreventerClose":0.0,"AnnularPreventerHeight":0.0,"AnnularPreventerOpen":0.0,"AnnularStringDrag":0.0,"BlindRamClose":0.0,"BlindRamHeight":0.0,"BlindRamOpen":0.0,"ChokeClose":0.0,"ChokeLineId":0.0,"ChokeLineLength":0.0,"ChokeOpen":0.0,"GroundLevel":0.0,"KillClose":0.0,"KillHeight":0.0,"KillOpen":0.0,"LowerRamClose":0.0,"LowerRamHeight":0.0,"LowerRamOpen":0.0,"RamStringDrag":0.0,"UpperRamClose":0.0,"UpperRamHeight":0.0,"UpperRamOpen":0.0},"Hoisting":{"DrillingLineBreakingLoad":0.0,"DriveType":0,"KellyWeight":0.0,"NumberOfLine":0,"TopDriveWeight":0.0,"TravelingBlockWeight":0.0},"Power":{"CementPump":0.0,"Drawworks":0.0,"GeneratorPowerRating":0.0,"MudPump1":0.0,"MudPump2":0.0,"NumberOfgenerators":0,"RotaryTable":0.0,"TopDrive":0.0},"Pumps":{"MudPump1LinerDiameter":0.0,"MudPump1Stroke":0.0,"MudPump1MechanicalEfficiency":0.0,"MudPump1VolumetricEfficiency":0.0,"MudPump1Output":0.0,"MudPump1OutputBblStroke":0.0,"MudPump1Maximum":0.0,"MudPump1ReliefValvePressure":0.0,"MudPump2LinerDiameter":0.0,"MudPump2Stroke":0.0,"MudPump2MechanicalEfficiency":0.0,"MudPump2VolumetricEfficiency":0.0,"MudPump2Output":0.0,"MudPump2OutputBblStroke":0.0,"MudPump2Maximum":0.0,"MudPump2ReliefValvePressure":0.0,"CementPumpLinerDiameter":0.0,"CementPumpStroke":0.0,"CementPumpMechanicalEfficiency":0.0,"CementPumpVolumetricEfficiency":0.0,"CementPumpOutput":0.0,"CementPumpOutputBblStroke":0.0,"CementPumpMaximum":0.0,"CementPumpReliefValvePressure":0.0,"MudPump1ReliefValveIsSet":false,"MudPump2ReliefValveIsSet":false,"CementPumpReliefValveIsSet":false,"ManualPumpPower":false,"Valve1":false,"Valve2":false,"Valve3":false,"Valve4":false,"Valve5":false},"RigSize":{"RigType":0,"CrownHeight":0.0,"MonkeyBoandHeight":0.0,"RigFloorHeight":0.0},"CasingLinerChoke":{"CasingDepth":0.0,"CasingId":0.0,"CasingOd":0.0,"CasingWeight":0.0,"CasingCollapsePressure":0.0,"CasingTensileStrength":0.0,"LinerTopDepth":0.0,"LinerLength":0.0,"LinerId":0.0,"LinerOd":0.0,"LinerWeight":0.0,"LinerCollapsePressure":0.0,"LinerTensileStrength":0.0,"OpenHoleId":0.0,"OpenHoleLength":0.0},"Path":{"Items":[]},"Mud":{"ActiveMudType":0,"ActiveRheologyModel":0,"ActiveMudVolume":0.0,"ActiveMudVolumeGal":0.0,"ActiveDensity":0.0,"ActivePlasticViscosity":0.0,"ActiveYieldPoint":0.0,"ActiveThetaThreeHundred":0.0,"ActiveThetaSixHundred":0.0,"ReserveMudType":0,"ReserveMudVolume":0.0,"ReserveMudVolumeGal":0.0,"ReserveDensity":0.0,"ReservePlasticViscosity":0.0,"ReserveYieldPoint":0.0,"ReserveThetaThreeHundred":0.0,"ReserveThetaSixHundred":0.0,"ActiveTotalTankCapacity":0.0,"ActiveTotalTankCapacityGal":0.0,"ActiveSettledContents":0.0,"ActiveSettledContentsGal":0.0,"ActiveTotalContents":0.0,"ActiveTotalContentsGal":0.0,"ActiveAutoDensity":false,"InitialTripTankMudVolume":0.0,"InitialTripTankMudVolumeGal":0.0,"PedalFlowMeter":0.0}},"Problems":{"BitProblems":{"JetWashout":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"PlugJets":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"JetWashoutCount":0,"PlugJetsCount":0},"BopProblems":{"AnnularWash":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"AnnularFail":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"AnnularLeak":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"UpperRamWash":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"UpperRamFail":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"UpperRamLeak":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"MiddleRamWash":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"MiddleRamFail":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"MiddleRamLeak":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"LowerRamWash":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"LowerRamFail":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"LowerRamLeak":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"AccumulatorPumpFail":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"AccumulatorPumpLeak":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"AccumulatorSystemFail":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"AccumulatorSystemLeak":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0}},"ChokeProblems":{"HydraulicChoke1Plugged":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"HydraulicChoke1Fail":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"HydraulicChoke1Washout":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"HydraulicChoke2Plugged":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"HydraulicChoke2Fail":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"HydraulicChoke2Washout":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"ManualChoke1Plugged":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"ManualChoke1Fail":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"ManualChoke1Washout":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"ManualChoke2Plugged":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"ManualChoke2Fail":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"ManualChoke2Washout":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"ChokePanelAirFail":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"ManualChoke1PluggedPercent":0,"HydraulicChoke2PluggedPercent":0,"HydraulicChoke1PluggedPercent":0,"ManualChoke2PluggedPercent":0},"DrillStemsProblems":{"StringDragIncrease":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"StringTorqueIncrease":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"StringTorqueFluctuation":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"StringDragIncreaseTime":0.0,"StringTorqueIncreaseTime":0.0},"GaugesProblems":{"WeightIndicator":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"RotaryRpm":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"RotaryTorque":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"StandPipePressure":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"CasingPressure":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"Pump1Strokes":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"Pump2Strokes":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"ReturnLineTemperature":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"TripTank":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"PitGainLoss":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"MudTankVolume":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"ReturnMudFlow":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"TorqueLimit":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"PowerLimit":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"AccumulatorPressure":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"ManifoldPressure":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"AnnularPressure":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"RigAirPressure":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"StandPipe1":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"StandPipe2":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"DrillPipePressure":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"ChokePosition":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"CasingPressure2":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0}},"HoistingProblems":{"MotorFail":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"ClutchEngage":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"ClutchDisengage":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0}},"KickProblems":{"Kick":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"FluidType":0,"FlowRate":0,"OverBalancePressure":0,"IsAutoMigrationRateSelected":false,"AutoMigrationRate":0.0},"LostProblems":{"LostCirculation":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"FlowRate":0.0},"MudTreatmentProblems":{"Degasser":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"ShaleShaker":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"Desander":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"Desilter":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0}},"OtherProblems":{"RigAlarm":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"RigWaterSupply":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"RigAir":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"Gen1":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"Gen2":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"Gen3":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"Gen4":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"Scr1":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"Scr2":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"Scr3":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"Scr4":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0}},"PumpProblems":{"Pump1PowerFail":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"Pump1BlowPopOffValve":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"Pump2PowerFail":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"Pump2BlowPopOffValve":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"CementPumpPowerFail":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"CementPumpBlowPopOffValve":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0}},"RotaryProblems":{"MotorFail":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"OverideTorqueLimit":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0}}},"Equipments":{"BopControl":{"ManifoldPressureGauge":0.0,"AirSupplyPressureGauge":0.0,"AccumulatorPressureGauge":0.0,"AnnularPressureGauge":0.0,"AnnularOpenLED":0,"AnnularCloseLED":0,"UpperRamsOpenLED":0,"UpperRamsCloseLED":0,"MiddleRamsOpenLED":0,"MiddleRamsCloseLED":0,"KillLineOpenLED":0,"KillLineCloseLED":0,"ChokeLineOpenLED":0,"ChokeLineCloseLED":0,"LowerRamsOpenLED":0,"LowerRamsCloseLED":0,"AnnularStatus":0.0,"UpperRamsStatus":0.0,"MiddleRamsStatus":0.0,"LowerRamsStatus":0.0},"ChokeControl":{"StandPipePressure":0.0,"CasingPressure":0.0,"ChokePosition":0.0,"ChokePanelSPMCounter":0.0,"ChokePanelTotalStrokeCounter":0.0,"Choke1LED":0,"Choke2LED":0,"ChokePanelRigAirSwitch":false,"ChokePanelStrokeResetSwitch":false,"ChokeControlLever":0.0},"ChokeManifold":{"HydraulicChock1":0,"HydraulicChock2":0,"HyChock1OnProblem":false,"HyChock2OnProblem":false,"LeftManChokeOnProblem":false,"RightManChokeOnProblem":false,"ChokeManifoldValve1":false,"ChokeManifoldValve2":false,"ChokeManifoldValve3":false,"ChokeManifoldValve4":false,"ChokeManifoldValve5":false,"ChokeManifoldValve6":false,"ChokeManifoldValve7":false,"ChokeManifoldValve8":false,"ChokeManifoldValve9":false,"ChokeManifoldValve10":false,"ChokeManifoldValve11":false,"ChokeManifoldValve12":false,"ChokeManifoldValve13":false,"LeftManualChoke":0.0,"RightManualChoke":0.0},"DataDisplay":{"WOBPointer":0.0,"HookLoadPointer":0.0,"TripTankGauge":0.0,"TripTankAlarmLED":0,"TripTankPumpLED":0,"StandPipePressureGauge":0.0,"CasingPressureGauge":0.0,"MP1SPMGauge":0.0,"MP2SPMGauge":0.0,"ReturnLineTempGauge":0.0,"RotaryTorqueGauge":0.0,"RotaryRPMGauge":0.0,"AcidGasDetectionLED":0,"TotalStrokeCounter":0.0,"PitGainLossGauge":0.0,"MudTanksVolumeGauge":0.0,"MVTAlarmLED":0,"ReturnMudFlowGauge":0.0,"FillStrokeCounter":0.0,"MFFITotalStrokeCounter":0.0,"MFFIAlarmLED":0,"MFFIPumpLED":0,"TotalWellDepth":0.0,"BitDepth":0.0,"HookLoad":0.0,"StandPipePressure":0.0,"CasingPressure":0.0,"MP1SPM":0.0,"MP2SPM":0.0,"RTTorque":0.0,"RTRPM":0.0,"WOP":0.0,"ROP":0.0,"MudWeightIn":0.0,"MudWeightOut":0.0,"Buzzer1":false,"Buzzer2":false,"Buzzer3":false,"Buzzer4":false},"Drilling":{"ParkingBrakeLed":false,"GEN1LED":0,"GEN2LED":0,"GEN3LED":0,"GEN4LED":0,"SCR1LED":0,"SCR2LED":0,"SCR3LED":0,"SCR4LED":0,"MP1BLWR":0,"MP2BLWR":0,"DWBLWR":0,"RTBLWR":0,"PWRLIM":0,"PWRLIMMTR":0.0,"RTTorqueLimitGauge":0.0,"AutoDWLED":0,"GEN1BTNLED":0,"GEN2BTNLED":0,"GEN3BTNLED":0,"GEN4BTNLED":0,"OpenKellyCockLed":0,"CloseKellyCockLed":0,"OpenSafetyValveLed":0,"CloseSafetyValveLed":0,"IRSafetyValveLed":0,"IRIBopLed":0,"LatchPipeLED":0,"UnlatchPipeLED":0,"SwingLed":0,"FillMouseHoleLed":0},"Hook":{"HookHeight_S":0.0,"HookHeight":0.0},"StandPipeManifold":{"StandPipeGauge1":0.0,"StandPipeGauge2":0.0,"StandPipeManifoldValve1":false,"StandPipeManifoldValve2":false,"StandPipeManifoldValve3":false,"StandPipeManifoldValve4":false,"StandPipeManifoldValve5":false,"StandPipeManifoldValve6":false,"StandPipeManifoldValve7":false,"StandPipeManifoldValve8":false,"StandPipeManifoldValve9":false,"StandPipeManifoldValve10":false,"StandPipeManifoldValve11":false,"StandPipeManifoldValve12":false,"StandPipeManifoldValve13":false,"StandPipeManifoldValve14":false,"StandPipeManifoldValve15":false},"DrillingWatch":{"Depth":0.0,"BitPosition":0.0,"HookLoad":0.0,"WeightOnBit":0.0,"RPM":0.0,"ROP":0.0,"Torque":0.0,"PumpPressure":0.0,"SPM1":0.0,"SPM2":0.0,"CasingPressure":0.0,"PercentFlow":0.0,"PitGainLose":0.0,"PitVolume":0.0,"KillMudVolume":0.0,"TripTankVolume":0.0,"MudWeightIn":0.0,"FillVolume":0.0,"MudWeightOut":0.0}}}
+{"status":1,"speed":0,"endstep":0,"Configuration":{"StringConfiguration":{"StringConfigurationItems":[{"ComponentLength":1.0,"ComponentType":0,"Grade":null,"LengthPerJoint":1.0,"NominalId":203.0,"NominalOd":0.0,"NominalToolJointOd":0.0,"NumberOfJoint":1.0,"WeightPerLength":74.41},{"ComponentLength":600.0,"ComponentType":2,"Grade":null,"LengthPerJoint":30.0,"NominalId":203.0,"NominalOd":0.0,"NominalToolJointOd":0.0,"NumberOfJoint":20.0,"WeightPerLength":74.41},{"ComponentLength":600.0,"ComponentType":3,"Grade":null,"LengthPerJoint":30.0,"NominalId":228.0,"NominalOd":0.0,"NominalToolJointOd":0.0,"NumberOfJoint":20.0,"WeightPerLength":74.41}],"BitDefenition":{"BitCodeHundreds":1,"BitCodeOnes":3,"BitCodeTens":2,"BitLength":1.0,"BitNozzleNo":3,"BitNozzleSize":355.6,"BitSize":215.9,"BitType":0,"BitWeightPerLength":74.41,"FloatValve":true}},"Formations":[{"Abrasiveness":80.0,"Drillablity":5.0,"PorePressureGradient":10.43,"Thickness":990.0,"ThresholdWeight":0.5,"Top":10.0},{"Abrasiveness":85.0,"Drillablity":30.0,"PorePressureGradient":11.31,"Thickness":600.0,"ThresholdWeight":0.7,"Top":1000.0},{"Abrasiveness":85.0,"Drillablity":30.0,"PorePressureGradient":12.44,"Thickness":1.0,"ThresholdWeight":0.8,"Top":1600.0},{"Abrasiveness":90.0,"Drillablity":15.0,"PorePressureGradient":14.7,"Thickness":200.0,"ThresholdWeight":0.8,"Top":1601.0}],"Reservoir":{"AutoMigrationRate":100.0,"FluidGradient":0.0,"FluidType":0,"FluidViscosity":0.0,"FormationNo":3,"FormationPermeability":500.0,"FormationTop":1601.0,"GeothermalGradient":0.0,"InactiveInflux":false,"IsAutoMigrationRateSelected":false,"MakeKickSinglePacket":false,"PressureGradient":14.7},"Shoe":{"Breakdown":6.21,"FormationNo":0,"FracturePropagation":5.86,"InactiveFracture":false,"LeakOff":6.21,"ShoeDepth":5200.0},"Accumulator":{"AccumulatorMinimumOperatingPressure":8273.0,"AccumulatorSystemSize":1.0,"AirPlungerPumpOutput":1.0,"ElectricPumpOutput":0.0,"NumberOfBottels":20,"OilTankVolume":1.0,"PrechargePressure":6901.0,"StartPressure":19305.0,"StartPressure2":17926.0,"StopPressure":20684.0,"StopPressure2":20070.0},"BopStack":{"AboveAnnularHeight":10.0,"AnnularPreventerClose":2.86,"AnnularPreventerHeight":10.0,"AnnularPreventerOpen":2.25,"AnnularStringDrag":100.0,"BlindRamClose":0.92,"BlindRamHeight":16.24,"BlindRamOpen":0.87,"ChokeClose":0.24,"ChokeLineId":2800.0,"ChokeLineLength":12.0,"ChokeOpen":0.24,"GroundLevel":30.0,"KillClose":0.24,"KillHeight":18.8,"KillOpen":0.24,"LowerRamClose":0.59,"LowerRamHeight":21.35,"LowerRamOpen":0.56,"RamStringDrag":102800.6484375,"UpperRamClose":0.59,"UpperRamHeight":14.632,"UpperRamOpen":0.56},"Hoisting":{"DrillingLineBreakingLoad":0.0,"DriveType":0,"KellyWeight":0.0,"NumberOfLine":0,"TopDriveWeight":0.0,"TravelingBlockWeight":0.0},"Power":{"CementPump":298.0,"Drawworks":604.0,"GeneratorPowerRating":1200.0,"MudPump1":1194.0,"MudPump2":1194.0,"NumberOfgenerators":4,"RotaryTable":604.0,"TopDrive":775.0},"Pumps":{"MudPump1LinerDiameter":6.4,"MudPump1Stroke":120.0,"MudPump1MechanicalEfficiency":0.9,"MudPump1VolumetricEfficiency":6.4,"MudPump1Output":0.12,"MudPump1OutputBblStroke":0.0,"MudPump1Maximum":120.0,"MudPump1ReliefValvePressure":0.9,"MudPump2LinerDiameter":6.4,"MudPump2Stroke":120.0,"MudPump2MechanicalEfficiency":0.9,"MudPump2VolumetricEfficiency":6.4,"MudPump2Output":0.12,"MudPump2OutputBblStroke":0.0,"MudPump2Maximum":120.0,"MudPump2ReliefValvePressure":0.9,"CementPumpLinerDiameter":6.4,"CementPumpStroke":120.0,"CementPumpMechanicalEfficiency":1.0,"CementPumpVolumetricEfficiency":6.4,"CementPumpOutput":0.12,"CementPumpOutputBblStroke":0.0,"CementPumpMaximum":120.0,"CementPumpReliefValvePressure":0.9,"MudPump1ReliefValveIsSet":false,"MudPump2ReliefValveIsSet":false,"CementPumpReliefValveIsSet":false,"ManualPumpPower":false,"Valve1":false,"Valve2":false,"Valve3":false,"Valve4":false,"Valve5":false},"RigSize":{"RigType":0,"CrownHeight":0.0,"MonkeyBoandHeight":0.0,"RigFloorHeight":0.0},"CasingLinerChoke":{"CasingDepth":4100.0,"CasingId":220.5,"CasingOd":243.84,"CasingWeight":69.94,"CasingCollapsePressure":17236.86,"CasingTensileStrength":1270.06,"LinerTopDepth":0.0,"LinerLength":0.0,"LinerId":0.0,"LinerOd":0.0,"LinerWeight":0.0,"LinerCollapsePressure":0.0,"LinerTensileStrength":0.0,"OpenHoleId":215.9,"OpenHoleLength":1776.49},"Path":{"Items":[{"HoleType":0,"Angle":0.0,"Length":2000.0,"FinalAngle":0.0,"TotalLength":2000.0,"MeasuredDepth":2000.0,"TotalVerticalDepth":0.0}]},"Mud":{"ActiveMudType":0,"ActiveRheologyModel":0,"ActiveMudVolume":68.68,"ActiveMudVolumeGal":2884.5600000000004,"ActiveDensity":1269.461181640625,"ActivePlasticViscosity":23.0,"ActiveYieldPoint":18.3,"ActiveThetaThreeHundred":0.0,"ActiveThetaSixHundred":0.0,"ReserveMudType":0,"ReserveMudVolume":63.59,"ReserveMudVolumeGal":0.0,"ReserveDensity":1497.0059814453125,"ReservePlasticViscosity":23.0,"ReserveYieldPoint":21.13,"ReserveThetaThreeHundred":0.0,"ReserveThetaSixHundred":0.0,"ActiveTotalTankCapacity":190.78,"ActiveTotalTankCapacityGal":8012.76,"ActiveSettledContents":0.0,"ActiveSettledContentsGal":0.0,"ActiveTotalContents":0.0,"ActiveTotalContentsGal":0.0,"ActiveAutoDensity":false,"InitialTripTankMudVolume":8.18,"InitialTripTankMudVolumeGal":133.56,"PedalFlowMeter":1600.0}},"Problems":{"BitProblems":{"JetWashout":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"PlugJets":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"JetWashoutCount":0,"PlugJetsCount":0},"BopProblems":{"AnnularWash":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"AnnularFail":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"AnnularLeak":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"UpperRamWash":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"UpperRamFail":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"UpperRamLeak":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"MiddleRamWash":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"MiddleRamFail":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"MiddleRamLeak":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"LowerRamWash":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"LowerRamFail":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"LowerRamLeak":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"AccumulatorPumpFail":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"AccumulatorPumpLeak":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"AccumulatorSystemFail":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"AccumulatorSystemLeak":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0}},"ChokeProblems":{"HydraulicChoke1Plugged":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"HydraulicChoke1Fail":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"HydraulicChoke1Washout":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"HydraulicChoke2Plugged":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"HydraulicChoke2Fail":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"HydraulicChoke2Washout":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"ManualChoke1Plugged":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"ManualChoke1Fail":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"ManualChoke1Washout":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"ManualChoke2Plugged":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"ManualChoke2Fail":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"ManualChoke2Washout":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"ChokePanelAirFail":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"ManualChoke1PluggedPercent":0,"HydraulicChoke2PluggedPercent":0,"HydraulicChoke1PluggedPercent":0,"ManualChoke2PluggedPercent":0},"DrillStemsProblems":{"StringDragIncrease":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"StringTorqueIncrease":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"StringTorqueFluctuation":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"StringDragIncreaseTime":0.0,"StringTorqueIncreaseTime":0.0},"GaugesProblems":{"WeightIndicator":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"RotaryRpm":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"RotaryTorque":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"StandPipePressure":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"CasingPressure":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"Pump1Strokes":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"Pump2Strokes":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"ReturnLineTemperature":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"TripTank":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"PitGainLoss":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"MudTankVolume":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"ReturnMudFlow":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"TorqueLimit":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"PowerLimit":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"AccumulatorPressure":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"ManifoldPressure":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"AnnularPressure":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"RigAirPressure":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"StandPipe1":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"StandPipe2":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"DrillPipePressure":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"ChokePosition":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"CasingPressure2":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0}},"HoistingProblems":{"MotorFail":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"ClutchEngage":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"ClutchDisengage":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0}},"KickProblems":{"Kick":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"FluidType":0,"FlowRate":0,"OverBalancePressure":0,"IsAutoMigrationRateSelected":false,"AutoMigrationRate":0.0},"LostProblems":{"LostCirculation":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"FlowRate":0.0},"MudTreatmentProblems":{"Degasser":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"ShaleShaker":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"Desander":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"Desilter":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0}},"OtherProblems":{"RigAlarm":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"RigWaterSupply":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"RigAir":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"Gen1":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"Gen2":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"Gen3":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"Gen4":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"Scr1":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"Scr2":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"Scr3":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"Scr4":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0}},"PumpProblems":{"Pump1PowerFail":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"Pump1BlowPopOffValve":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"Pump2PowerFail":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"Pump2BlowPopOffValve":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"CementPumpPowerFail":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"CementPumpBlowPopOffValve":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0}},"RotaryProblems":{"MotorFail":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0},"OverideTorqueLimit":{"ProblemType":0,"StatusType":0,"Value":0.0,"DueValue":0.0}}},"Equipments":{"BopControl":{"ManifoldPressureGauge":0.0,"AirSupplyPressureGauge":0.0,"AccumulatorPressureGauge":0.0,"AnnularPressureGauge":0.0,"AnnularOpenLED":0,"AnnularCloseLED":0,"UpperRamsOpenLED":0,"UpperRamsCloseLED":0,"MiddleRamsOpenLED":0,"MiddleRamsCloseLED":0,"KillLineOpenLED":0,"KillLineCloseLED":0,"ChokeLineOpenLED":0,"ChokeLineCloseLED":0,"LowerRamsOpenLED":0,"LowerRamsCloseLED":0,"AnnularStatus":0.0,"UpperRamsStatus":0.0,"MiddleRamsStatus":0.0,"LowerRamsStatus":0.0,"AirMasterValve":0.0,"KillLineValve":0.0,"ChokeLineValve":0.0,"UpperRamsValve":0.0,"LowerRamsValve":0.0,"AnnularValve":0.0},"ChokeControl":{"StandPipePressure":0.0,"CasingPressure":0.0,"ChokePosition":0.0,"ChokePanelSPMCounter":0.0,"ChokePanelTotalStrokeCounter":0.0,"Choke1LED":0,"Choke2LED":0,"ChokePanelRigAirSwitch":false,"ChokePanelStrokeResetSwitch":false,"ChokeControlLever":0.0,"ChokePanelPumpSelectorSwitch":0.0},"ChokeManifold":{"HydraulicChock1":0,"HydraulicChock2":0,"HyChock1OnProblem":false,"HyChock2OnProblem":false,"LeftManChokeOnProblem":false,"RightManChokeOnProblem":false,"ChokeManifoldValve1":false,"ChokeManifoldValve2":false,"ChokeManifoldValve3":false,"ChokeManifoldValve4":false,"ChokeManifoldValve5":false,"ChokeManifoldValve6":false,"ChokeManifoldValve7":false,"ChokeManifoldValve8":false,"ChokeManifoldValve9":false,"ChokeManifoldValve10":false,"ChokeManifoldValve11":false,"ChokeManifoldValve12":false,"ChokeManifoldValve13":false,"LeftManualChoke":0.0,"RightManualChoke":0.0},"DataDisplay":{"WOBPointer":0.0,"HookLoadPointer":0.0,"TripTankGauge":0.0,"TripTankAlarmLED":0,"TripTankPumpLED":0,"StandPipePressureGauge":0.0,"CasingPressureGauge":0.0,"MP1SPMGauge":0.0,"MP2SPMGauge":0.0,"ReturnLineTempGauge":0.0,"RotaryTorqueGauge":0.0,"RotaryRPMGauge":0.0,"AcidGasDetectionLED":0,"TotalStrokeCounter":0.0,"PitGainLossGauge":0.0,"MudTanksVolumeGauge":0.0,"MVTAlarmLED":0,"ReturnMudFlowGauge":0.0,"FillStrokeCounter":0.0,"MFFITotalStrokeCounter":0.0,"MFFIAlarmLED":0,"MFFIPumpLED":0,"TotalWellDepth":0.0,"BitDepth":0.0,"HookLoad":0.0,"StandPipePressure":0.0,"CasingPressure":0.0,"MP1SPM":0.0,"MP2SPM":0.0,"RTTorque":0.0,"RTRPM":0.0,"WOP":0.0,"ROP":0.0,"MudWeightIn":0.0,"MudWeightOut":0.0,"Buzzer1":false,"Buzzer2":false,"Buzzer3":false,"Buzzer4":false},"Drilling":{"MP1Throttle":8.0,"MP2Throttle":9.0,"RTThrottle":8.0,"DWThrottle":5.0,"ParkingBrakeLed":false,"GEN1LED":0,"GEN2LED":0,"GEN3LED":0,"GEN4LED":0,"SCR1LED":0,"SCR2LED":0,"SCR3LED":0,"SCR4LED":0,"MP1BLWR":0,"MP2BLWR":0,"DWBLWR":0,"RTBLWR":0,"PWRLIM":0,"PWRLIMMTR":0.0,"RTTorqueLimitGauge":0.0,"AutoDWLED":0,"GEN1BTNLED":0,"GEN2BTNLED":0,"GEN3BTNLED":0,"GEN4BTNLED":0,"OpenKellyCockLed":0,"CloseKellyCockLed":0,"OpenSafetyValveLed":0,"CloseSafetyValveLed":0,"IRSafetyValveLed":0,"IRIBopLed":0,"LatchPipeLED":0,"UnlatchPipeLED":0,"SwingLed":0,"FillMouseHoleLed":0},"Hook":{"HookHeight_S":0.0,"HookHeight":0.0},"StandPipeManifold":{"StandPipeGauge1":0.0,"StandPipeGauge2":0.0,"StandPipeManifoldValve1":false,"StandPipeManifoldValve2":false,"StandPipeManifoldValve3":false,"StandPipeManifoldValve4":false,"StandPipeManifoldValve5":false,"StandPipeManifoldValve6":false,"StandPipeManifoldValve7":false,"StandPipeManifoldValve8":false,"StandPipeManifoldValve9":false,"StandPipeManifoldValve10":false,"StandPipeManifoldValve11":false,"StandPipeManifoldValve12":false,"StandPipeManifoldValve13":false,"StandPipeManifoldValve14":false,"StandPipeManifoldValve15":false},"DrillingWatch":{"Depth":0.0,"BitPosition":0.0,"HookLoad":0.0,"WeightOnBit":0.0,"RPM":0.0,"ROP":0.0,"Torque":0.0,"PumpPressure":0.0,"SPM1":0.0,"SPM2":0.0,"CasingPressure":0.0,"PercentFlow":0.0,"PitGainLose":0.0,"PitVolume":0.0,"KillMudVolume":0.0,"TripTankVolume":0.0,"MudWeightIn":0.0,"FillVolume":0.0,"MudWeightOut":0.0}}}
diff --git a/redisinterface.mod b/redisinterface.mod
deleted file mode 100644
index a0ed03c..0000000
Binary files a/redisinterface.mod and /dev/null differ
diff --git a/runtest b/runtest
deleted file mode 100644
index ec1aa90..0000000
Binary files a/runtest and /dev/null differ
diff --git a/test.json b/test.json
deleted file mode 100644
index 8464d5a..0000000
--- a/test.json
+++ /dev/null
@@ -1,944 +0,0 @@
-{
- "status": 0,
- "speed": 0,
- "endstep": 0,
- "Configuration": {
- "StringConfiguration": {
- "StringConfigurationItems": [
- {
- "ComponentLength": 0.83991159793011913E-322,
- "ComponentType": 0,
- "Grade": "A",
- "LengthPerJoint": 0.0E+0,
- "NominalId": 0.0E+0,
- "NominalOd": 0.0E+0,
- "NominalToolJointOd": 0.0E+0,
- "NumberOfJoint": 0.0E+0,
- "WeightPerLength": 0.0E+0
- },
- {
- "ComponentLength": 0.0E+0,
- "ComponentType": 0,
- "Grade": "B",
- "LengthPerJoint": 0.0E+0,
- "NominalId": 0.0E+0,
- "NominalOd": 0.0E+0,
- "NominalToolJointOd": 0.63240402667679558E-321,
- "NumberOfJoint": 0.0E+0,
- "WeightPerLength": 0.0E+0
- }
- ],
- "BitDefenition": {
- "BitCodeHundreds": 0,
- "BitCodeOnes": 0,
- "BitCodeTens": 0,
- "BitLength": 0.0E+0,
- "BitNozzleNo": 0,
- "BitNozzleSize": 0.0E+0,
- "BitSize": 0.0E+0,
- "BitType": 0,
- "BitWeightPerLength": 0.0E+0,
- "FloatValve": false
- }
- },
- "Formations": [
- {
- "Abrasiveness": 0.0E+0,
- "Drillablity": 0.0E+0,
- "PorePressureGradient": 0.0E+0,
- "Thickness": 0.0E+0,
- "ThresholdWeight": 0.0E+0,
- "Top": 0.0E+0
- },
- {
- "Abrasiveness": 0.0E+0,
- "Drillablity": 0.0E+0,
- "PorePressureGradient": 0.0E+0,
- "Thickness": 0.0E+0,
- "ThresholdWeight": 0.0E+0,
- "Top": 0.1E+4
- }
- ],
- "Reservoir": {
- "AutoMigrationRate": 0.0E+0,
- "FluidGradient": 0.49406564584124654E-323,
- "FluidType": 1073741952,
- "FluidViscosity": 0.0E+0,
- "FormationNo": 0,
- "FormationPermeability": 0.0E+0,
- "FormationTop": 0.0E+0,
- "GeothermalGradient": 0.0E+0,
- "InactiveInflux": false,
- "IsAutoMigrationRateSelected": false,
- "MakeKickSinglePacket": false,
- "PressureGradient": 0.0E+0
- },
- "Shoe": {
- "Breakdown": 0.0E+0,
- "FormationNo": 0,
- "FracturePropagation": 0.0E+0,
- "InactiveFracture": false,
- "LeakOff": 0.0E+0,
- "ShoeDepth": 0.0E+0
- },
- "Accumulator": {
- "AccumulatorMinimumOperatingPressure": 0.49406564584124654E-323,
- "AccumulatorSystemSize": 0.0E+0,
- "AirPlungerPumpOutput": 0.0E+0,
- "ElectricPumpOutput": 0.0E+0,
- "NumberOfBottels": 1,
- "OilTankVolume": 0.98813129168249309E-323,
- "PrechargePressure": 0.35572726500569751E-321,
- "StartPressure": 0.0E+0,
- "StartPressure2": 0.0E+0,
- "StopPressure": 0.0E+0,
- "StopPressure2": 0.0E+0
- },
- "BopStack": {
- "AboveAnnularHeight": 0.0E+0,
- "AnnularPreventerClose": 0.0E+0,
- "AnnularPreventerHeight": 0.0E+0,
- "AnnularPreventerOpen": 0.0E+0,
- "AnnularStringDrag": 0.0E+0,
- "BlindRamClose": 0.0E+0,
- "BlindRamHeight": 0.23715151000379834E-321,
- "BlindRamOpen": 0.0E+0,
- "ChokeClose": 0.0E+0,
- "ChokeLineId": 0.0E+0,
- "ChokeLineLength": 0.0E+0,
- "ChokeOpen": 0.49406564584124654E-323,
- "GroundLevel": 0.0E+0,
- "KillClose": 0.49406564584124654E-323,
- "KillHeight": 0.0E+0,
- "KillOpen": 0.53049901345204898E-314,
- "LowerRamClose": 0.23715151000379834E-321,
- "LowerRamHeight": 0.54862156021258701E-316,
- "LowerRamOpen": 0.98813129168249309E-323,
- "RamStringDrag": 0.0E+0,
- "UpperRamClose": 0.0E+0,
- "UpperRamHeight": 0.98813129168249309E-323,
- "UpperRamOpen": 0.0E+0
- },
- "Hoisting": {
- "DrillingLineBreakingLoad": 0.0E+0,
- "DriveType": 0,
- "KellyWeight": 0.0E+0,
- "NumberOfLine": 0,
- "TopDriveWeight": 0.0E+0,
- "TravelingBlockWeight": 0.0E+0
- },
- "Power": {
- "CementPump": 0.0E+0,
- "Drawworks": 0.0E+0,
- "GeneratorPowerRating": 0.0E+0,
- "MudPump1": 0.0E+0,
- "MudPump2": 0.0E+0,
- "NumberOfgenerators": 0,
- "RotaryTable": 0.0E+0,
- "TopDrive": 0.0E+0
- },
- "Pumps": {
- "MudPump1LinerDiameter": 0.0E+0,
- "MudPump1Stroke": 0.0E+0,
- "MudPump1MechanicalEfficiency": 0.0E+0,
- "MudPump1VolumetricEfficiency": 0.1E+2,
- "MudPump1Output": 0.10199999999999999E+2,
- "MudPump1OutputBblStroke": 0.14632E+2,
- "MudPump1Maximum": 0.21350000000000001E+2,
- "MudPump1ReliefValvePressure": 0.16239999999999998E+2,
- "MudPump2LinerDiameter": 0.18800000000000001E+2,
- "MudPump2Stroke": 0.15E+1,
- "MudPump2MechanicalEfficiency": 0.15E+1,
- "MudPump2VolumetricEfficiency": 0.3E+2,
- "MudPump2Output": 0.0E+0,
- "MudPump2OutputBblStroke": 0.0E+0,
- "MudPump2Maximum": 0.0E+0,
- "MudPump2ReliefValvePressure": 0.0E+0,
- "CementPumpLinerDiameter": 0.0E+0,
- "CementPumpStroke": 0.0E+0,
- "CementPumpMechanicalEfficiency": 0.0E+0,
- "CementPumpVolumetricEfficiency": 0.0E+0,
- "CementPumpOutput": 0.0E+0,
- "CementPumpOutputBblStroke": 0.0E+0,
- "CementPumpMaximum": 0.0E+0,
- "CementPumpReliefValvePressure": 0.0E+0,
- "MudPump1ReliefValveIsSet": false,
- "MudPump2ReliefValveIsSet": false,
- "CementPumpReliefValveIsSet": false,
- "ManualPumpPower": false,
- "Valve1": false,
- "Valve2": false,
- "Valve3": false,
- "Valve4": false,
- "Valve5": false
- },
- "RigSize": {
- "RigType": 0,
- "CrownHeight": 0.0E+0,
- "MonkeyBoandHeight": 0.0E+0,
- "RigFloorHeight": 0.0E+0
- },
- "CasingLinerChoke": {
- "CasingDepth": 0.0E+0,
- "CasingId": 0.0E+0,
- "CasingOd": 0.0E+0,
- "CasingWeight": 0.0E+0,
- "CasingCollapsePressure": 0.0E+0,
- "CasingTensileStrength": 0.0E+0,
- "LinerTopDepth": 0.0E+0,
- "LinerLength": 0.0E+0,
- "LinerId": 0.0E+0,
- "LinerOd": 0.0E+0,
- "LinerWeight": 0.0E+0,
- "LinerCollapsePressure": 0.0E+0,
- "LinerTensileStrength": 0.0E+0,
- "OpenHoleId": 0.0E+0,
- "OpenHoleLength": 0.0E+0
- },
- "Path": {
- "Items": [
- {
- "HoleType": 0,
- "Angle": 0.0E+0,
- "Length": 0.1E+4,
- "FinalAngle": 0.0E+0,
- "TotalLength": 0.0E+0,
- "MeasuredDepth": 0.0E+0,
- "TotalVerticalDepth": 0.0E+0
- },
- {
- "HoleType": 0,
- "Angle": 0.0E+0,
- "Length": 0.2E+4,
- "FinalAngle": 0.0E+0,
- "TotalLength": 0.0E+0,
- "MeasuredDepth": 0.0E+0,
- "TotalVerticalDepth": 0.0E+0
- }
- ]
- },
- "Mud": {
- "ActiveMudType": 0,
- "ActiveRheologyModel": 0,
- "ActiveMudVolume": 0.0E+0,
- "ActiveMudVolumeGal": 0.0E+0,
- "ActiveDensity": 0.0E+0,
- "ActivePlasticViscosity": 0.0E+0,
- "ActiveYieldPoint": 0.0E+0,
- "ActiveThetaThreeHundred": 0.0E+0,
- "ActiveThetaSixHundred": 0.0E+0,
- "ReserveMudType": 0,
- "ReserveMudVolume": 0.0E+0,
- "ReserveMudVolumeGal": 0.0E+0,
- "ReserveDensity": 0.0E+0,
- "ReservePlasticViscosity": 0.0E+0,
- "ReserveYieldPoint": 0.0E+0,
- "ReserveThetaThreeHundred": 0.0E+0,
- "ReserveThetaSixHundred": 0.0E+0,
- "ActiveTotalTankCapacity": 0.0E+0,
- "ActiveTotalTankCapacityGal": 0.0E+0,
- "ActiveSettledContents": 0.0E+0,
- "ActiveSettledContentsGal": 0.0E+0,
- "ActiveTotalContents": 0.98813129168249309E-323,
- "ActiveTotalContentsGal": 0.54862788425285377E-316,
- "ActiveAutoDensity": false,
- "InitialTripTankMudVolume": 0.0E+0,
- "InitialTripTankMudVolumeGal": 0.53049901345204898E-314,
- "PedalFlowMeter": 0.49406564584124654E-323
- }
- },
- "Problems": {
- "BitProblems": {
- "JetWashout": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.53049901345204898E-314,
- "DueValue": 0.49406564584124654E-323
- },
- "PlugJets": {
- "ProblemType": 2,
- "StatusType": 0,
- "Value": 0.54862788425285377E-316,
- "DueValue": 0.27667676167109806E-321
- },
- "JetWashoutCount": 0,
- "PlugJetsCount": 0
- },
- "BopProblems": {
- "AnnularWash": {
- "ProblemType": 2,
- "StatusType": 0,
- "Value": 0.27667676167109806E-321,
- "DueValue": 0.49406564584124654E-323
- },
- "AnnularFail": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "AnnularLeak": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "UpperRamWash": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "UpperRamFail": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "UpperRamLeak": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "MiddleRamWash": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "MiddleRamFail": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "MiddleRamLeak": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "LowerRamWash": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "LowerRamFail": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "LowerRamLeak": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "AccumulatorPumpFail": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "AccumulatorPumpLeak": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "AccumulatorSystemFail": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "AccumulatorSystemLeak": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- }
- },
- "ChokeProblems": {
- "HydraulicChoke1Plugged": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "HydraulicChoke1Fail": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "HydraulicChoke1Washout": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "HydraulicChoke2Plugged": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "HydraulicChoke2Fail": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "HydraulicChoke2Washout": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "ManualChoke1Plugged": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "ManualChoke1Fail": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "ManualChoke1Washout": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "ManualChoke2Plugged": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "ManualChoke2Fail": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "ManualChoke2Washout": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "ChokePanelAirFail": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "ManualChoke1PluggedPercent": 0,
- "HydraulicChoke2PluggedPercent": 0,
- "HydraulicChoke1PluggedPercent": 0,
- "ManualChoke2PluggedPercent": 0
- },
- "DrillStemsProblems": {
- "StringDragIncrease": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "StringTorqueIncrease": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "StringTorqueFluctuation": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "StringDragIncreaseTime": 0.0E+0,
- "StringTorqueIncreaseTime": 0.0E+0
- },
- "GaugesProblems": {
- "WeightIndicator": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "RotaryRpm": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "RotaryTorque": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "StandPipePressure": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "CasingPressure": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "Pump1Strokes": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "Pump2Strokes": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "ReturnLineTemperature": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "TripTank": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "PitGainLoss": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "MudTankVolume": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "ReturnMudFlow": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "TorqueLimit": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "PowerLimit": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "AccumulatorPressure": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "ManifoldPressure": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "AnnularPressure": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "RigAirPressure": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "StandPipe1": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "StandPipe2": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "DrillPipePressure": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "ChokePosition": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "CasingPressure2": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- }
- },
- "HoistingProblems": {
- "MotorFail": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "ClutchEngage": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "ClutchDisengage": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- }
- },
- "KickProblems": {
- "Kick": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "FluidType": 0,
- "FlowRate": 0,
- "OverBalancePressure": 0,
- "IsAutoMigrationRateSelected": false,
- "AutoMigrationRate": 0.0E+0
- },
- "LostProblems": {
- "LostCirculation": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "FlowRate": 0.0E+0
- },
- "MudTreatmentProblems": {
- "Degasser": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "ShaleShaker": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "Desander": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "Desilter": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- }
- },
- "OtherProblems": {
- "RigAlarm": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "RigWaterSupply": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "RigAir": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "Gen1": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "Gen2": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "Gen3": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "Gen4": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "Scr1": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "Scr2": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "Scr3": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "Scr4": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- }
- },
- "PumpProblems": {
- "Pump1PowerFail": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "Pump1BlowPopOffValve": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "Pump2PowerFail": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "Pump2BlowPopOffValve": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "CementPumpPowerFail": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "CementPumpBlowPopOffValve": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- }
- },
- "RotaryProblems": {
- "MotorFail": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- },
- "OverideTorqueLimit": {
- "ProblemType": 0,
- "StatusType": 0,
- "Value": 0.0E+0,
- "DueValue": 0.0E+0
- }
- }
- },
- "Equipments": {
- "BopControl": {
- "ManifoldPressureGauge": 0.0E+0,
- "AirSupplyPressureGauge": 0.0E+0,
- "AccumulatorPressureGauge": 0.0E+0,
- "AnnularPressureGauge": 0.0E+0,
- "AnnularOpenLED": 0,
- "AnnularCloseLED": 0,
- "UpperRamsOpenLED": 0,
- "UpperRamsCloseLED": 0,
- "MiddleRamsOpenLED": 0,
- "MiddleRamsCloseLED": 0,
- "KillLineOpenLED": 0,
- "KillLineCloseLED": 0,
- "ChokeLineOpenLED": 0,
- "ChokeLineCloseLED": 0,
- "LowerRamsOpenLED": 0,
- "LowerRamsCloseLED": 0,
- "AnnularStatus": 0.0E+0,
- "UpperRamsStatus": 0.0E+0,
- "MiddleRamsStatus": 0.0E+0,
- "LowerRamsStatus": 0.0E+0
- },
- "ChokeControl": {
- "StandPipePressure": 0.0E+0,
- "CasingPressure": 0.0E+0,
- "ChokePosition": 0.0E+0,
- "ChokePanelSPMCounter": 0.0E+0,
- "ChokePanelTotalStrokeCounter": 0.0E+0,
- "Choke1LED": 0,
- "Choke2LED": 0
- },
- "ChokeManifold": {
- "HydraulicChock1": 0,
- "HydraulicChock2": 0,
- "HyChock1OnProblem": false,
- "HyChock2OnProblem": false,
- "LeftManChokeOnProblem": false,
- "RightManChokeOnProblem": false
- },
- "DataDisplay": {
- "WOBPointer": 0.0E+0,
- "HookLoadPointer": 0.0E+0,
- "TripTankGauge": 0.0E+0,
- "TripTankAlarmLED": 0,
- "TripTankPumpLED": 0,
- "StandPipePressureGauge": 0.0E+0,
- "CasingPressureGauge": 0.0E+0,
- "MP1SPMGauge": 0.0E+0,
- "MP2SPMGauge": 0.0E+0,
- "ReturnLineTempGauge": 0.0E+0,
- "RotaryTorqueGauge": 0.0E+0,
- "RotaryRPMGauge": 0.0E+0,
- "AcidGasDetectionLED": 0,
- "TotalStrokeCounter": 0.0E+0,
- "PitGainLossGauge": 0.0E+0,
- "MudTanksVolumeGauge": 0.0E+0,
- "MVTAlarmLED": 0,
- "ReturnMudFlowGauge": 0.0E+0,
- "FillStrokeCounter": 0.0E+0,
- "MFFITotalStrokeCounter": 0.0E+0,
- "MFFIAlarmLED": 0,
- "MFFIPumpLED": 0,
- "TotalWellDepth": 0.0E+0,
- "BitDepth": 0.0E+0,
- "HookLoad": 0.0E+0,
- "StandPipePressure": 0.0E+0,
- "CasingPressure": 0.0E+0,
- "MP1SPM": 0.0E+0,
- "MP2SPM": 0.0E+0,
- "RTTorque": 0.0E+0,
- "RTRPM": 0.0E+0,
- "WOP": 0.0E+0,
- "ROP": 0.0E+0,
- "MudWeightIn": 0.0E+0,
- "MudWeightOut": 0.0E+0,
- "Buzzer1": false,
- "Buzzer2": false,
- "Buzzer3": false,
- "Buzzer4": false
- },
- "Drilling": {
- "ParkingBrakeLed": false,
- "GEN1LED": 0,
- "GEN2LED": 0,
- "GEN3LED": 0,
- "GEN4LED": 0,
- "SCR1LED": 0,
- "SCR2LED": 0,
- "SCR3LED": 0,
- "SCR4LED": 0,
- "MP1BLWR": 0,
- "MP2BLWR": 0,
- "DWBLWR": 0,
- "RTBLWR": 0,
- "PWRLIM": 0,
- "PWRLIMMTR": 0.0E+0,
- "RTTorqueLimitGauge": 0.0E+0,
- "AutoDWLED": 0,
- "GEN1BTNLED": 0,
- "GEN2BTNLED": 0,
- "GEN3BTNLED": 0,
- "GEN4BTNLED": 0,
- "OpenKellyCockLed": 0,
- "CloseKellyCockLed": 0,
- "OpenSafetyValveLed": 0,
- "CloseSafetyValveLed": 0,
- "IRSafetyValveLed": 0,
- "IRIBopLed": 0,
- "LatchPipeLED": 0,
- "UnlatchPipeLED": 0,
- "SwingLed": 0,
- "FillMouseHoleLed": 0
- },
- "Hook": {
- "HookHeight_S": 0.0E+0,
- "HookHeight": 0.0E+0
- },
- "StandPipeManifold": {
- "StandPipeGauge1": 0.0E+0,
- "StandPipeGauge2": 0.0E+0
- },
- "DrillingWatch": {
- "Depth": 0.0E+0,
- "BitPosition": 0.0E+0,
- "HookLoad": 0.0E+0,
- "WeightOnBit": 0.0E+0,
- "RPM": 0.0E+0,
- "ROP": 0.0E+0,
- "Torque": 0.0E+0,
- "PumpPressure": 0.0E+0,
- "SPM1": 0.0E+0,
- "SPM2": 0.0E+0,
- "CasingPressure": 0.0E+0,
- "PercentFlow": 0.0E+0,
- "PitGainLose": 0.0E+0,
- "PitVolume": 0.0E+0,
- "KillMudVolume": 0.0E+0,
- "TripTankVolume": 0.0E+0,
- "MudWeightIn": 0.0E+0,
- "FillVolume": 0.0E+0,
- "MudWeightOut": 0.0E+0
- }
- }
-}
diff --git a/test.mod b/test.mod
deleted file mode 100644
index f082543..0000000
Binary files a/test.mod and /dev/null differ
diff --git a/test.sh b/test.sh
deleted file mode 100644
index fa4c688..0000000
--- a/test.sh
+++ /dev/null
@@ -1 +0,0 @@
-ifort -o SimulationCore2 -module ./mod -fpp ./obj/COperationScenariosVariables.o ./obj/TD_WellGeometry.o ./obj/TD_WellElements.o ./obj/TD_StringConnectionData.o ./obj/GeoElements_FluidModule.o ./obj/sROP_Variables.o ./obj/sROP_Other_Variables.o ./obj/Flow_Startup_VARIABLES.o ./obj/CDownHoleTypes.o ./obj/Drawworks_VARIABLES.o ./obj/CHOKE_VARIABLES.o ./obj/TopDrive_VARIABLES.o ./obj/RTable_VARIABLES.o ./obj/Pumps_VARIABLES.o ./obj/CWarningsVariables.o ./obj/CStudentStationVariables.o ./obj/SoftwareInputsVariables.o ./obj/UnitySignalsVariables.o ./obj/PermissionsVariables.o ./obj/NotificationVariables.o ./obj/CTanksVariables.o ./obj/CDrillWatchVariables.o ./obj/CTopDrivePanelVariables.o ./obj/CStandPipeManifoldVariables.o ./obj/CHookVariables.o ./obj/CDrillingConsoleVariables.o ./obj/CChokeManifoldVariables.o ./obj/CChokeControlPanelVariables.o ./obj/CBopControlPanelVariables.o ./obj/CWellSurveyDataVariables.o ./obj/CPathGenerationVariables.o ./obj/CCasingLinerChokeVariables.o ./obj/CRigSizeVariables.o ./obj/CIActionReference.o ./obj/CPowerVariables.o ./obj/CHoistingVariables.o ./obj/CBopStackVariables.o ./obj/CAccumulatorVariables.o ./obj/CShoeVariables.o ./obj/CReservoirVariables.o ./obj/CFormationVariables.o ./obj/CStringConfigurationVariables.o ./obj/Constants.o ./obj/CArrangement.o ./obj/CUnityInputs.o ./obj/CCommonVariables.o ./obj/DynamicIntegerArray.o ./obj/RopMain.o ./obj/CEquipmentsConstants.o ./obj/DynamicRealArray.o ./obj/DynamicDoubleArray.o ./obj/CPathChangeEvents.o ./obj/DynamicLogicalArray.o ./obj/CScaleRange.o ./obj/FluidFlowMain.o ./obj/TD_GeneralData.o ./obj/CWellSurveyData.o ./obj/CDataDisplayConsoleVariables.o ./obj/CLog4.o ./obj/CPumpsVariables.o ./obj/CLog1.o ./obj/CMudPropertiesVariables.o ./obj/CLog5.o ./obj/CError.o ./obj/CLog2.o ./obj/CLog3.o ./obj/CSounds.o ./obj/CCommon.o ./obj/Pressure_Display_VARIABLES.o ./obj/VARIABLES.o ./obj/Kick_VARIABLES.o ./obj/CUnityOutputs.o ./obj/CDownHoleVariables.o ./obj/GeoMain.o ./obj/CPath.o ./obj/CProblemDifinition.o ./obj/Pressure_Distribution_VARIABLES.o ./obj/MudSystem_Variables.o ./obj/TD_DrillStem.o ./obj/CStack.o ./obj/CDrillStemProblemsVariables.o ./obj/COtherProblemsVariables.o ./obj/CLostProblemsVariables.o ./obj/CGaugesProblemsVariables.o ./obj/CBitProblemsVariables.o ./obj/CKickProblemsVariables.o ./obj/CHoistingProblemsVariables.o ./obj/CChokeProblemsVariables.o ./obj/CPumpProblemsVariables.o ./obj/CRotaryProblemsVariables.o ./obj/CMudTreatmentProblemsVariables.o ./obj/CBopProblemsVariables.o ./obj/SimulationVariables.o ./obj/CChokeControlPanel.o ./obj/CDrillingConsole.o ./obj/CStandPipeManifold.o ./obj/CTopDrivePanel.o ./obj/DrillWatch.o ./obj/CMudTreatmentProblems.o ./obj/CChokeProblems.o ./obj/CHook.o ./obj/CRigSize.o ./obj/PipeRams1Main.o ./obj/COtherProblems.o ./obj/CAccumulator.o ./obj/CRotaryProblems.o ./obj/CDrillStemProblems.o ./obj/MudProperties.o ./obj/CPower.o ./obj/RotaryTableMain.o ./obj/CManifolds.o ./obj/CBopProblems.o ./obj/DownHole.o ./obj/CHoistingProblems.o ./obj/DrawworksMain.o ./obj/CLostProblems.o ./obj/CBitProblems.o ./obj/CBopStack.o ./obj/ChokeLineMain.o ./obj/PumpsMain.o ./obj/AnnularMain.o ./obj/CPathGeneration.o ./obj/CReservoir.o ./obj/CStringConfiguration.o ./obj/PipeRams2Main.o ./obj/BlindRamsMain.o ./obj/CKickProblems.o ./obj/Permissions.o ./obj/CFormation.o ./obj/KillLineMain.o ./obj/CGaugesProblems.o ./obj/CCasingLinerChoke.o ./obj/CShoe.o ./obj/CPumpProblems.o ./obj/CDataDisplayConsole.o ./obj/SoftwareInputs.o ./obj/TD_DrillStemReadData.o ./obj/Pump_OffMode_Solver.o ./obj/TD_ForceDownDRot.o ./obj/TD_ForceDownD.o ./obj/Formation_Information.o ./obj/TD_WellElementsConfiguration.o ./obj/Elements_Creation.o ./obj/Drawworks_StartUp.o ./obj/TD_PipePropertiesReadData.o ./obj/TD_CombinedMotionData.o ./obj/TVD_Calculator.o ./obj/TD_ForceUpSRot.o ./obj/Bit_Specification.o ./obj/Pump3_MainSolver.o ./obj/Kick_Expansion_and_Contraction.o ./obj/TD_ForceCalculation.o ./obj/TD_ForceDownB.o ./obj/Pumps_TotalSolver.o ./obj/TD_StrainCalculation.o ./obj/Flow_Startup.o ./obj/DrillingConsole_ScrLEDs.o ./obj/TD_ViscousDragForce.o ./obj/TD_ForceUpS.o ./obj/TD_ForceDownS.o ./obj/RTable_StartUp.o ./obj/Utube2_and_Trip_In.o ./obj/Kick_Migration.o ./obj/TD_ForceReadData.o ./obj/TD_StaticHookLoadCalculation.o ./obj/Pump_and_Trip_In.o ./obj/Deallocate_Normal_Circulation.o ./obj/RTable_OnModeSolver.o ./obj/Pump_OnMode_Solver.o ./obj/TD_WellElementsReadData.o ./obj/TD_MudPropertiesReadData.o ./obj/TD_ForceUpDRot.o ./obj/TopDrive_StartUp.o ./obj/FillingWell_By_BellNipple.o ./obj/TD_ForceUpBRot.o ./obj/TD_TorqueCalculation.o ./obj/TD_ForceDownBRot.o ./obj/Drawworks_MainSolver.o ./obj/TD_ForceUpD.o ./obj/TD_ForceUpB.o ./obj/RTable_OffModeSolver.o ./obj/TD_DrillStemStartUp.o ./obj/TD_ForceDownSRot.o ./obj/JetImpactForce.o ./obj/TD_WellReadData.o ./obj/TD_BouyancyFactor.o ./obj/Frictional_Press_Drop_Calc.o ./obj/TopDrive_Outputs.o ./obj/DWFixModeMotion.o ./obj/CBopControlPanel.o ./obj/UnitySignals.o ./obj/CPumps.o ./obj/CChokeManifold.o ./obj/CTanks.o ./obj/CWarnings.o ./obj/TD_BOPDiamCalculation.o ./obj/Drawworks_Direction.o ./obj/RTable_Outputs.o ./obj/DWMalfunction_MotorFailure.o ./obj/TD_WeightOnBitCalculation.o ./obj/String_Property_Calculator.o ./obj/Annulus_Property_Calculator.o ./obj/Trip_Out_andPump.o ./obj/Utube1_and_Trip_In.o ./obj/Pump2_MainSolver.o ./obj/Pump1_MainSolver.o ./obj/Utube.o ./obj/BOP.o ./obj/SHEAR_RAM.o ./obj/PIPE_RAM2.o ./obj/LOSS_INPUTS.o ./obj/ANNULAR.o ./obj/CHOKE_LINE.o ./obj/KILL_LINE.o ./obj/PIPE_RAM1.o ./obj/BOPstartup.o ./obj/TD_StartUp.o ./obj/TD_HookLoadCalculation.o ./obj/TopDrive_Inputs.o ./obj/TopDrive_Solver.o ./obj/Notifications.o ./obj/TorqueDragMain.o ./obj/MeshGeneration_FluidModule.o ./obj/Pumps_StartUp.o ./obj/CHOKE.o ./obj/AirPump_Choke_Subs.o ./obj/MudSystemStartup.o ./obj/TopDriveMain.o ./obj/MudSystem.o ./obj/ROP_MainCalculation.o ./obj/Drawworks_Outputs.o ./obj/RTable_Inputs.o ./obj/TopDrive_OffMode.o ./obj/TopDrive_MainSolver.o ./obj/OperationScenarios.o ./obj/ChokeControlMain.o ./obj/ChokeStartup.o ./obj/MudSystemMain.o ./obj/Pumps_Inputs.o ./obj/Pumps_Outputs.o ./obj/Annulus_and_Openhole_Pressure_Distribution.o ./obj/TD_WellGeoConfiguration.o ./obj/RTable_MainSolver.o ./obj/CSlipsEnum.o ./obj/CUnlatchLedNotification.o ./obj/CTdsTorqueWrenchLedNotification.o ./obj/CInstallMudBucketPermission.o ./obj/CFillupHeadPermission.o ./obj/COpenKellyCockLedNotification.o ./obj/CTdsPowerLedNotification.o ./obj/CSwingLedNotification.o ./obj/CTdsElevatorModesEnum.o ./obj/CTdsSpineEnum.o ./obj/CSwingTiltPermission.o ./obj/CIrSafetyValvePermission.o ./obj/CSwingOffPermission.o ./obj/CCloseSafetyValveLedNotification.o ./obj/CMouseHoleEnum.o ./obj/CFlowPipeDisconnectEnum.o ./obj/CCloseKellyCockLedNotification.o ./obj/CElevatorConnectionEnum.o ./obj/CIrSafetyValveLedNotification.o ./obj/CFlowKellyDisconnectEnum.o ./obj/COpenSafetyValveLedNotification.o ./obj/CTdsBackupClamp.o ./obj/CTdsTongEnum.o ./obj/CElevatorEnum.o ./obj/CTongNotification.o ./obj/CSafetyValveEnum.o ./obj/CRemoveMudBucketPermission.o ./obj/CInstallFillupHeadPermission.o ./obj/CSwingEnum.o ./obj/CKellyEnum.o ./obj/CSwingDrillPermission.o ./obj/CIrIbopPermission.o ./obj/CRemoveFillupHeadPermission.o ./obj/COperationScenariosSettings.o ./obj/CTdsSwingEnum.o ./obj/CIbopEnum.o ./obj/CFillMouseHoleLedNotification.o ./obj/CTongEnum.o ./obj/CIrIBopLedNotification.o ./obj/CTdsIbopLedNotification.o ./obj/CLatchLedNotification.o ./obj/CSlipsNotification.o ./obj/TD_DrillStemConfiguration.o ./obj/Kick_Influx.o ./obj/Disconnecting_Pipe.o ./obj/Drawworks_Solver_OffMode.o ./obj/TD_RemoveComponents.o ./obj/Horizontal_and_String_Pressure_Distribution.o ./obj/Drawworks_INPUTS.o ./obj/TD_AddComponents.o ./obj/Drawworks_Solver.o ./obj/Pumps_MainSolver.o ./obj/COperationScenariosMain.o ./obj/Circulation_Code_Select.o ./obj/TD_StringConnectionModes.o ./obj/Gas_Kick_Calculator.o ./obj/Simulator.o ./obj/TD_MainCalculations.o ./obj/Well_Pressure_Data_Transfer.o ./obj/Plot_Final_Mud_Elements.o ./obj/Fluid_Flow_Solver.o ./obj/Redis_Interface.o obj/redis_io.o lib/libjsonfortran.a lib/libhiredis.a SimulationCore2.f90 ./obj/CHoisting.o
\ No newline at end of file
diff --git a/testjson.f90 b/testjson.f90
deleted file mode 100644
index ec62b75..0000000
--- a/testjson.f90
+++ /dev/null
@@ -1,28 +0,0 @@
-program RedisInterface
- use json_module
- use CStringConfigurationVariables
-
- type(json_file) :: jsonfile
- type(json_value),pointer :: jsonvalue,jsonvalue2,child,child2,jsonvalue3
- type(json_core) :: jsoncore
- logical :: is_found
- integer ::n_children,i,j
- type(CStringItem), allocatable :: StringConfigurations(:)
-
- call jsonfile%initialize()
- call jsonfile%load_file('data-witharray.json'); if (jsonfile%failed()) stop
- call jsonfile%json_file_get_root(jsonvalue)
- call jsoncore%get(jsonvalue,'Configuration',jsonvalue2)
- call jsoncore%get(jsonvalue2,'StringConfiguration',jsonvalue)
- call jsoncore%get(jsonvalue,'StringConfigurationItems',jsonvalue2)
- call jsoncore%info(jsonvalue2, n_children=n_children)
- do i=1,n_children
- call jsoncore%get_child(jsonvalue2, i, child, found=is_found)
- if (.not. is_found) print *,"not found"
- call jsoncore%get(child,"BitCodeHundreds",child2)
- call jsoncore%get(child2,j)
- print *,"BitCodeHundreds=",j
- end do
- print *,"n_children=",n_children
- call jsonfile%destroy()
-end program
\ No newline at end of file