oafuncs 0.0.98.47__tar.gz → 0.0.98.49__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (52) hide show
  1. {oafuncs-0.0.98.47/oafuncs.egg-info → oafuncs-0.0.98.49}/PKG-INFO +1 -1
  2. {oafuncs-0.0.98.47 → oafuncs-0.0.98.49}/oafuncs/oa_linux.py +10 -5
  3. {oafuncs-0.0.98.47 → oafuncs-0.0.98.49/oafuncs.egg-info}/PKG-INFO +1 -1
  4. {oafuncs-0.0.98.47 → oafuncs-0.0.98.49}/setup.py +1 -1
  5. {oafuncs-0.0.98.47 → oafuncs-0.0.98.49}/LICENSE.txt +0 -0
  6. {oafuncs-0.0.98.47 → oafuncs-0.0.98.49}/MANIFEST.in +0 -0
  7. {oafuncs-0.0.98.47 → oafuncs-0.0.98.49}/README.md +0 -0
  8. {oafuncs-0.0.98.47 → oafuncs-0.0.98.49}/oafuncs/__init__.py +0 -0
  9. {oafuncs-0.0.98.47 → oafuncs-0.0.98.49}/oafuncs/_data/hycom.png +0 -0
  10. {oafuncs-0.0.98.47 → oafuncs-0.0.98.49}/oafuncs/_data/oafuncs.png +0 -0
  11. {oafuncs-0.0.98.47 → oafuncs-0.0.98.49}/oafuncs/_script/cprogressbar.py +0 -0
  12. {oafuncs-0.0.98.47 → oafuncs-0.0.98.49}/oafuncs/_script/data_interp.py +0 -0
  13. {oafuncs-0.0.98.47 → oafuncs-0.0.98.49}/oafuncs/_script/email.py +0 -0
  14. {oafuncs-0.0.98.47 → oafuncs-0.0.98.49}/oafuncs/_script/netcdf_merge.py +0 -0
  15. {oafuncs-0.0.98.47 → oafuncs-0.0.98.49}/oafuncs/_script/netcdf_modify.py +0 -0
  16. {oafuncs-0.0.98.47 → oafuncs-0.0.98.49}/oafuncs/_script/netcdf_write.py +0 -0
  17. {oafuncs-0.0.98.47 → oafuncs-0.0.98.49}/oafuncs/_script/parallel.py +0 -0
  18. {oafuncs-0.0.98.47 → oafuncs-0.0.98.49}/oafuncs/_script/parallel_bak.py +0 -0
  19. {oafuncs-0.0.98.47 → oafuncs-0.0.98.49}/oafuncs/_script/plot_dataset.py +0 -0
  20. {oafuncs-0.0.98.47 → oafuncs-0.0.98.49}/oafuncs/_script/replace_file_content.py +0 -0
  21. {oafuncs-0.0.98.47 → oafuncs-0.0.98.49}/oafuncs/oa_cmap.py +0 -0
  22. {oafuncs-0.0.98.47 → oafuncs-0.0.98.49}/oafuncs/oa_data.py +0 -0
  23. {oafuncs-0.0.98.47 → oafuncs-0.0.98.49}/oafuncs/oa_date.py +0 -0
  24. {oafuncs-0.0.98.47 → oafuncs-0.0.98.49}/oafuncs/oa_down/User_Agent-list.txt +0 -0
  25. {oafuncs-0.0.98.47 → oafuncs-0.0.98.49}/oafuncs/oa_down/__init__.py +0 -0
  26. {oafuncs-0.0.98.47 → oafuncs-0.0.98.49}/oafuncs/oa_down/hycom_3hourly.py +0 -0
  27. {oafuncs-0.0.98.47 → oafuncs-0.0.98.49}/oafuncs/oa_down/idm.py +0 -0
  28. {oafuncs-0.0.98.47 → oafuncs-0.0.98.49}/oafuncs/oa_down/literature.py +0 -0
  29. {oafuncs-0.0.98.47 → oafuncs-0.0.98.49}/oafuncs/oa_down/read_proxy.py +0 -0
  30. {oafuncs-0.0.98.47 → oafuncs-0.0.98.49}/oafuncs/oa_down/test_ua.py +0 -0
  31. {oafuncs-0.0.98.47 → oafuncs-0.0.98.49}/oafuncs/oa_down/user_agent.py +0 -0
  32. {oafuncs-0.0.98.47 → oafuncs-0.0.98.49}/oafuncs/oa_draw.py +0 -0
  33. {oafuncs-0.0.98.47 → oafuncs-0.0.98.49}/oafuncs/oa_file.py +0 -0
  34. {oafuncs-0.0.98.47 → oafuncs-0.0.98.49}/oafuncs/oa_geo.py +0 -0
  35. {oafuncs-0.0.98.47 → oafuncs-0.0.98.49}/oafuncs/oa_help.py +0 -0
  36. {oafuncs-0.0.98.47 → oafuncs-0.0.98.49}/oafuncs/oa_model/__init__.py +0 -0
  37. {oafuncs-0.0.98.47 → oafuncs-0.0.98.49}/oafuncs/oa_model/roms/__init__.py +0 -0
  38. {oafuncs-0.0.98.47 → oafuncs-0.0.98.49}/oafuncs/oa_model/roms/test.py +0 -0
  39. {oafuncs-0.0.98.47 → oafuncs-0.0.98.49}/oafuncs/oa_model/wrf/__init__.py +0 -0
  40. {oafuncs-0.0.98.47 → oafuncs-0.0.98.49}/oafuncs/oa_model/wrf/little_r.py +0 -0
  41. {oafuncs-0.0.98.47 → oafuncs-0.0.98.49}/oafuncs/oa_nc.py +0 -0
  42. {oafuncs-0.0.98.47 → oafuncs-0.0.98.49}/oafuncs/oa_python.py +0 -0
  43. {oafuncs-0.0.98.47 → oafuncs-0.0.98.49}/oafuncs/oa_sign/__init__.py +0 -0
  44. {oafuncs-0.0.98.47 → oafuncs-0.0.98.49}/oafuncs/oa_sign/meteorological.py +0 -0
  45. {oafuncs-0.0.98.47 → oafuncs-0.0.98.49}/oafuncs/oa_sign/ocean.py +0 -0
  46. {oafuncs-0.0.98.47 → oafuncs-0.0.98.49}/oafuncs/oa_sign/scientific.py +0 -0
  47. {oafuncs-0.0.98.47 → oafuncs-0.0.98.49}/oafuncs/oa_tool.py +0 -0
  48. {oafuncs-0.0.98.47 → oafuncs-0.0.98.49}/oafuncs.egg-info/SOURCES.txt +0 -0
  49. {oafuncs-0.0.98.47 → oafuncs-0.0.98.49}/oafuncs.egg-info/dependency_links.txt +0 -0
  50. {oafuncs-0.0.98.47 → oafuncs-0.0.98.49}/oafuncs.egg-info/requires.txt +0 -0
  51. {oafuncs-0.0.98.47 → oafuncs-0.0.98.49}/oafuncs.egg-info/top_level.txt +0 -0
  52. {oafuncs-0.0.98.47 → oafuncs-0.0.98.49}/setup.cfg +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: oafuncs
