wrfrun 0.1.4__tar.gz → 0.1.5__tar.gz

{wrfrun-0.1.4 → wrfrun-0.1.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wrfrun
-Version: 0.1.4
+Version: 0.1.5
 Summary: wrfrun is a comprehensive toolkit for managing and using WRF
 Keywords: WRF
 Author-Email: Syize <syizeliu@gmail.com>

{wrfrun-0.1.4 → wrfrun-0.1.5}/meson.build

@@ -1,7 +1,7 @@
 project(
     'wrfrun',
     'c',
-    version: '0.1.4',
+    version: '0.1.5',
     license: 'BSD-3',
     meson_version: '>=0.64.0',
     default_options: ['warning_level=2'],

{wrfrun-0.1.4 → wrfrun-0.1.5}/pyproject.toml

@@ -4,7 +4,7 @@ requires = ["meson-python", "numpy<2.0.0"]
 
 [project]
 name = "wrfrun"
-version = "0.1.4"
+version = "0.1.5"
 readme = "README.md"
 license = { text = "GPL-3.0-or-later" }
 requires-python = '>=3.10'

{wrfrun-0.1.4 → wrfrun-0.1.5}/wrfrun/model/__init__.py

@@ -1,8 +1,5 @@
 from .geodata import *
 from .namelist import *
-from .ndown import *
 from .plot import *
 from .run import *
 from .utils import *
-from .wps import *
-from .wrf import *

{wrfrun-0.1.4 → wrfrun-0.1.5}/wrfrun/model/meson.build

@@ -4,13 +4,11 @@ py3.install_sources(
         'core.py',
         'geodata.py',
         'namelist.py',
-        'ndown.py',
         'plot.py',
         'run.py',
         'scheme.py',
-        'wps.py',
-        'wrf.py',
-        'wrfda.py',
     ],
     subdir: 'wrfrun/model'
-)
+)
+
+subdir('utils')

{wrfrun-0.1.4 → wrfrun-0.1.5}/wrfrun/model/run.py

@@ -8,10 +8,7 @@ from wrfrun.pbs import get_core_num
 from wrfrun.utils import check_path, logger
 from .core import exec_geogrid, exec_metgrid, exec_ndown, exec_real, exec_ungrib, exec_wrf
 from .namelist import generate_namelist_file, prepare_dfi_namelist
-from .ndown import process_after_ndown
-from .utils import model_preprocess, model_postprocess
-from .wps import get_wif_dir, get_wif_prefix
-from .wrf import reconcile_namelist_metgrid
+from .utils import model_preprocess, model_postprocess, process_after_ndown, get_wif_dir, get_wif_prefix, reconcile_namelist_metgrid
 
 
 def geogrid(geogrid_tbl_file: Union[str, None] = None):
@@ -48,8 +45,8 @@ def geogrid(geogrid_tbl_file: Union[str, None] = None):
 
     exec_geogrid(get_core_num())
 
-    model_postprocess(WPS_WORK_PATH, log_save_path, startswith="geogrid.log", copy_only=False)
-    model_postprocess(WPS_WORK_PATH, output_save_path, startswith="geo_em", outputs=["namelist.wps"])
+    model_postprocess(WPS_WORK_PATH, log_save_path, startswith="geogrid.log", copy_only=False, outputs="namelist.wps")
+    model_postprocess(WPS_WORK_PATH, output_save_path, startswith="geo_em")
 
     # for _file in listdir(WPS_WORK_PATH):
     #     if _file.startswith("geogrid.log"):
@@ -205,21 +202,9 @@ def real(metgrid_path: Union[str, None] = None):
 
     exec_real(get_core_num())
 
-    model_postprocess(WRF_WORK_PATH, output_save_path, startswith=["wrfbdy", "wrfinput", "wrflow"])
+    model_postprocess(WRF_WORK_PATH, output_save_path, startswith=("wrfbdy", "wrfinput", "wrflow"))
     model_postprocess(WRF_WORK_PATH, log_save_path, startswith="rsl.", outputs="namelist.input", copy_only=False)
 
