From 8d42b39e5e8d55b367275eda42f2d84641981054 Mon Sep 17 00:00:00 2001 From: Rosa Trancoso Date: Thu, 3 Aug 2023 13:28:59 +1200 Subject: [PATCH 1/2] alias for esmpy as ESMF --- core/geoMod.py | 2 +- core/regrid.py | 2 +- genForcing.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/geoMod.py b/core/geoMod.py index eda307c2..f5b1d8f0 100755 --- a/core/geoMod.py +++ b/core/geoMod.py @@ -1,6 +1,6 @@ import math -import ESMF +import esmpy as ESMF import numpy as np from netCDF4 import Dataset diff --git a/core/regrid.py b/core/regrid.py index f3224cca..7cb6a808 100755 --- a/core/regrid.py +++ b/core/regrid.py @@ -7,7 +7,7 @@ import traceback import time -import ESMF +import esmpy as ESMF import numpy as np from core import err_handler diff --git a/genForcing.py b/genForcing.py index 9d48735f..f5b6b7cb 100755 --- a/genForcing.py +++ b/genForcing.py @@ -1,7 +1,7 @@ import argparse import os -import ESMF +import esmpy as ESMF from core import config from core import err_handler From 8e66616cd67ecf09131a84a5ef21d3d29e3888c3 Mon Sep 17 00:00:00 2001 From: Rosa Trancoso Date: Thu, 3 Aug 2023 13:29:09 +1200 Subject: [PATCH 2/2] update deprecated numpy functions --- core/config.py | 2 +- core/disaggregateMod.py | 6 +++--- core/downscale.py | 6 +++--- core/parallel.py | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/core/config.py b/core/config.py index 515832b8..ce570cce 100755 --- a/core/config.py +++ b/core/config.py @@ -681,7 +681,7 @@ def read_config(self): # Read in the temperature downscaling options. # Create temporary array to hold flags of if we need input parameter files. - param_flag = np.empty([len(self.input_forcings)], np.int) + param_flag = np.empty([len(self.input_forcings)], int) param_flag[:] = 0 try: self.t2dDownscaleOpt = json.loads(config['Downscaling']['TemperatureDownscaling']) diff --git a/core/disaggregateMod.py b/core/disaggregateMod.py index 89cfe0bc..7183df95 100755 --- a/core/disaggregateMod.py +++ b/core/disaggregateMod.py @@ -113,9 +113,9 @@ def ext_ana_disaggregate(input_forcings, supplemental_precip, config_options, mp ana_sum = np.array([],dtype=np.float32) target_data = np.array([],dtype=np.float32) - ana_all_zeros = np.array([],dtype=np.bool) - ana_no_zeros = np.array([],dtype=np.bool) - target_data_no_zeros = np.array([],dtype=np.bool) + ana_all_zeros = np.array([],dtype=bool) + ana_no_zeros = np.array([],dtype=bool) + target_data_no_zeros = np.array([],dtype=bool) if mpi_config.rank == 0: config_options.statusMsg = f"Performing hourly disaggregation of {supplemental_precip.file_in2}" err_handler.log_msg(config_options, mpi_config) diff --git a/core/downscale.py b/core/downscale.py index 281ab119..b8c94b68 100755 --- a/core/downscale.py +++ b/core/downscale.py @@ -737,9 +737,9 @@ def TOPO_RAD_ADJ_DRVR(GeoMetaWrfHydro,input_forcings,COSZEN,declin,solcon,hrang2 COSZEN[np.where(COSZEN < 1E-4)] = 1E-4 - corr_frac = np.empty([ny, nx], np.int) - # shadow_mask = np.empty([ny,nx],np.int) - diffuse_frac = np.empty([ny, nx], np.int) + corr_frac = np.empty([ny, nx], int) + # shadow_mask = np.empty([ny,nx],int) + diffuse_frac = np.empty([ny, nx], int) corr_frac[:, :] = 0 diffuse_frac[:, :] = 0 # shadow_mask[:,:] = 0 diff --git a/core/parallel.py b/core/parallel.py index 910b578a..f93ef8d5 100755 --- a/core/parallel.py +++ b/core/parallel.py @@ -140,7 +140,7 @@ def scatter_array_scatterv_no_cache(self,geoMeta,src_array,ConfigOptions): data_type_flag = 1 if src_array.dtype == np.float64: data_type_flag = 2 - if src_array.dtype == np.bool: + if src_array.dtype == bool: data_type_flag = 3 # Broadcast the data_type_flag to other processors @@ -206,7 +206,7 @@ def scatter_array_scatterv_no_cache(self,geoMeta,src_array,ConfigOptions): recvbuf=np.empty([counts[self.rank]],np.float32) elif data_type_flag == 3: data_type = MPI.BOOL - recvbuf = np.empty([counts[self.rank]], np.bool) + recvbuf = np.empty([counts[self.rank]], bool) else: data_type = MPI.DOUBLE recvbuf = np.empty([counts[self.rank]], np.float64)