3
- Version: 0.0.98.47
3
+ Version: 0.0.98.49
4
4
  Summary: Oceanic and Atmospheric Functions
5
5
  Home-page: https://github.com/Industry-Pays/OAFuncs
6
6
  Author: Kun Liu
@@ -54,10 +54,15 @@ def query_queue(need_node=1, queue_list =['dcu','bigmem','cpu_parallel','cpu_sin
54
54
  queue_dict = get_queue_node()
55
55
  hs = None
56
56
  for my_queue in queue_list:
57
- if my_queue in queue_dict and queue_dict[my_queue] >= need_node:
58
- # slurm_file = f'../run.slurm.{my_queue}'
59
- hs = my_queue
60
- break
57
+ if my_queue == 'cpu_parallel':
58
+ for mq in ['cpu_parallel','cpu_parallel*']:
59
+ if mq in queue_dict and queue_dict[mq] >= need_node:
60
+ hs = 'cpu_parallel'
61
+ break
62
+ else:
63
+ if my_queue in queue_dict and queue_dict[my_queue] >= need_node:
64
+ hs = my_queue
65
+ break
61
66
  return hs
62
67
 
63
68
  def running_jobs():
@@ -116,7 +121,7 @@ def submit_job(working_dir=None, script_tmp='run.slurm', script_run='run.slurm',
116
121
  while True:
117
122
  if job_id in running_jobs():
118
123
  print(f'Time: {datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")}')
119
- print(f'任务{job_id}正在任务队列中...')
124
+ print(f'任务{job_id}正在队列中...')
120
125
  time.sleep(60)
121
126
  else:
122
127
  print(f'任务{job_id}已完成!')
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: oafuncs
3
- Version: 0.0.98.47
3
+ Version: 0.0.98.49
4
4
  Summary: Oceanic and Atmospheric Functions
5
5
  Home-page: https://github.com/Industry-Pays/OAFuncs
6
6
  Author: Kun Liu
@@ -18,7 +18,7 @@ URL = "https://github.com/Industry-Pays/OAFuncs"
18
18
  EMAIL = "liukun0312@stu.ouc.edu.cn"
19
19
  AUTHOR = "Kun Liu"
20
20
  REQUIRES_PYTHON = ">=3.10.0" # 2025/03/13
21
- VERSION = "0.0.98.47"
21
+ VERSION = "0.0.98.49"
22
22
 
23
23
  # What packages are required for this module to be executed?
24
24
  REQUIRED = [
File without changes
File without changes
File without changes
File without changes