-    # for _file in listdir(WRF_WORK_PATH):
-    #     if _file.startswith("rsl."):
-    #         move(f"{WRF_WORK_PATH}/{_file}", f"{log_save_path}/{_file}")
-    #     elif _file.startswith("wrfbdy"):
-    #         copyfile(f"{WRF_WORK_PATH}/{_file}", f"{output_save_path}/{_file}")
-    #     elif _file.startswith("wrfinput"):
-    #         copyfile(f"{WRF_WORK_PATH}/{_file}", f"{output_save_path}/{_file}")
-    #     elif _file.startswith("wrflow"):
-    #         copyfile(f"{WRF_WORK_PATH}/{_file}", f"{output_save_path}/{_file}")
-    #
-    # move(f"{WRF_WORK_PATH}/namelist.input", f"{log_save_path}/namelist.input")
-
     logger.info(f"All real output files have been copied to {output_save_path}")
 
 
@@ -272,18 +257,6 @@ def dfi(real_output_path: Union[str, None] = None, update_real_output=True):
     model_postprocess(WRF_WORK_PATH, log_save_path, startswith="rsl.", outputs="namelist.input", copy_only=False)
     model_postprocess(WRF_WORK_PATH, output_save_path, outputs="wrfinput_initialized_d01")
 
-    # for _file in listdir(WRF_WORK_PATH):
-    #     if _file.startswith("rsl."):
-    #         move(f"{WRF_WORK_PATH}/{_file}", f"{log_save_path}/{_file}")
-    #     elif _file == "wrfinput_initialized_d01":
-    #         move(f"{WRF_WORK_PATH}/{_file}", f"{output_save_path}/{_file}")
-    #         if update_real_output:
-    #             move(f"{real_output_path}/wrfinput_d01", f"{real_output_path}/wrfinput_d01_before_dfi")
-    #             copyfile(f"{output_save_path}/{_file}", f"{real_output_path}/wrfinput_d01")
-    #             logger.info(f"Replace real's output \"wrfinput_d01\" with output, old file has been renamed as \"wrfinput_d01_before_dfi\"")
-    #
-    # move(f"{WRF_WORK_PATH}/namelist.input", f"{log_save_path}/namelist.input")
-
     if update_real_output:
         move(f"{real_output_path}/wrfinput_d01", f"{real_output_path}/wrfinput_d01_before_dfi")
         copyfile(f"{output_save_path}/wrfinput_initialized_d01", f"{real_output_path}/wrfinput_d01")
@@ -336,14 +309,6 @@ def wrf(wrf_input_path: Union[str, None] = None):
     model_postprocess(WRF_WORK_PATH, log_save_path, startswith="rsl.", outputs="namelist.input", copy_only=False)
     model_postprocess(WRF_WORK_PATH, output_save_path, startswith="wrfout")
 
-    # for _file in listdir(WRF_WORK_PATH):
-    #     if _file.startswith("rsl."):
-    #         move(f"{WRF_WORK_PATH}/{_file}", f"{log_save_path}/{_file}")
-    #     elif _file.startswith("wrfout"):
-    #         copyfile(f"{WRF_WORK_PATH}/{_file}", f"{output_save_path}/{_file}")
-    #
-    # move(f"{WRF_WORK_PATH}/namelist.input", f"{log_save_path}/namelist.input")
-
     logger.info(f"All wrf output files have been copied to {output_save_path}")
 
 
@@ -397,12 +362,6 @@ def ndown(wrfout_file_path: str, wrfinput_file_path: str, update_namelist=True):
 
     model_postprocess(WRF_WORK_PATH, log_save_path, startswith="rsl.", outputs="namelist.input", copy_only=False)
 
