WIP removing V1 __init__.py

examples/case_from_multiple_files/main.py

@@ -1,6 +1,6 @@
 import os
 
-import flow360.component.v1 as fl
+import flow360.component.v1xxx as fl
 import flow360.component.v1.units as u
 from flow360.examples import OM6wing
 

examples/case_from_yaml.py

@@ -1,4 +1,4 @@
-import flow360.component.v1 as fl
+import flow360 as fl
 from flow360.examples import OM6wing
 
 OM6wing.get_files()

examples/case_params_with_units.py

@@ -1,7 +1,6 @@
 import json
 from pprint import pprint
 
-import flow360.component.v1 as fl
 from flow360 import log
 from flow360.component.v1 import units as u
 from flow360.component.v1.services import validate_model

examples/change_account_and_submit.py

@@ -1,4 +1,4 @@
-import flow360.component.v1 as fl
+import flow360 as fl
 from flow360.examples import OM6wing
 
 fl.Env.dev.active()

examples/dev/dev_run_case_from_files.py

@@ -1,4 +1,4 @@
-import flow360.component.v1 as fl
+import flow360.component.v1xxx as fl
 from flow360.examples import OM6wing
 
 fl.Env.dev.active()

examples/dev/dev_run_case_from_files_no_validation.py

@@ -1,6 +1,6 @@
 import os
 
-import flow360.component.v1 as fl
+import flow360.component.v1xxx as fl
 from flow360.examples import OM6wing
 
 fl.UserConfig.disable_validation()

examples/dev/dev_use_unit_system.py

@@ -6,8 +6,8 @@
 import pydantic.v1 as pd
 import unyt
 
-import flow360.component.v1 as fl
-from flow360.component.v1 import Geometry
+import flow360.component.v1xxx as fl
+from flow360.component.v1xxx import Geometry
 from flow360.component.v1 import units as u
 from flow360.component.v1.unit_system import (
     AngularVelocityType,

examples/dev/list_cases_all_params.py

@@ -1,7 +1,7 @@
-import flow360.component.v1 as fl
+from flow360.component.case import CaseList as MyCases
 from flow360.exceptions import Flow360ValidationError
 
-for case in fl.MyCases(limit=10000):
+for case in MyCases(limit=10000):
     print(case.id, case.status, case.name, case.info.userEmail)
     try:
         case.params

examples/display_mesh_info.py

@@ -1,6 +1,6 @@
-import flow360.component.v1 as fl
+from flow360.component.volume_mesh import VolumeMeshList as MyVolumeMeshes
 
-meshes = fl.MyVolumeMeshes()
+meshes = MyVolumeMeshes()
 mesh = meshes[0]
 
 for mesh in meshes:

examples/list_cases.py

@@ -1,7 +1,8 @@
-import flow360.component.v1 as fl
+from flow360.component.case import CaseList as MyCases
+from flow360.component.volume_mesh import VolumeMeshList as MyVolumeMeshes
 
 # get all cases:
-my_cases = fl.MyCases()
+my_cases = MyCases()
 
 # print metadata for the latest case:
 print(my_cases[0])
@@ -15,7 +16,7 @@
 print(case0.params.freestream.Mach)
 
 # get all meshes:
-meshes = fl.MyVolumeMeshes(limit=None, include_deleted=True)
+meshes = MyVolumeMeshes(limit=None, include_deleted=True)
 
 meshes[0].info.surface_mesh_id
 for mesh in meshes:
@@ -25,14 +26,14 @@
 
 mesh = meshes[0]
 # list of cases for a given mesh
-mesh_cases = fl.MyCases(mesh_id=mesh.id, include_deleted=True)
+mesh_cases = MyCases(mesh_id=mesh.id, include_deleted=True)
 for case in mesh_cases:
     print(f"id: {case.id}, status: {case.status}, is case deleted: {case.info.deleted}")
 
 
 for mesh in meshes:
     if mesh.info.surface_mesh_id is not None:
-        volume_meshes = fl.MyVolumeMeshes(surface_mesh_id=mesh.info.surface_mesh_id)
+        volume_meshes = MyVolumeMeshes(surface_mesh_id=mesh.info.surface_mesh_id)
         print(volume_meshes)
         assert mesh.id in [m.id for m in volume_meshes]
         break

examples/new_workbench_project_from_geometry.py

@@ -1,4 +1,4 @@
-import flow360.component.v1 as fl
+import flow360 as fl
 from flow360.component.geometry import Geometry
 from flow360.examples import Airplane
 

examples/new_workbench_project_from_volume_mesh.py

@@ -1,7 +1,7 @@
 import time
 
 import flow360.component.simulation.units as u
-import flow360.component.v1 as fl
+import flow360 as fl
 from flow360.component.simulation.cloud import run_case
 from flow360.component.simulation.models.surface_models import (
     Freestream,

examples/project_from_file_geometry.py

@@ -1,4 +1,4 @@
-import flow360.component.v1 as fl
+import flow360 as fl
 from flow360.component.project import Project
 from flow360.component.simulation.meshing_param.params import (
     MeshingDefaults,

examples/project_from_file_geometry_multiple_runs.py

@@ -1,4 +1,4 @@
-import flow360.component.v1 as fl
+import flow360 as fl
 from flow360.component.project import Project
 from flow360.component.simulation.meshing_param.params import (
     MeshingDefaults,

examples/project_from_file_volume_mesh.py

@@ -1,7 +1,7 @@
 from matplotlib.pyplot import show
 
 import flow360.component.simulation.units as u
-import flow360.component.v1 as fl
+import flow360.component.v1xxx as fl
 from flow360.component.project import Project
 from flow360.component.simulation.models.surface_models import (
     Freestream,

examples/retrieve_results/actuator_disk.py

@@ -1,6 +1,6 @@
 import os
 
-import flow360.component.v1 as fl
+import flow360.component.v1xxx as fl
 import flow360.units as u
 from flow360.examples import ActuatorDisk
 

examples/retrieve_results/alpha_sweep.py

@@ -3,7 +3,7 @@
 
 from pylab import plot, show, xlabel, ylabel
 
-import flow360.component.v1 as fl
+import flow360.component.v1xxx as fl
 from flow360.examples import OM6wing
 
 OM6wing.get_files()

examples/retrieve_results/bet_disk.py

@@ -1,6 +1,6 @@
 import os
 
-import flow360.component.v1 as fl
+import flow360.component.v1xxx as fl
 import flow360.component.v1.units as u
 from flow360.examples import BETDisk
 

examples/retrieve_results/convergence.py

@@ -1,4 +1,4 @@
-import flow360.component.v1 as fl
+import flow360.component.v1xxx as fl
 from flow360.examples import Convergence
 
 Convergence.get_files()

examples/retrieve_results/forces.py

@@ -1,4 +1,4 @@
-import flow360.component.v1 as fl
+import flow360.component.v1xxx as fl
 from flow360.examples import OM6wing
 
 OM6wing.get_files()

examples/retrieve_results/monitors.py

@@ -1,4 +1,4 @@
-import flow360.component.v1 as fl
+import flow360.component.v1xxx as fl
 from flow360.examples import MonitorsAndSlices
 
 MonitorsAndSlices.get_files()

examples/retrieve_results/user_defined_dynamics.py

@@ -1,6 +1,6 @@
 from pylab import show
 
-import flow360.component.v1 as fl
+import flow360.component.v1xxx as fl
 from flow360.examples import OM6wingUserDefinedDynamics
 
 OM6wingUserDefinedDynamics.get_files()

examples/retrieve_results/volumetric_and_surface.py

@@ -2,7 +2,7 @@
 import tarfile
 import tempfile
 
-import flow360.component.v1 as fl
+import flow360.component.v1xxx as fl
 from flow360.examples import MonitorsAndSlices
 
 MonitorsAndSlices.get_files()

examples/run_case_from_example_mesh.py

@@ -1,9 +1,11 @@
-import flow360.component.v1 as fl
 from flow360.examples import OM6wing
+from flow360.component.volume_mesh import VolumeMesh
+from flow360.component.case import Case
+from flow360.component.v1.flow360_params import Flow360Params
 
-vm = fl.VolumeMesh.copy_from_example("2ad77a88-1676-4f89-8652-13bd7e34f257")
+vm = VolumeMesh.copy_from_example("2ad77a88-1676-4f89-8652-13bd7e34f257")
 
-params = fl.Flow360Params(OM6wing.case_json)
-case = fl.Case.create("OM6wing", params, vm.id, solver_version="release-24.2")
+params = Flow360Params(OM6wing.case_json)
+case = Case.create("OM6wing", params, vm.id, solver_version="release-24.2")
 case = case.submit()
 print(case)

examples/run_case_from_files.py

@@ -1,15 +1,17 @@
-import flow360.component.v1 as fl
 from flow360.examples import OM6wing
+from flow360.component.volume_mesh import VolumeMesh
+from flow360.component.v1.flow360_params import Flow360Params
+from flow360.component.case import Case
 
 OM6wing.get_files()
 
 # submit mesh
-volume_mesh = fl.VolumeMesh.from_file(OM6wing.mesh_filename, name="OM6wing-mesh")
+volume_mesh = VolumeMesh.from_file(OM6wing.mesh_filename, name="OM6wing-mesh")
 volume_mesh = volume_mesh.submit()
 print(volume_mesh)
 
 # # submit case using json file
-params = fl.Flow360Params(OM6wing.case_json)
-case = fl.Case.create("OM6wing", params, volume_mesh.id)
+params = Flow360Params(OM6wing.case_json)
+case = Case.create("OM6wing", params, volume_mesh.id)
 case = case.submit()
 print(case)

examples/run_case_from_inputs.py

@@ -1,4 +1,4 @@
-import flow360.component.v1 as fl
+import flow360.component.v1xxx as fl
 from flow360.examples import OM6wing
 
 OM6wing.get_files()

examples/run_case_no_submit_warning.py

@@ -1,15 +1,17 @@
-import flow360.component.v1 as fl
+from flow360.component.volume_mesh import VolumeMesh
+from flow360.component.case import Case
 from flow360.examples import OM6wing
+from flow360.component.v1.flow360_params import Flow360Params
 
 OM6wing.get_files()
 
 # submit mesh
-volume_mesh = fl.VolumeMesh.from_file(OM6wing.mesh_filename, name="OM6wing-mesh")
+volume_mesh = VolumeMesh.from_file(OM6wing.mesh_filename, name="OM6wing-mesh")
 # volume_mesh = volume_mesh.submit()
 print(volume_mesh)
 
 # # submit case using json file
-params = fl.Flow360Params(OM6wing.case_json)
-case = fl.Case.create("OM6wing", params, volume_mesh.id)
+params = Flow360Params(OM6wing.case_json)
+case = Case.create("OM6wing", params, volume_mesh.id)
 case = case.submit()
 print(case)