-    # for _file in listdir(WRF_WORK_PATH):
-    #     if _file.startswith("rsl."):
-    #         move(f"{WRF_WORK_PATH}/{_file}", f"{log_save_path}/{_file}")
-    #
-    # move(f"{WRF_WORK_PATH}/namelist.input", f"{log_save_path}/namelist.input")
-
     logger.info(f"Rename ndown output `wrfinput_d02` to `wrfinput_d01`")
     move(f"{WRF_WORK_PATH}/wrfinput_d02", f"{output_save_path}/wrfinput_d01")
 

wrfrun-0.1.5/wrfrun/model/utils/__init__.py

@@ -0,0 +1,5 @@
+from .core import *
+from .ndown_utils import *
+from .wps_utils import *
+from .wrf_utils import *
+from .wrfda_utils import *

wrfrun-0.1.4/wrfrun/model/utils.py → wrfrun-0.1.5/wrfrun/model/utils/core.py

@@ -1,7 +1,7 @@
 from os import listdir, makedirs
 from os.path import basename, exists
 from shutil import copyfile, move
-from typing import Tuple, Union, List
+from typing import Tuple, Union, List, Iterable
 
 from wrfrun.utils import logger
 
@@ -84,26 +84,35 @@ def model_postprocess(output_dir: str, save_path: str, startswith: Union[None, s
     save_file_list = []
 
     if startswith is not None:
+        _list = []
         for _file in file_list:
             if _file.startswith(startswith):
-                save_file_list.append(_file)
+                _list.append(_file)
+        save_file_list += _list
+                
+        logger.debug(f"Collect files match `startswith`: {_list}")
 
     if endswith is not None:
+        _list = []
         for _file in file_list:
             if _file.endswith(endswith):
-                save_file_list.append(_file)
+                _list.append(_file)
+        save_file_list += _list
+                
+        logger.debug(f"Collect files match `endswith`: {_list}")
 
     if outputs is not None:
-        if isinstance(outputs, str):
-            save_file_list.append(basename(outputs))
+        if isinstance(outputs, str) and outputs in file_list:
+            save_file_list.append(outputs)
         else:
-            outputs = [basename(x) for x in outputs]
+            outputs = [x for x in outputs if x in file_list]
             save_file_list += outputs
 
     if len(save_file_list) < 1:
         return
 
     save_file_list = list(set(save_file_list))
+    logger.debug(f"Files to be processed: {save_file_list}")
 
     for _file in save_file_list:
         if copy_only:

wrfrun-0.1.5/wrfrun/model/utils/meson.build

@@ -0,0 +1,11 @@
+py3.install_sources(
+    [
+        '__init__.py',
+        'core.py',
+        'ndown_utils.py',
+        'wps_utils.py',
+        'wrf_utils.py',
+        'wrfda_utils.py',
+    ],
+    subdir: 'wrfrun/model/utils'
+)

wrfrun-0.1.4/wrfrun/model/wrf.py → wrfrun-0.1.5/wrfrun/model/utils/wrf_utils.py

@@ -3,7 +3,7 @@ from shutil import move
 
 from wrfrun.core import WRFRUNConfig, WRFRUNConstants, WRFRUNNamelist
 from wrfrun.utils import check_path, logger
-from .wps import get_metgrid_levels
+from .wps_utils import get_metgrid_levels
 
 
 def reconcile_namelist_metgrid(metgrid_path: str):

{wrfrun-0.1.4 → wrfrun-0.1.5}/wrfrun/run.py

@@ -12,8 +12,7 @@ from .core import WRFRUNConfig, WRFRUNConstants, WRFRunServer, WRFRunServerHandl
 from .data import prepare_wps_input_data
 from .model.namelist import prepare_wps_namelist, prepare_wrf_namelist, prepare_wrfda_namelist
 from .model.plot import plot_domain_area
-from .model.wps import clear_wps_logs
-from .model.wrf import clear_wrf_logs
+from .model.utils import clear_wps_logs, clear_wrf_logs
 from .pbs import in_pbs, prepare_pbs_script
 from .utils import call_subprocess, check_path, logger, logger_add_file_handler
 from .workspace import prepare_workspace