diff --git a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/pyMoist/constants.py b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/pyMoist/constants.py index b320be0bf..edd53e94a 100644 --- a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/pyMoist/constants.py +++ b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/pyMoist/constants.py @@ -4,6 +4,7 @@ import os from ndsl.dsl.typing import Float, Int +from ndsl import ndsl_log _f32 = np.float32 @@ -13,14 +14,14 @@ NUMBER_OF_TRACERS = Int(23) # Define number of tracers in UW -# NOTE depreciate this, change all references of NCNST to NUMBER_OF_TRACERS +# NOTE deprecate this, change all references of NCNST to NUMBER_OF_TRACERS EXPERIMENT_TRACERS = {"bomex": 18, "armtwp_ice": 18, "gcm-fp": 23} EXP_NAME = os.getenv("EXP_NAME", "") -if EXP_NAME == "": - raise ValueError("EXP_NAME env var is not set - experiment unknown.") if EXP_NAME not in EXPERIMENT_TRACERS: - raise ValueError(f"Experiment {EXP_NAME} unknown - tracers can't be initialized.") -NCNST = _i32(EXPERIMENT_TRACERS[EXP_NAME]) + ndsl_log.warning(f"Experiment unknown: choose one of {list(EXPERIMENT_TRACERS.keys())}. Falling back to default number of tracers ({NUMBER_OF_TRACERS}).") + NCNST = NUMBER_OF_TRACERS +else: + NCNST = _i32(EXPERIMENT_TRACERS[EXP_NAME]) # MAPL_UNDEF is set to 1E15 in the Fortran # We keep it as is for now to match 11.5.2 GEOS diff --git a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/pyMoist/convection/GF_2020/GF_2020.py b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/pyMoist/convection/GF_2020/GF_2020.py index b03e2fbc9..53ba66199 100644 --- a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/pyMoist/convection/GF_2020/GF_2020.py +++ b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/pyMoist/convection/GF_2020/GF_2020.py @@ -100,7 +100,7 @@ def __call__(self, state: GF2020State, convection_tracers: ConvectionTracers): Args: state (GF2020State): State of the overarching model - not all fields from the model are required convection_tracers (ConvectionTracers): Collection of tracers from the rest of the model which - will be updated within convection. These may come from a variaty of sources, and need to be + will be updated within convection. These may come from a variety of sources, and need to be collected into the expected ConvectionTracers data type before being passed down. """ # flag to stop convection scheme for single column models diff --git a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/pyMoist/convection/GF_2020/cumulus_parameterization/air_density.py b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/pyMoist/convection/GF_2020/cumulus_parameterization/air_density.py index 5a5c5ac5c..d026d1aab 100644 --- a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/pyMoist/convection/GF_2020/cumulus_parameterization/air_density.py +++ b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/pyMoist/convection/GF_2020/cumulus_parameterization/air_density.py @@ -21,7 +21,7 @@ def hydrostatic_air_density( plume (Int) """ with computation(PARALLEL), interval(...): - # prefil with 0 + # prefill with 0 air_density = 0.0 with computation(PARALLEL), interval(0, -1): diff --git a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/pyMoist/convection/GF_2020/cumulus_parameterization/convective_tracers.py b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/pyMoist/convection/GF_2020/cumulus_parameterization/convective_tracers.py index debe9bcb3..3d28cb9da 100644 --- a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/pyMoist/convection/GF_2020/cumulus_parameterization/convective_tracers.py +++ b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/pyMoist/convection/GF_2020/cumulus_parameterization/convective_tracers.py @@ -226,7 +226,7 @@ def updraft_chemistry( elif USE_TRACER_SCAVENGE == 2: option_not_implemented = True - # formulation 3 - orignal GF conv_par + # formulation 3 - original GF conv_par elif USE_TRACER_SCAVENGE == 3: option_not_implemented = True @@ -311,7 +311,7 @@ def downdraft_chemistry( with computation(FORWARD), interval(0, 1): if plume != cumulus_parameterization_constants.SHALLOW and error_code[0, 0][plume] == 0: - # fration of the total rain that was evaporated + # fraction of the total rain that was evaporated evaporation_fraction: FloatFieldIJ = -total_normalized_integrated_evaporate_forced / ( 1.0e-16 + total_normalized_integrated_condensate_forced[0, 0][plume] ) @@ -858,7 +858,7 @@ def __call__( chemistry_tracers_total_pw_updraft (Quantity) chemistry_tracers_total_pw_downdraft (Quantity) convection_tracers (ConvectionTracers): Collection of tracers from the rest of the model which - will be updated within convection. These may come from a variaty of sources, and need to be + will be updated within convection. These may come from a variety of sources, and need to be collected into the expected ConvectionTracers data type before being passed down. plume_dependent_constants (GF2020PlumeDependentConstants) @@ -956,7 +956,7 @@ def __call__( and self.cumulus_parameterization_config.ALP1 > 0.0 ): for tracer in range(self.config.NUMBER_OF_TRACERS): - # NOTE, this code is an extention of the vertical transport section for option + # NOTE, this code is an extension of the vertical transport section for option # which executes when (USE_FLUX_FORM == 1 and ALP1 > 0.0) self._tridiag( m=cloud_top_level, diff --git a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/pyMoist/convection/GF_2020/cumulus_parameterization/cumulus_parameterization.py b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/pyMoist/convection/GF_2020/cumulus_parameterization/cumulus_parameterization.py index ce1c5a77c..3c07560a7 100644 --- a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/pyMoist/convection/GF_2020/cumulus_parameterization/cumulus_parameterization.py +++ b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/pyMoist/convection/GF_2020/cumulus_parameterization/cumulus_parameterization.py @@ -40,7 +40,7 @@ ) from pyMoist.convection.GF_2020.cumulus_parameterization.get_levels import ( cloud_top_checks, - find_detrainmet_start_level, + find_detrainment_start_level, find_highest_moist_static_energy_level, find_lcl, find_maximum_updraft_origin_level, @@ -64,7 +64,7 @@ ) from pyMoist.convection.GF_2020.cumulus_parameterization.precip import ( PrecipFactor, - cloud_dissapation, + cloud_dissipation, get_precip_fluxes, partition_liquid_ice, rain_evaporation_below_cloud_base, @@ -107,7 +107,7 @@ class GF2020CumulusParameterization(NDSLRuntime): """GF220 cumulus parameterization core. This component of GF2020 contains all of the science code related - to deep conveection, including (but not limited to): + to deep convection, including (but not limited to): - updraft dynamics - downdraft dynamics - entrainment/detrainment @@ -118,7 +118,7 @@ class GF2020CumulusParameterization(NDSLRuntime): Most pieces are called directly, but more complicated parts are buried into their own subclass. - Not all parts/options are fully implemented, some have been implemetned without full testing. + Not all parts/options are fully implemented, some have been implemented without full testing. ALL of these untested/unimplemented paths are locked behind an NotImplementedError, with an appropriate message pointing to the configuration option that is causing the error. """ @@ -167,7 +167,6 @@ def __init__( # initialize all the subclasses self._setup = Setup( stencil_factory=stencil_factory, - quantity_factory=quantity_factory, config=config, cumulus_parameterization_config=cumulus_parameterization_config, ) @@ -206,8 +205,8 @@ def __init__( compute_dims=[I_DIM, J_DIM, K_DIM], ) - self._find_detrainmet_start_level = stencil_factory.from_dims_halo( - func=find_detrainmet_start_level, + self._find_detrainment_start_level = stencil_factory.from_dims_halo( + func=find_detrainment_start_level, compute_dims=[I_DIM, J_DIM, K_DIM], ) @@ -263,7 +262,7 @@ def __init__( }, ) - self._downdraft_entraiment_profiles = stencil_factory.from_dims_halo( + self._downdraft_entrainment_profiles = stencil_factory.from_dims_halo( func=downdraft_entrainment_profiles, compute_dims=[I_DIM, J_DIM, K_DIM], externals={"DOWNDRAFT": cumulus_parameterization_config.DOWNDRAFT}, @@ -400,14 +399,12 @@ def __init__( self._updraft_initial_workfunctions = UpdraftInitialWorkfunctions( stencil_factory=stencil_factory, - quantity_factory=quantity_factory, config=config, cumulus_parameterization_config=cumulus_parameterization_config, ) self._updraft_cin = UpdraftCIN( stencil_factory=stencil_factory, - quantity_factory=quantity_factory, config=config, cumulus_parameterization_config=cumulus_parameterization_config, ) @@ -437,7 +434,6 @@ def __init__( self._downdraft_windshear = DowndraftWindShear( stencil_factory=stencil_factory, - quantity_factory=quantity_factory, config=config, cumulus_parameterization_config=cumulus_parameterization_config, ) @@ -481,9 +477,8 @@ def __init__( cumulus_parameterization_config=cumulus_parameterization_config, ) - self._update_workfunction_and_precipitaiton_ensemble = UpdateWorkfunctionAndPrecipitationEnsemble( + self._update_workfunction_and_precipitation_ensemble = UpdateWorkfunctionAndPrecipitationEnsemble( stencil_factory=stencil_factory, - quantity_factory=quantity_factory, config=config, cumulus_parameterization_config=cumulus_parameterization_config, ) @@ -521,8 +516,8 @@ def __init__( compute_dims=[I_DIM, J_DIM, K_DIM], ) - self._cloud_dissapation = stencil_factory.from_dims_halo( - func=cloud_dissapation, + self._cloud_dissipation = stencil_factory.from_dims_halo( + func=cloud_dissipation, compute_dims=[I_DIM, J_DIM, K_DIM], externals={ "USE_CLOUD_DISSIPATION": cumulus_parameterization_config.USE_CLOUD_DISSIPATION, @@ -582,7 +577,7 @@ def __call__( This state is initialized in the GF2020Setup class. The overarching model state cannot be passed to the GF2020CumulusParameterizationState because of incompatible K-axis orientation. convection_tracers (ConvectionTracers): Collection of tracers from the rest of the model which - will be updated within convection. These may come from a variaty of sources, and need to be + will be updated within convection. These may come from a variety of sources, and need to be collected into the expected ConvectionTracers data type before being passed down. """ if self.cumulus_parameterization_config.SHALLOW_MID_DEEP: @@ -814,7 +809,7 @@ def __call__( plume=self.plume_dependent_constants.PLUME_INDEX, ) - self._find_detrainmet_start_level( + self._find_detrainment_start_level( geopotential_height=self.locals.geopotential_height_cloud_levels_forced, topography_height_no_negative=state.input_output.topography_height_no_negative, error_code=state.output.error_code, @@ -884,8 +879,8 @@ def __call__( ocean_fraction=state.input.ocean_fraction, updraft_origin_level=state.output.updraft_origin_level, p=state.input_output.p_forced, - environmenet_moist_static_energy=self.locals.environment_moist_static_energy_cloud_levels, - environmenet_moist_static_energy_forced=self.locals.environment_moist_static_energy_cloud_levels_forced, + environment_moist_static_energy=self.locals.environment_moist_static_energy_cloud_levels, + environment_moist_static_energy_forced=self.locals.environment_moist_static_energy_cloud_levels_forced, t_perturbation=state.output.t_perturbation, moist_static_energy_origin_level=self.locals.moist_static_energy_origin_level, moist_static_energy_origin_level_forced=self.locals.moist_static_energy_origin_level_forced, @@ -956,7 +951,7 @@ def __call__( # NOTE deep ✅ # NOTE mid ✅ # NOTE shallow ✅ - self._downdraft_entraiment_profiles( + self._downdraft_entrainment_profiles( lateral_entrainment_rate=state.input.lateral_entrainment_rate, entrainment_rate_downdraft=self.locals.entrainment_rate_downdraft, detrainment_function_downdraft=self.locals.detrainment_function_downdraft, @@ -977,8 +972,8 @@ def __call__( ocean_fraction=state.input.ocean_fraction, updraft_origin_level=state.output.updraft_origin_level, p=state.input_output.p_forced, - environmenet_moist_static_energy=self.locals.environment_moist_static_energy_cloud_levels, - environmenet_moist_static_energy_forced=self.locals.environment_moist_static_energy_cloud_levels_forced, + environment_moist_static_energy=self.locals.environment_moist_static_energy_cloud_levels, + environment_moist_static_energy_forced=self.locals.environment_moist_static_energy_cloud_levels_forced, t_perturbation=state.output.t_perturbation, moist_static_energy_origin_level=self.locals.moist_static_energy_origin_level, moist_static_energy_origin_level_forced=self.locals.moist_static_energy_origin_level_forced, @@ -1516,12 +1511,12 @@ def __call__( # NOTE shallow ✅ self._convection_trigger( error_code=state.output.error_code, - convective_scale_velosity=state.input_output.convective_scale_velocity, + convective_scale_velocity=state.input_output.convective_scale_velocity, cin_0=self.locals.cin_0, plume=self.plume_dependent_constants.PLUME_INDEX, ) - # calculate downdraft air temperature for vertical velocitys + # calculate downdraft air temperature for vertical velocities # NOTE test GF2020_CumulusParameterization_DowndraftTemperature_{plume}: # NOTE deep ✅ # NOTE mid ✅ @@ -1573,8 +1568,8 @@ def __call__( # determine downdraft strength in terms of windshear # NOTE test GF2020_CumulusParameterization_DowndraftWindShear_{plume}: - # NOTE deep ❌ one field - three points, used to be ✅ - # NOTE mid ❌ one field 14 pointss, used to be ❌ one field, one point (0.17%), 4 ULP + # NOTE deep ✅ + # NOTE mid ✅ # NOTE shallow ✅ self._downdraft_windshear( error_code=state.output.error_code, @@ -1814,7 +1809,7 @@ def __call__( # NOTE deep ✅ # NOTE mid ✅ # NOTE shallow ✅ - self._update_workfunction_and_precipitaiton_ensemble( + self._update_workfunction_and_precipitation_ensemble( error_code=state.output.error_code, updraft_origin_level=state.output.updraft_origin_level, updraft_lfc_level=state.output.updraft_lfc_level, @@ -1995,7 +1990,7 @@ def __call__( # NOTE deep ✅ # NOTE mid ✅ # NOTE shallow ✅ - self._cloud_dissapation( + self._cloud_dissipation( error_code=state.output.error_code, updraft_lfc_level=state.output.updraft_lfc_level, cloud_top_level=state.output.cloud_top_level, diff --git a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/pyMoist/convection/GF_2020/cumulus_parameterization/downdraft.py b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/pyMoist/convection/GF_2020/cumulus_parameterization/downdraft.py index 754f96e23..c6c6aebc1 100644 --- a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/pyMoist/convection/GF_2020/cumulus_parameterization/downdraft.py +++ b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/pyMoist/convection/GF_2020/cumulus_parameterization/downdraft.py @@ -91,15 +91,15 @@ def get_downdraft_origin_level( MINIMUM_DEPTH: Float, plume: Int, ): - """Determine the leve at which the downdraft begins. + """Determine the level at which the downdraft begins. For shallow plume, return 0 (downdraft is disabled). For mid and deep plume, perform full calculation. This stencil contains an open-ended vertical solver with a nested vertical loop. - To implement this properly, the aforrementioned computation has been constructed on an interval(0, 1), + To implement this properly, the aforementioned computation has been constructed on an interval(0, 1), and all K read/writes have been done with absolute indexes or relative offsets. The alternative is to break this into a series of stencils and pass data between them using a much larger number of locals. - Following a decision made in a prior section of the GF2020 cumulus parameterizaiton core + Following a decision made in a prior section of the GF2020 cumulus parameterization core see (get_convective_cloud_base_level), this has been implemented as one stencil using the inefficient interval to preserve code readability and facilitate an easy future transition to another implementation, once the required tool/feature has been implemented. @@ -266,7 +266,7 @@ def downdraft_mass_flux( _, _min_loc = column_min(p_internal, 0, downdraft_origin_level[0, 0][plume]) min_loc: IntFieldIJ = _min_loc - # this alpha constrains the location of the maximun ZU to be at "kb_adj" vertical level + # this alpha constrains the location of the maximum ZU to be at "kb_adj" vertical level alpha: FloatFieldIJ = 1.0 + (beta - 1.0) * ( (min_loc + 1) / (downdraft_origin_level[0, 0][plume] + 2) ) / (1.0 - ((min_loc + 1) / (downdraft_origin_level[0, 0][plume] + 2))) @@ -936,7 +936,7 @@ def downdraft_windshear( with computation(FORWARD), interval(...): - if plume != 0 and error_code[0, 0][plume] == 0 and K > updraft_lfc_level[0, 0][plume] and K <= cloud_top_level[0, 0][plume]: + if plume != 0 and error_code[0, 0][plume] == 0 and K >= updraft_lfc_level[0, 0][plume] and K <= cloud_top_level[0, 0][plume]: dp = p_forced - p_forced[0, 0, 1] vws = ( vws @@ -1024,7 +1024,7 @@ def update_epsilon_forced( epsilon_forced: FloatFieldIJ_Plume, plume: Int, ): - """Tune precipitation effeciency (epsilon_computed) based on the scale dependence factor. + """Tune precipitation efficiency (epsilon_computed) based on the scale dependence factor. Args: error_code (IntFieldIJ_Plume) @@ -1046,7 +1046,7 @@ def update_epsilon_forced( class DowndraftOriginLevel(NDSLRuntime): - """Determine the leve at which the downdraft begins.""" + """Determine the level at which the downdraft begins.""" def __init__( self, @@ -1143,14 +1143,13 @@ def __call__(self, *args, **kwds): class DowndraftWindShear(NDSLRuntime): - """Calculate wint shear within the downdraft. Quantify the effect of wind shear within the downdraft - on precipitation into a "precip effeciency" field (epsilon_computed). + """Calculate wind shear within the downdraft. Quantify the effect of wind shear within the downdraft + on precipitation into a "precip efficiency" field (epsilon_computed). """ def __init__( self, stencil_factory: StencilFactory, - quantity_factory: QuantityFactory, config: GF2020Config, cumulus_parameterization_config: GF2020CumulusParameterizationConfig, ): diff --git a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/pyMoist/convection/GF_2020/cumulus_parameterization/environment.py b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/pyMoist/convection/GF_2020/cumulus_parameterization/environment.py index 81472d7a5..f1267eac6 100644 --- a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/pyMoist/convection/GF_2020/cumulus_parameterization/environment.py +++ b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/pyMoist/convection/GF_2020/cumulus_parameterization/environment.py @@ -158,7 +158,7 @@ def get_interp( t_new (Float) vapor_forced (Float) """ - # bunch of interal constants, not to be used outside of this function + # bunch of internal constants, not to be used outside of this function rd = 287.06 rv = 461.52 rcpd = 1004.71 diff --git a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/pyMoist/convection/GF_2020/cumulus_parameterization/get_levels.py b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/pyMoist/convection/GF_2020/cumulus_parameterization/get_levels.py index 7ce30baed..4bea0a422 100644 --- a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/pyMoist/convection/GF_2020/cumulus_parameterization/get_levels.py +++ b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/pyMoist/convection/GF_2020/cumulus_parameterization/get_levels.py @@ -47,7 +47,7 @@ def find_maximum_updraft_origin_level( stop_computation: BoolFieldIJ = True -def find_detrainmet_start_level( +def find_detrainment_start_level( geopotential_height: FloatField, topography_height_no_negative: FloatFieldIJ, error_code: IntFieldIJ_Plume, @@ -82,7 +82,7 @@ def find_highest_moist_static_energy_level( updraft_origin_level: IntFieldIJ_Plume, plume: Int, ): - """Detemine the level with the highest moist static energy. This level will + """Determine the level with the highest moist static energy. This level will be used as the starting point for any subsequent updrafts Args: @@ -93,7 +93,7 @@ def find_highest_moist_static_energy_level( plume (Int) """ with computation(FORWARD), interval(0, 1): - # prefil output + # prefill output updraft_origin_level[0, 0][plume] = 0 if plume == cumulus_parameterization_constants.SHALLOW: @@ -304,7 +304,7 @@ def find_lcl( # check to see if cloud is buoyant using fritsch-chappell trigger # function described in kain and fritsch (1992)...w0avg is an - # aproximate value for the running-mean grid-scale vertical + # approximate value for the running-mean grid-scale vertical # velocity, which gives smoother fields of convective initiation # than the instantaneous value...formula relating temperature # perturbation to vertical velocity has been used with the most @@ -340,7 +340,7 @@ def set_start_level(lcl_level: IntFieldIJ_Plume, start_level: IntFieldIJ, plume: start_level (IntFieldIJ) plume (Int) """ - with computation(FORWARD), interval(...): + with computation(FORWARD), interval(0, 1): start_level = lcl_level[0, 0][plume] @@ -432,23 +432,14 @@ def get_convective_cloud_base_level( with computation(PARALLEL), interval(...): # prefill some fields cloud_moist_static_energy_forced_transported = 0.0 - dby = 0.0 - - # make garbage field so the get_cloud_boundary_conditions call does not break - # this is never touched so long as compute_perturbation=False - dummy_field_no_read = 0.0 with computation(FORWARD), interval(0, 1): # internal constants frh_crit_O = 0.7 frh_crit_L = 0.7 - # prefill some fields + # prefill some fields / initialize some 2d temporaries start_level_internal: IntFieldIJ = 0 - cap_max_internal = cap_max - - # initialize some 2d temporaries - dzh: FloatFieldIJ = 0.0 found_level: BoolFieldIJ = False with computation(FORWARD), interval(0, 1): @@ -460,7 +451,7 @@ def get_convective_cloud_base_level( with computation(PARALLEL), interval(...): if error_code[0, 0][plume] == 0 and K <= start_level_internal: cloud_moist_static_energy_forced_transported = ( - moist_static_energy_origin_level_forced # assumed no entraiment between these layers + moist_static_energy_origin_level_forced # assumed no entrainment between these layers ) # determine the level of convective cloud base (updraft_lfc_level) @@ -470,6 +461,7 @@ def get_convective_cloud_base_level( updraft_lfc_level[0, 0][plume] = maximum_updraft_origin_level + 3 negative_buoyancy_depth = 0.0 frh_lfc = 0.0 + cap_max_internal = cap_max if error_code[0, 0][plume] == 0: continue_outer_while_loop = True while error_code[0, 0][plume] == 0 and continue_outer_while_loop == True: @@ -523,7 +515,7 @@ def get_convective_cloud_base_level( if MOIST_TRIGGER == 1: frh_lfc = 0.0 - dzh = 0 + dzh = 0.0 level = updraft_origin_level[0, 0][plume] while level <= updraft_lfc_level[0, 0][plume]: dz = ( @@ -858,8 +850,8 @@ def __init__( self.cumulus_parameterization_config = cumulus_parameterization_config # construct stencils and functions - self._find_detrainmet_start_level = stencil_factory.from_dims_halo( - func=find_detrainmet_start_level, + self._find_detrainment_start_level = stencil_factory.from_dims_halo( + func=find_detrainment_start_level, compute_dims=[I_DIM, J_DIM, K_DIM], ) @@ -869,7 +861,7 @@ def __call__( locals: GF2020CumulusParameterizationLocals, plume_dependent_constants: GF2020PlumeDependentConstants, ): - self._find_detrainmet_start_level( + self._find_detrainment_start_level( geopotential_height=locals.geopotential_height_cloud_levels_forced, topography_height_no_negative=state.input_output.topography_height_no_negative, error_code=state.output.error_code, diff --git a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/pyMoist/convection/GF_2020/cumulus_parameterization/large_scale_forcing.py b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/pyMoist/convection/GF_2020/cumulus_parameterization/large_scale_forcing.py index 6826d553b..63d05172f 100644 --- a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/pyMoist/convection/GF_2020/cumulus_parameterization/large_scale_forcing.py +++ b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/pyMoist/convection/GF_2020/cumulus_parameterization/large_scale_forcing.py @@ -408,7 +408,7 @@ def effective_precipitation( effective_condensate_to_fall_forced: FloatField, plume: Int, ): - """Compute the effective precipitation based on evaporation in the downdraft and precipitation effeciency + """Compute the effective precipitation based on evaporation in the downdraft and precipitation efficiency (which is dependent on wind shear). Args: diff --git a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/pyMoist/convection/GF_2020/cumulus_parameterization/moist_static_energy.py b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/pyMoist/convection/GF_2020/cumulus_parameterization/moist_static_energy.py index 9c8c0a2e6..ca0a002a4 100644 --- a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/pyMoist/convection/GF_2020/cumulus_parameterization/moist_static_energy.py +++ b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/pyMoist/convection/GF_2020/cumulus_parameterization/moist_static_energy.py @@ -21,8 +21,8 @@ def parcel_moist_static_energy( ocean_fraction: FloatFieldIJ, updraft_origin_level: IntFieldIJ_Plume, p: FloatField, - environmenet_moist_static_energy: FloatField, - environmenet_moist_static_energy_forced: FloatField, + environment_moist_static_energy: FloatField, + environment_moist_static_energy_forced: FloatField, t_perturbation: FloatField, moist_static_energy_origin_level: FloatFieldIJ, moist_static_energy_origin_level_forced: FloatFieldIJ, @@ -39,8 +39,8 @@ def parcel_moist_static_energy( ocean_fraction (FloatFieldIJ) updraft_origin_level (IntFieldIJ_Plume) p (FloatField) - environmenet_moist_static_energy (FloatField) - environmenet_moist_static_energy_forced (FloatField) + environment_moist_static_energy (FloatField) + environment_moist_static_energy_forced (FloatField) t_perturbation (FloatField) moist_static_energy_origin_level (FloatFieldIJ) moist_static_energy_origin_level_forced (FloatFieldIJ) @@ -57,7 +57,7 @@ def parcel_moist_static_energy( ) + add_buoyancy moist_static_energy_origin_level = get_cloud_boundary_conditions( - field=environmenet_moist_static_energy, + field=environment_moist_static_energy, scalar_perturbation=modification, p=p, updraft_origin_level=updraft_origin_level[0, 0][plume], @@ -69,7 +69,7 @@ def parcel_moist_static_energy( perturbation_field=t_perturbation, ) moist_static_energy_origin_level_forced = get_cloud_boundary_conditions( - field=environmenet_moist_static_energy_forced, + field=environment_moist_static_energy_forced, scalar_perturbation=modification, p=p, updraft_origin_level=updraft_origin_level[0, 0][plume], @@ -250,7 +250,6 @@ class StaticControl(NDSLRuntime): def __init__( self, stencil_factory: StencilFactory, - quantity_factory: QuantityFactory, config: GF2020Config, cumulus_parameterization_config: GF2020CumulusParameterizationConfig, ): diff --git a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/pyMoist/convection/GF_2020/cumulus_parameterization/precip.py b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/pyMoist/convection/GF_2020/cumulus_parameterization/precip.py index 98aa90fd2..fe519784f 100644 --- a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/pyMoist/convection/GF_2020/cumulus_parameterization/precip.py +++ b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/pyMoist/convection/GF_2020/cumulus_parameterization/precip.py @@ -351,7 +351,7 @@ def rain_evaporation_below_cloud_base( precip[0, 0][plume] = precip[0, 0][plume] - evaporation_below_cloud_base -def cloud_dissapation( +def cloud_dissipation( error_code: IntFieldIJ_Plume, updraft_lfc_level: IntFieldIJ_Plume, cloud_top_level: IntFieldIJ_Plume, @@ -422,7 +422,7 @@ def cloud_dissapation( / (hydrostatic_air_density * vertical_velocity_3d) ) - # source of enviroment moistening/cooling due to the 'remained' cloud dissipation into it. + # source of environment moistening/cooling due to the 'remained' cloud dissipation into it. out_precip_dissipation = (precip_dissipation * (1.0 - f_rh)) / cloud_lifetime # NOTE other option (if this is true) is not implemented diff --git a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/pyMoist/convection/GF_2020/cumulus_parameterization/profiles.py b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/pyMoist/convection/GF_2020/cumulus_parameterization/profiles.py index 2de9bde9d..43239a07e 100644 --- a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/pyMoist/convection/GF_2020/cumulus_parameterization/profiles.py +++ b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/pyMoist/convection/GF_2020/cumulus_parameterization/profiles.py @@ -87,7 +87,7 @@ def melting_profile( class C1DProfile: """ - C1D Profile generator. This code is manually diables with a + C1D Profile generator. This code is manually disables with a "do not enable" note in fortran, so it is not going to be completed until specifically requested. """ diff --git a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/pyMoist/convection/GF_2020/cumulus_parameterization/setup/setup.py b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/pyMoist/convection/GF_2020/cumulus_parameterization/setup/setup.py index ceb6ecda2..2f115da6b 100644 --- a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/pyMoist/convection/GF_2020/cumulus_parameterization/setup/setup.py +++ b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/pyMoist/convection/GF_2020/cumulus_parameterization/setup/setup.py @@ -92,7 +92,7 @@ def set_plume_dependent_fields( ) + cumulus_parameterization_constants.XLV * (subgrid_scale_forcing_vapor + grid_scale_forcing_vapor) -def prefil_internal_fields( +def prefill_internal_fields( plume: Int, maximum_updraft_origin_level: IntFieldIJ, kstabm: IntFieldIJ_Plume, @@ -361,7 +361,7 @@ def epsilon_min_max( def calculate_arbitrary_numerical_parameter( arbitrary_numerical_parameter: FloatFieldIJ, ): - """Set a scaling factor, used primarially (but not exclusively) for mass flux calculations. + """Set a scaling factor, used primarily (but not exclusively) for mass flux calculations. Args: arbitrary_numerical_parameter (FloatFieldIJ) @@ -384,7 +384,6 @@ class Setup(NDSLRuntime): def __init__( self, stencil_factory: StencilFactory, - quantity_factory: QuantityFactory, config: GF2020Config, cumulus_parameterization_config: GF2020CumulusParameterizationConfig, ): @@ -402,8 +401,8 @@ def __init__( externals={"DT_MOIST": config.DT_MOIST}, ) - self._prefil_internal_fields = stencil_factory.from_dims_halo( - func=prefil_internal_fields, + self._prefill_internal_fields = stencil_factory.from_dims_halo( + func=prefill_internal_fields, compute_dims=[I_DIM, J_DIM, K_DIM], externals={ "CAP_MAXS": cumulus_parameterization_config.CAP_MAXS, @@ -509,7 +508,7 @@ def __call__( plume_dependent_constants = set_constants(self.cu_param_config, plume_dependent_constants, plume) if plume_dependent_constants.ENABLE_PLUME == 1: - # compute/prefil the last few fields needed for the rest of the scheme + # compute/prefill the last few fields needed for the rest of the scheme self._set_plume_dependent_fields( t_excess=t_excess, t_excess_local=t_excess_local, @@ -530,7 +529,7 @@ def __call__( dmoist_static_energydt=dmoist_static_energydt, ) - self._prefil_internal_fields( + self._prefill_internal_fields( plume=plume_dependent_constants.PLUME_INDEX, maximum_updraft_origin_level=maximum_updraft_origin_level, kstabm=kstabm, diff --git a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/pyMoist/convection/GF_2020/cumulus_parameterization/triggers.py b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/pyMoist/convection/GF_2020/cumulus_parameterization/triggers.py index fc70e1340..a20d779ae 100644 --- a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/pyMoist/convection/GF_2020/cumulus_parameterization/triggers.py +++ b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/pyMoist/convection/GF_2020/cumulus_parameterization/triggers.py @@ -10,7 +10,7 @@ def convection_trigger( error_code: IntFieldIJ_Plume, - convective_scale_velosity: FloatFieldIJ, + convective_scale_velocity: FloatFieldIJ, cin_0: FloatFieldIJ, plume: Int, ): @@ -18,7 +18,7 @@ def convection_trigger( Args: error_code (IntFieldIJ_Plume) - convective_scale_velosity (FloatFieldIJ) + convective_scale_velocity (FloatFieldIJ) cin_0 (FloatFieldIJ) plume (Int) """ @@ -28,7 +28,7 @@ def convection_trigger( if DICYCLE > 1: if error_code[0, 0][plume] == 0: # think about including the grid scale vertical velocity at KE calculation - if cin_0 + 0.5 * convective_scale_velosity**2 < 0.0: + if cin_0 + 0.5 * convective_scale_velocity**2 < 0.0: error_code[0, 0][plume] = 19 @@ -46,7 +46,7 @@ def __call__(self, plume_dependent_constants: GF2020PlumeDependentConstants): if self.config.ADV_TRIGGER == 3 and (plume_dependent_constants.PLUME_INDEX in (1, 2)): raise NotImplementedError( "[NDSL] GF2020-->CumulusParameterization-->XieTriggerFunction this code" - "has not been impemented. You should have been caught before getting here by the config" + "has not been implemented. You should have been caught before getting here by the config" "checker. Beware, something likely failing in the config checker as well - you may be" "unknowingly calling other untested/unimplemented sections." ) diff --git a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/pyMoist/convection/GF_2020/cumulus_parameterization/updraft.py b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/pyMoist/convection/GF_2020/cumulus_parameterization/updraft.py index 13d7da072..525a0e6dd 100644 --- a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/pyMoist/convection/GF_2020/cumulus_parameterization/updraft.py +++ b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/pyMoist/convection/GF_2020/cumulus_parameterization/updraft.py @@ -179,7 +179,7 @@ def updraft_mass_flux( height_updraft: FloatFieldIJ = ( 1.0 - ocean_fraction ) * UPDRAFT_MAX_HEIGHT_LAND + ocean_fraction * UPDRAFT_MAX_HEIGHT_OCEAN - # add a randomic perturbation + # add a random perturbation height_updraft = height_updraft + random_number # height_updraft parameter goes from 0 to 1 = rainfall decreases with height_updraft @@ -208,7 +208,7 @@ def updraft_mass_flux( ) updraft_origin_level_adj = min(updraft_origin_level_adj, cloud_top_level[0, 0][plume] + 1) - # this alpha constrains the location of the maximun normalized_massflux_updraft_forced + # this alpha constrains the location of the maximum normalized_massflux_updraft_forced # to be at "updraft_origin_level_adj" vertical level alpha: FloatFieldIJ = 1.0 + ( (beta - 1.0) @@ -925,7 +925,7 @@ def __init__( self.config = config self.cumulus_parameterization_config = cumulus_parameterization_config - # add dimension to quantityfactory and create classes for constants + # add dimension to quantity factory and create classes for constants quantity_factory.add_data_dimensions({"UpdraftMassFlux_constants": len(_X_ALPHA)}) self._X_ALPHA: Local = quantity_factory.zeros(["UpdraftMassFlux_constants"], "n/a") @@ -990,7 +990,6 @@ class UpdraftInitialWorkfunctions(NDSLRuntime): def __init__( self, stencil_factory: StencilFactory, - quantity_factory: QuantityFactory, config: GF2020Config, cumulus_parameterization_config: GF2020CumulusParameterizationConfig, ): @@ -1077,7 +1076,6 @@ class UpdraftCIN(NDSLRuntime): def __init__( self, stencil_factory: StencilFactory, - quantity_factory: QuantityFactory, config: GF2020Config, cumulus_parameterization_config: GF2020CumulusParameterizationConfig, ): @@ -1153,7 +1151,6 @@ class UpdateWorkfunctionAndPrecipitationEnsemble(NDSLRuntime): def __init__( self, stencil_factory: StencilFactory, - quantity_factory: QuantityFactory, config: GF2020Config, cumulus_parameterization_config: GF2020CumulusParameterizationConfig, ): diff --git a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/pyMoist/convection/GF_2020/cumulus_parameterization/vertical_discretization.py b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/pyMoist/convection/GF_2020/cumulus_parameterization/vertical_discretization.py index 91617e9e2..87ff78257 100644 --- a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/pyMoist/convection/GF_2020/cumulus_parameterization/vertical_discretization.py +++ b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/pyMoist/convection/GF_2020/cumulus_parameterization/vertical_discretization.py @@ -84,7 +84,7 @@ def convective_transport_of_momentum( ddv: FloatField, plume: Int, ): - """Compute u & v tendnecies - the effect of convection on the state wind field. These tencencies are not + """Compute u & v tendencies - the effect of convection on the state wind field. These tendencies are not directly used to update the overarching model state, but are the first step in that process. Args: @@ -167,7 +167,7 @@ def convective_transport_of_momentum( and VERTICAL_DISCRETIZATION_OPTION == 1 and ALP1 > 0.0 and K <= cloud_top_level[0, 0][plume] + 2 - ): # time alp0*explict + alp1*implicit + upstream + ): # time alp0*explicit + alp1*implicit + upstream alp0 = 1.0 - ALP1 fp = 0.5 * (environment_massflux + abs(environment_massflux)) fm = 0.5 * (environment_massflux - abs(environment_massflux)) @@ -270,7 +270,7 @@ def convective_transport_of_mse( plume: Int, ): """Compute moist static energy tendency - the effect of convection and environmental - subsidence on environmental moist static energy independently. This tencency is not + subsidence on environmental moist static energy independently. This tendency is not directly used to update the overarching model state, but is the first step in that process. Args: @@ -395,7 +395,7 @@ def convective_transport_of_water_vapor_and_condensates( plume: Int, ): """Compute cloud liquid and vapor tendencies - the effect of convection on environmental water, - and the contribution from environmental subsidence. These tencencies are not + and the contribution from environmental subsidence. These tendencies are not directly used to update the overarching model state, but are the first step in that process. Args: @@ -599,7 +599,7 @@ def convective_transport_of_water_vapor_and_condensates( with computation(PARALLEL), interval(...): if error_code[0, 0][plume] == 0 and K <= cloud_top_level[0, 0][plume]: - # add the contribuition from the environmental subsidence + # add the contribution from the environmental subsidence del_vapor_cloud_ensemble = del_vapor_cloud_ensemble + subsidence_tendency # for output only diff --git a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/pyMoist/convection/GF_2020/finalize.py b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/pyMoist/convection/GF_2020/finalize.py index b7c481e17..d9a3dd19c 100644 --- a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/pyMoist/convection/GF_2020/finalize.py +++ b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/pyMoist/convection/GF_2020/finalize.py @@ -170,7 +170,7 @@ def feedback( directions, and further calculations may be performed on one or more of these outputs before this flip and final exchange is performed. - These could be condensed, but have been kept separate for readibility and clarity. + These could be condensed, but have been kept separate for readability and clarity. Args: fix_out_vapor (FloatFieldIJ) @@ -1228,7 +1228,7 @@ def __call__( cumulus_parameterization_state (GF2020CumulusParameterizationState): NDSL State containing all fields required for the CumulusParameterization. convection_tracers (ConvectionTracers): Collection of tracers from the rest of the model which - will be updated within convection. These may come from a variaty of sources, and need to be + will be updated within convection. These may come from a variety of sources, and need to be collected into the expected ConvectionTracers data type before being passed down. """ diff --git a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/pyMoist/convection/GF_2020/setup.py b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/pyMoist/convection/GF_2020/setup.py index 58533ddda..752519093 100644 --- a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/pyMoist/convection/GF_2020/setup.py +++ b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/pyMoist/convection/GF_2020/setup.py @@ -1332,7 +1332,7 @@ def __call__( cumulus_parameterization_state (GF2020CumulusParameterizationState): NDSL State containing all fields required for the CumulusParameterization. convection_tracers (ConvectionTracers): Collection of tracers from the rest of the model which - will be updated within convection. These may come from a variaty of sources, and need to be + will be updated within convection. These may come from a variety of sources, and need to be collected into the expected ConvectionTracers data type before being passed down. scm_stop (bool): flag which can stop the execution of GF2020 diff --git a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/tests/translate_tests/convection/GF_2020/cumulus_parameterization/downdraft/translate_GF2020_CumulusParameterization_DowndraftLateralMassFlux.py b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/tests/translate_tests/convection/GF_2020/cumulus_parameterization/downdraft/translate_GF2020_CumulusParameterization_DowndraftLateralMassFlux.py index cd81c678f..d8c20696a 100644 --- a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/tests/translate_tests/convection/GF_2020/cumulus_parameterization/downdraft/translate_GF2020_CumulusParameterization_DowndraftLateralMassFlux.py +++ b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/tests/translate_tests/convection/GF_2020/cumulus_parameterization/downdraft/translate_GF2020_CumulusParameterization_DowndraftLateralMassFlux.py @@ -26,7 +26,6 @@ class TestCore: def __init__( self, grid: Grid, - namelist: Namelist, stencil_factory: StencilFactory, in_vars: dict, out_vars: dict, @@ -175,14 +174,12 @@ class TranslateGF2020_CumulusParameterization_DowndraftLateralMassFlux_shallow(T def __init__( self, grid: Grid, - namelist: Namelist, + _namelist: Namelist, stencil_factory: StencilFactory, ): super().__init__(grid, stencil_factory) - self.stencil_factory = stencil_factory - self.quantity_factory = grid.quantity_factory - self.test_core = TestCore(grid, namelist, stencil_factory, self.in_vars, self.out_vars) + self.test_core = TestCore(grid, stencil_factory, self.in_vars, self.out_vars) def extra_data_load(self, data_loader: DataLoader): self.constants = data_loader.load("GF2020-constants") @@ -198,14 +195,12 @@ class TranslateGF2020_CumulusParameterization_DowndraftLateralMassFlux_mid(Trans def __init__( self, grid: Grid, - namelist: Namelist, + _namelist: Namelist, stencil_factory: StencilFactory, ): super().__init__(grid, stencil_factory) - self.stencil_factory = stencil_factory - self.quantity_factory = grid.quantity_factory - self.test_core = TestCore(grid, namelist, stencil_factory, self.in_vars, self.out_vars) + self.test_core = TestCore(grid, stencil_factory, self.in_vars, self.out_vars) def extra_data_load(self, data_loader: DataLoader): self.constants = data_loader.load("GF2020-constants") @@ -221,14 +216,12 @@ class TranslateGF2020_CumulusParameterization_DowndraftLateralMassFlux_deep(Tran def __init__( self, grid: Grid, - namelist: Namelist, + _namelist: Namelist, stencil_factory: StencilFactory, ): super().__init__(grid, stencil_factory) - self.stencil_factory = stencil_factory - self.quantity_factory = grid.quantity_factory - self.test_core = TestCore(grid, namelist, stencil_factory, self.in_vars, self.out_vars) + self.test_core = TestCore(grid, stencil_factory, self.in_vars, self.out_vars) def extra_data_load(self, data_loader: DataLoader): self.constants = data_loader.load("GF2020-constants") diff --git a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/tests/translate_tests/convection/GF_2020/cumulus_parameterization/downdraft/translate_GF2020_CumulusParameterization_DowndraftMSEAndBuoyancy.py b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/tests/translate_tests/convection/GF_2020/cumulus_parameterization/downdraft/translate_GF2020_CumulusParameterization_DowndraftMSEAndBuoyancy.py index eed1cb515..ff3ae1cea 100644 --- a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/tests/translate_tests/convection/GF_2020/cumulus_parameterization/downdraft/translate_GF2020_CumulusParameterization_DowndraftMSEAndBuoyancy.py +++ b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/tests/translate_tests/convection/GF_2020/cumulus_parameterization/downdraft/translate_GF2020_CumulusParameterization_DowndraftMSEAndBuoyancy.py @@ -28,7 +28,6 @@ class TestCore: def __init__( self, grid: Grid, - namelist: Namelist, stencil_factory: StencilFactory, in_vars: dict, out_vars: dict, @@ -211,14 +210,12 @@ class TranslateGF2020_CumulusParameterization_DowndraftMSEAndBuoyancy_shallow(Tr def __init__( self, grid: Grid, - namelist: Namelist, + _namelist: Namelist, stencil_factory: StencilFactory, ): super().__init__(grid, stencil_factory) - self.stencil_factory = stencil_factory - self.quantity_factory = grid.quantity_factory - self.test_core = TestCore(grid, namelist, stencil_factory, self.in_vars, self.out_vars) + self.test_core = TestCore(grid, stencil_factory, self.in_vars, self.out_vars) def extra_data_load(self, data_loader: DataLoader): self.constants = data_loader.load("GF2020-constants") @@ -234,14 +231,12 @@ class TranslateGF2020_CumulusParameterization_DowndraftMSEAndBuoyancy_mid(Transl def __init__( self, grid: Grid, - namelist: Namelist, + _namelist: Namelist, stencil_factory: StencilFactory, ): super().__init__(grid, stencil_factory) - self.stencil_factory = stencil_factory - self.quantity_factory = grid.quantity_factory - self.test_core = TestCore(grid, namelist, stencil_factory, self.in_vars, self.out_vars) + self.test_core = TestCore(grid, stencil_factory, self.in_vars, self.out_vars) def extra_data_load(self, data_loader: DataLoader): self.constants = data_loader.load("GF2020-constants") @@ -257,14 +252,12 @@ class TranslateGF2020_CumulusParameterization_DowndraftMSEAndBuoyancy_deep(Trans def __init__( self, grid: Grid, - namelist: Namelist, + _namelist: Namelist, stencil_factory: StencilFactory, ): super().__init__(grid, stencil_factory) - self.stencil_factory = stencil_factory - self.quantity_factory = grid.quantity_factory - self.test_core = TestCore(grid, namelist, stencil_factory, self.in_vars, self.out_vars) + self.test_core = TestCore(grid, stencil_factory, self.in_vars, self.out_vars) def extra_data_load(self, data_loader: DataLoader): self.constants = data_loader.load("GF2020-constants") diff --git a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/tests/translate_tests/convection/GF_2020/cumulus_parameterization/downdraft/translate_GF2020_CumulusParameterization_DowndraftMassFlux.py b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/tests/translate_tests/convection/GF_2020/cumulus_parameterization/downdraft/translate_GF2020_CumulusParameterization_DowndraftMassFlux.py index 77a3a5c29..8e274a94e 100644 --- a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/tests/translate_tests/convection/GF_2020/cumulus_parameterization/downdraft/translate_GF2020_CumulusParameterization_DowndraftMassFlux.py +++ b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/tests/translate_tests/convection/GF_2020/cumulus_parameterization/downdraft/translate_GF2020_CumulusParameterization_DowndraftMassFlux.py @@ -26,7 +26,6 @@ class TestCore: def __init__( self, grid: Grid, - namelist: Namelist, stencil_factory: StencilFactory, in_vars: dict, out_vars: dict, @@ -171,14 +170,12 @@ class TranslateGF2020_CumulusParameterization_DowndraftMassFlux_shallow(Translat def __init__( self, grid: Grid, - namelist: Namelist, + _namelist: Namelist, stencil_factory: StencilFactory, ): super().__init__(grid, stencil_factory) - self.stencil_factory = stencil_factory - self.quantity_factory = grid.quantity_factory - self.test_core = TestCore(grid, namelist, stencil_factory, self.in_vars, self.out_vars) + self.test_core = TestCore(grid, stencil_factory, self.in_vars, self.out_vars) def extra_data_load(self, data_loader: DataLoader): self.constants = data_loader.load("GF2020-constants") @@ -194,14 +191,12 @@ class TranslateGF2020_CumulusParameterization_DowndraftMassFlux_mid(TranslateFor def __init__( self, grid: Grid, - namelist: Namelist, + _namelist: Namelist, stencil_factory: StencilFactory, ): super().__init__(grid, stencil_factory) - self.stencil_factory = stencil_factory - self.quantity_factory = grid.quantity_factory - self.test_core = TestCore(grid, namelist, stencil_factory, self.in_vars, self.out_vars) + self.test_core = TestCore(grid, stencil_factory, self.in_vars, self.out_vars) def extra_data_load(self, data_loader: DataLoader): self.constants = data_loader.load("GF2020-constants") @@ -217,14 +212,12 @@ class TranslateGF2020_CumulusParameterization_DowndraftMassFlux_deep(TranslateFo def __init__( self, grid: Grid, - namelist: Namelist, + _namelist: Namelist, stencil_factory: StencilFactory, ): super().__init__(grid, stencil_factory) - self.stencil_factory = stencil_factory - self.quantity_factory = grid.quantity_factory - self.test_core = TestCore(grid, namelist, stencil_factory, self.in_vars, self.out_vars) + self.test_core = TestCore(grid, stencil_factory, self.in_vars, self.out_vars) def extra_data_load(self, data_loader: DataLoader): self.constants = data_loader.load("GF2020-constants") diff --git a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/tests/translate_tests/convection/GF_2020/cumulus_parameterization/downdraft/translate_GF2020_CumulusParameterization_DowndraftMoisture.py b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/tests/translate_tests/convection/GF_2020/cumulus_parameterization/downdraft/translate_GF2020_CumulusParameterization_DowndraftMoisture.py index a3c9d9e02..dd0bc6dc7 100644 --- a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/tests/translate_tests/convection/GF_2020/cumulus_parameterization/downdraft/translate_GF2020_CumulusParameterization_DowndraftMoisture.py +++ b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/tests/translate_tests/convection/GF_2020/cumulus_parameterization/downdraft/translate_GF2020_CumulusParameterization_DowndraftMoisture.py @@ -26,7 +26,6 @@ class TestCore: def __init__( self, grid: Grid, - namelist: Namelist, stencil_factory: StencilFactory, in_vars: dict, out_vars: dict, @@ -243,14 +242,12 @@ class TranslateGF2020_CumulusParameterization_DowndraftMoisture_shallow(Translat def __init__( self, grid: Grid, - namelist: Namelist, + _namelist: Namelist, stencil_factory: StencilFactory, ): super().__init__(grid, stencil_factory) - self.stencil_factory = stencil_factory - self.quantity_factory = grid.quantity_factory - self.test_core = TestCore(grid, namelist, stencil_factory, self.in_vars, self.out_vars) + self.test_core = TestCore(grid, stencil_factory, self.in_vars, self.out_vars) def extra_data_load(self, data_loader: DataLoader): self.constants = data_loader.load("GF2020-constants") @@ -266,14 +263,12 @@ class TranslateGF2020_CumulusParameterization_DowndraftMoisture_mid(TranslateFor def __init__( self, grid: Grid, - namelist: Namelist, + _namelist: Namelist, stencil_factory: StencilFactory, ): super().__init__(grid, stencil_factory) - self.stencil_factory = stencil_factory - self.quantity_factory = grid.quantity_factory - self.test_core = TestCore(grid, namelist, stencil_factory, self.in_vars, self.out_vars) + self.test_core = TestCore(grid, stencil_factory, self.in_vars, self.out_vars) def extra_data_load(self, data_loader: DataLoader): self.constants = data_loader.load("GF2020-constants") @@ -289,14 +284,12 @@ class TranslateGF2020_CumulusParameterization_DowndraftMoisture_deep(TranslateFo def __init__( self, grid: Grid, - namelist: Namelist, + _namelist: Namelist, stencil_factory: StencilFactory, ): super().__init__(grid, stencil_factory) - self.stencil_factory = stencil_factory - self.quantity_factory = grid.quantity_factory - self.test_core = TestCore(grid, namelist, stencil_factory, self.in_vars, self.out_vars) + self.test_core = TestCore(grid, stencil_factory, self.in_vars, self.out_vars) def extra_data_load(self, data_loader: DataLoader): self.constants = data_loader.load("GF2020-constants") diff --git a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/tests/translate_tests/convection/GF_2020/cumulus_parameterization/downdraft/translate_GF2020_CumulusParameterization_DowndraftOriginLevel.py b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/tests/translate_tests/convection/GF_2020/cumulus_parameterization/downdraft/translate_GF2020_CumulusParameterization_DowndraftOriginLevel.py index 0306709cc..9adcc95b7 100644 --- a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/tests/translate_tests/convection/GF_2020/cumulus_parameterization/downdraft/translate_GF2020_CumulusParameterization_DowndraftOriginLevel.py +++ b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/tests/translate_tests/convection/GF_2020/cumulus_parameterization/downdraft/translate_GF2020_CumulusParameterization_DowndraftOriginLevel.py @@ -26,7 +26,6 @@ class TestCore: def __init__( self, grid: Grid, - namelist: Namelist, stencil_factory: StencilFactory, in_vars: dict, out_vars: dict, @@ -161,14 +160,12 @@ class TranslateGF2020_CumulusParameterization_DowndraftOriginLevel_shallow(Trans def __init__( self, grid: Grid, - namelist: Namelist, + _namelist: Namelist, stencil_factory: StencilFactory, ): super().__init__(grid, stencil_factory) - self.stencil_factory = stencil_factory - self.quantity_factory = grid.quantity_factory - self.test_core = TestCore(grid, namelist, stencil_factory, self.in_vars, self.out_vars) + self.test_core = TestCore(grid, stencil_factory, self.in_vars, self.out_vars) def extra_data_load(self, data_loader: DataLoader): self.constants = data_loader.load("GF2020-constants") @@ -184,14 +181,12 @@ class TranslateGF2020_CumulusParameterization_DowndraftOriginLevel_mid(Translate def __init__( self, grid: Grid, - namelist: Namelist, + _namelist: Namelist, stencil_factory: StencilFactory, ): super().__init__(grid, stencil_factory) - self.stencil_factory = stencil_factory - self.quantity_factory = grid.quantity_factory - self.test_core = TestCore(grid, namelist, stencil_factory, self.in_vars, self.out_vars) + self.test_core = TestCore(grid, stencil_factory, self.in_vars, self.out_vars) def extra_data_load(self, data_loader: DataLoader): self.constants = data_loader.load("GF2020-constants") @@ -207,14 +202,12 @@ class TranslateGF2020_CumulusParameterization_DowndraftOriginLevel_deep(Translat def __init__( self, grid: Grid, - namelist: Namelist, + _namelist: Namelist, stencil_factory: StencilFactory, ): super().__init__(grid, stencil_factory) - self.stencil_factory = stencil_factory - self.quantity_factory = grid.quantity_factory - self.test_core = TestCore(grid, namelist, stencil_factory, self.in_vars, self.out_vars) + self.test_core = TestCore(grid, stencil_factory, self.in_vars, self.out_vars) def extra_data_load(self, data_loader: DataLoader): self.constants = data_loader.load("GF2020-constants") diff --git a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/tests/translate_tests/convection/GF_2020/cumulus_parameterization/downdraft/translate_GF2020_CumulusParameterization_DowndraftTemperature.py b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/tests/translate_tests/convection/GF_2020/cumulus_parameterization/downdraft/translate_GF2020_CumulusParameterization_DowndraftTemperature.py index 35393d7df..6517071a8 100644 --- a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/tests/translate_tests/convection/GF_2020/cumulus_parameterization/downdraft/translate_GF2020_CumulusParameterization_DowndraftTemperature.py +++ b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/tests/translate_tests/convection/GF_2020/cumulus_parameterization/downdraft/translate_GF2020_CumulusParameterization_DowndraftTemperature.py @@ -26,7 +26,6 @@ class TestCore: def __init__( self, grid: Grid, - namelist: Namelist, stencil_factory: StencilFactory, in_vars: dict, out_vars: dict, @@ -131,14 +130,12 @@ class TranslateGF2020_CumulusParameterization_DowndraftTemperature_shallow(Trans def __init__( self, grid: Grid, - namelist: Namelist, + _namelist: Namelist, stencil_factory: StencilFactory, ): super().__init__(grid, stencil_factory) - self.stencil_factory = stencil_factory - self.quantity_factory = grid.quantity_factory - self.test_core = TestCore(grid, namelist, stencil_factory, self.in_vars, self.out_vars) + self.test_core = TestCore(grid, stencil_factory, self.in_vars, self.out_vars) def extra_data_load(self, data_loader: DataLoader): self.constants = data_loader.load("GF2020-constants") @@ -154,14 +151,12 @@ class TranslateGF2020_CumulusParameterization_DowndraftTemperature_mid(Translate def __init__( self, grid: Grid, - namelist: Namelist, + _namelist: Namelist, stencil_factory: StencilFactory, ): super().__init__(grid, stencil_factory) - self.stencil_factory = stencil_factory - self.quantity_factory = grid.quantity_factory - self.test_core = TestCore(grid, namelist, stencil_factory, self.in_vars, self.out_vars) + self.test_core = TestCore(grid, stencil_factory, self.in_vars, self.out_vars) def extra_data_load(self, data_loader: DataLoader): self.constants = data_loader.load("GF2020-constants") @@ -177,14 +172,12 @@ class TranslateGF2020_CumulusParameterization_DowndraftTemperature_deep(Translat def __init__( self, grid: Grid, - namelist: Namelist, + _namelist: Namelist, stencil_factory: StencilFactory, ): super().__init__(grid, stencil_factory) - self.stencil_factory = stencil_factory - self.quantity_factory = grid.quantity_factory - self.test_core = TestCore(grid, namelist, stencil_factory, self.in_vars, self.out_vars) + self.test_core = TestCore(grid, stencil_factory, self.in_vars, self.out_vars) def extra_data_load(self, data_loader: DataLoader): self.constants = data_loader.load("GF2020-constants") diff --git a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/tests/translate_tests/convection/GF_2020/cumulus_parameterization/downdraft/translate_GF2020_CumulusParameterization_DowndraftWindShear.py b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/tests/translate_tests/convection/GF_2020/cumulus_parameterization/downdraft/translate_GF2020_CumulusParameterization_DowndraftWindShear.py index a37e23c98..8addb5c54 100644 --- a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/tests/translate_tests/convection/GF_2020/cumulus_parameterization/downdraft/translate_GF2020_CumulusParameterization_DowndraftWindShear.py +++ b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/tests/translate_tests/convection/GF_2020/cumulus_parameterization/downdraft/translate_GF2020_CumulusParameterization_DowndraftWindShear.py @@ -25,7 +25,6 @@ class TestCore: def __init__( self, grid: Grid, - namelist: Namelist, stencil_factory: StencilFactory, in_vars: dict, out_vars: dict, @@ -124,7 +123,6 @@ def __call__(self, constants: dict, cu_param_constants: dict, plume: str, **inpu # initialize test code code = DowndraftWindShear( stencil_factory=self.stencil_factory, - quantity_factory=self.quantity_factory, config=config, cumulus_parameterization_config=cumulus_parameterization_config, ) @@ -190,14 +188,12 @@ class TranslateGF2020_CumulusParameterization_DowndraftWindShear_shallow(Transla def __init__( self, grid: Grid, - namelist: Namelist, + _namelist: Namelist, stencil_factory: StencilFactory, ): super().__init__(grid, stencil_factory) - self.stencil_factory = stencil_factory - self.quantity_factory = grid.quantity_factory - self.test_core = TestCore(grid, namelist, stencil_factory, self.in_vars, self.out_vars) + self.test_core = TestCore(grid, stencil_factory, self.in_vars, self.out_vars) def extra_data_load(self, data_loader: DataLoader): self.constants = data_loader.load("GF2020-constants") @@ -213,14 +209,11 @@ class TranslateGF2020_CumulusParameterization_DowndraftWindShear_mid(TranslateFo def __init__( self, grid: Grid, - namelist: Namelist, stencil_factory: StencilFactory, ): super().__init__(grid, stencil_factory) - self.stencil_factory = stencil_factory - self.quantity_factory = grid.quantity_factory - self.test_core = TestCore(grid, namelist, stencil_factory, self.in_vars, self.out_vars) + self.test_core = TestCore(grid, stencil_factory, self.in_vars, self.out_vars) def extra_data_load(self, data_loader: DataLoader): self.constants = data_loader.load("GF2020-constants") @@ -236,14 +229,11 @@ class TranslateGF2020_CumulusParameterization_DowndraftWindShear_deep(TranslateF def __init__( self, grid: Grid, - namelist: Namelist, stencil_factory: StencilFactory, ): super().__init__(grid, stencil_factory) - self.stencil_factory = stencil_factory - self.quantity_factory = grid.quantity_factory - self.test_core = TestCore(grid, namelist, stencil_factory, self.in_vars, self.out_vars) + self.test_core = TestCore(grid, stencil_factory, self.in_vars, self.out_vars) def extra_data_load(self, data_loader: DataLoader): self.constants = data_loader.load("GF2020-constants") diff --git a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/tests/translate_tests/convection/GF_2020/cumulus_parameterization/get_levels/translate_GF2020_CumulusParameterization_ConvectiveCloudBaseLevel.py b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/tests/translate_tests/convection/GF_2020/cumulus_parameterization/get_levels/translate_GF2020_CumulusParameterization_ConvectiveCloudBaseLevel.py index 4a8107433..fea7492fe 100644 --- a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/tests/translate_tests/convection/GF_2020/cumulus_parameterization/get_levels/translate_GF2020_CumulusParameterization_ConvectiveCloudBaseLevel.py +++ b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/tests/translate_tests/convection/GF_2020/cumulus_parameterization/get_levels/translate_GF2020_CumulusParameterization_ConvectiveCloudBaseLevel.py @@ -29,7 +29,6 @@ class TestCore: def __init__( self, grid: Grid, - namelist: Namelist, stencil_factory: StencilFactory, in_vars: dict, out_vars: dict, @@ -274,14 +273,14 @@ class TranslateGF2020_CumulusParameterization_ConvectiveCloudBaseLevel_shallow(T def __init__( self, grid: Grid, - namelist: Namelist, + _namelist: Namelist, stencil_factory: StencilFactory, ): super().__init__(grid, stencil_factory) self.stencil_factory = stencil_factory self.quantity_factory = grid.quantity_factory - self.test_core = TestCore(grid, namelist, stencil_factory, self.in_vars, self.out_vars) + self.test_core = TestCore(grid, stencil_factory, self.in_vars, self.out_vars) def extra_data_load(self, data_loader: DataLoader): self.constants = data_loader.load("GF2020-constants") @@ -297,14 +296,14 @@ class TranslateGF2020_CumulusParameterization_ConvectiveCloudBaseLevel_mid(Trans def __init__( self, grid: Grid, - namelist: Namelist, + _namelist: Namelist, stencil_factory: StencilFactory, ): super().__init__(grid, stencil_factory) self.stencil_factory = stencil_factory self.quantity_factory = grid.quantity_factory - self.test_core = TestCore(grid, namelist, stencil_factory, self.in_vars, self.out_vars) + self.test_core = TestCore(grid, stencil_factory, self.in_vars, self.out_vars) def extra_data_load(self, data_loader: DataLoader): self.constants = data_loader.load("GF2020-constants") @@ -320,14 +319,14 @@ class TranslateGF2020_CumulusParameterization_ConvectiveCloudBaseLevel_deep(Tran def __init__( self, grid: Grid, - namelist: Namelist, + _namelist: Namelist, stencil_factory: StencilFactory, ): super().__init__(grid, stencil_factory) self.stencil_factory = stencil_factory self.quantity_factory = grid.quantity_factory - self.test_core = TestCore(grid, namelist, stencil_factory, self.in_vars, self.out_vars) + self.test_core = TestCore(grid, stencil_factory, self.in_vars, self.out_vars) def extra_data_load(self, data_loader: DataLoader): self.constants = data_loader.load("GF2020-constants") diff --git a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/tests/translate_tests/convection/GF_2020/cumulus_parameterization/moist_static_energy/translate_GF2020_CumulusParameterization_ParcelMoistStaticEnergy_1.py b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/tests/translate_tests/convection/GF_2020/cumulus_parameterization/moist_static_energy/translate_GF2020_CumulusParameterization_ParcelMoistStaticEnergy_1.py index da6e8dcb5..015ac1596 100644 --- a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/tests/translate_tests/convection/GF_2020/cumulus_parameterization/moist_static_energy/translate_GF2020_CumulusParameterization_ParcelMoistStaticEnergy_1.py +++ b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/tests/translate_tests/convection/GF_2020/cumulus_parameterization/moist_static_energy/translate_GF2020_CumulusParameterization_ParcelMoistStaticEnergy_1.py @@ -119,8 +119,8 @@ def __call__(self, constants: dict, cu_param_constants: dict, plume: str, **inpu ocean_fraction=state.input.ocean_fraction, updraft_origin_level=state.output.updraft_origin_level, p=state.input_output.p_forced, - environmenet_moist_static_energy=locals.environment_moist_static_energy_cloud_levels, - environmenet_moist_static_energy_forced=locals.environment_moist_static_energy_cloud_levels_forced, + environment_moist_static_energy=locals.environment_moist_static_energy_cloud_levels, + environment_moist_static_energy_forced=locals.environment_moist_static_energy_cloud_levels_forced, t_perturbation=state.output.t_perturbation, moist_static_energy_origin_level=locals.moist_static_energy_origin_level, moist_static_energy_origin_level_forced=locals.moist_static_energy_origin_level_forced, diff --git a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/tests/translate_tests/convection/GF_2020/cumulus_parameterization/moist_static_energy/translate_GF2020_CumulusParameterization_ParcelMoistStaticEnergy_2.py b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/tests/translate_tests/convection/GF_2020/cumulus_parameterization/moist_static_energy/translate_GF2020_CumulusParameterization_ParcelMoistStaticEnergy_2.py index 263c50ecd..a52652df5 100644 --- a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/tests/translate_tests/convection/GF_2020/cumulus_parameterization/moist_static_energy/translate_GF2020_CumulusParameterization_ParcelMoistStaticEnergy_2.py +++ b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/tests/translate_tests/convection/GF_2020/cumulus_parameterization/moist_static_energy/translate_GF2020_CumulusParameterization_ParcelMoistStaticEnergy_2.py @@ -119,8 +119,8 @@ def __call__(self, constants: dict, cu_param_constants: dict, plume: str, **inpu ocean_fraction=state.input.ocean_fraction, updraft_origin_level=state.output.updraft_origin_level, p=state.input_output.p_forced, - environmenet_moist_static_energy=locals.environment_moist_static_energy_cloud_levels, - environmenet_moist_static_energy_forced=locals.environment_moist_static_energy_cloud_levels_forced, + environment_moist_static_energy=locals.environment_moist_static_energy_cloud_levels, + environment_moist_static_energy_forced=locals.environment_moist_static_energy_cloud_levels_forced, t_perturbation=state.output.t_perturbation, moist_static_energy_origin_level=locals.moist_static_energy_origin_level, moist_static_energy_origin_level_forced=locals.moist_static_energy_origin_level_forced, diff --git a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/tests/translate_tests/convection/GF_2020/cumulus_parameterization/moist_static_energy/translate_GF2020_CumulusParameterization_StaticControl.py b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/tests/translate_tests/convection/GF_2020/cumulus_parameterization/moist_static_energy/translate_GF2020_CumulusParameterization_StaticControl.py index 6dff61f36..ff533b29a 100644 --- a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/tests/translate_tests/convection/GF_2020/cumulus_parameterization/moist_static_energy/translate_GF2020_CumulusParameterization_StaticControl.py +++ b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/tests/translate_tests/convection/GF_2020/cumulus_parameterization/moist_static_energy/translate_GF2020_CumulusParameterization_StaticControl.py @@ -130,7 +130,6 @@ def __call__(self, constants: dict, cu_param_constants: dict, plume: str, **inpu # initialize test code code = StaticControl( stencil_factory=self.stencil_factory, - quantity_factory=self.quantity_factory, config=config, cumulus_parameterization_config=cumulus_parameterization_config, ) diff --git a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/tests/translate_tests/convection/GF_2020/cumulus_parameterization/precip/translate_GF2020_CumulusParameterization_CloudDissipation.py b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/tests/translate_tests/convection/GF_2020/cumulus_parameterization/precip/translate_GF2020_CumulusParameterization_CloudDissipation.py index 241525f6d..d690bac2b 100644 --- a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/tests/translate_tests/convection/GF_2020/cumulus_parameterization/precip/translate_GF2020_CumulusParameterization_CloudDissipation.py +++ b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/tests/translate_tests/convection/GF_2020/cumulus_parameterization/precip/translate_GF2020_CumulusParameterization_CloudDissipation.py @@ -17,7 +17,7 @@ from pyMoist.convection.GF_2020.cumulus_parameterization.plume_dependent_constants import ( GF2020PlumeDependentConstants, ) -from pyMoist.convection.GF_2020.cumulus_parameterization.precip import cloud_dissapation +from pyMoist.convection.GF_2020.cumulus_parameterization.precip import cloud_dissipation from pyMoist.convection.GF_2020.cumulus_parameterization.setup.set_constants import set_constants from pyMoist.convection.GF_2020.cumulus_parameterization.state import GF2020CumulusParameterizationState @@ -121,7 +121,7 @@ def __call__(self, constants: dict, cu_param_constants: dict, plume: str, **inpu state.output.dcloudicedt.data[:, :, :, plume_dependent_constants.PLUME_INDEX] = inputs["dcloudicedt"] code = self.stencil_factory.from_dims_halo( - func=cloud_dissapation, + func=cloud_dissipation, compute_dims=[I_DIM, J_DIM, K_DIM], externals={ "USE_CLOUD_DISSIPATION": cumulus_parameterization_config.USE_CLOUD_DISSIPATION, diff --git a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/tests/translate_tests/convection/GF_2020/cumulus_parameterization/precip/translate_GF2020_CumulusParameterization_PartitionLiquidIceAndGetLevels.py b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/tests/translate_tests/convection/GF_2020/cumulus_parameterization/precip/translate_GF2020_CumulusParameterization_PartitionLiquidIceAndGetLevels.py index 5200c6655..ab9355757 100644 --- a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/tests/translate_tests/convection/GF_2020/cumulus_parameterization/precip/translate_GF2020_CumulusParameterization_PartitionLiquidIceAndGetLevels.py +++ b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/tests/translate_tests/convection/GF_2020/cumulus_parameterization/precip/translate_GF2020_CumulusParameterization_PartitionLiquidIceAndGetLevels.py @@ -14,7 +14,7 @@ NUMBER_OF_PLUMES, ) from pyMoist.convection.GF_2020.cumulus_parameterization.get_levels import ( - find_detrainmet_start_level, + find_detrainment_start_level, find_maximum_updraft_origin_level, ) from pyMoist.convection.GF_2020.cumulus_parameterization.locals import GF2020CumulusParameterizationLocals @@ -114,7 +114,7 @@ def __call__(self, constants: dict, cu_param_constants: dict, plume: str, **inpu ) code_part_3 = self.stencil_factory.from_dims_halo( - func=find_detrainmet_start_level, + func=find_detrainment_start_level, compute_dims=[I_DIM, J_DIM, K_DIM], ) diff --git a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/tests/translate_tests/convection/GF_2020/cumulus_parameterization/setup/translate_GF2020_CumulusParameterization_Setup.py b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/tests/translate_tests/convection/GF_2020/cumulus_parameterization/setup/translate_GF2020_CumulusParameterization_Setup.py index 6e53e0576..724c0ad23 100644 --- a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/tests/translate_tests/convection/GF_2020/cumulus_parameterization/setup/translate_GF2020_CumulusParameterization_Setup.py +++ b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/tests/translate_tests/convection/GF_2020/cumulus_parameterization/setup/translate_GF2020_CumulusParameterization_Setup.py @@ -220,7 +220,6 @@ def __call__(self, constants: dict, cu_param_constants: dict, plume: str, **inpu # initialize test code code = Setup( stencil_factory=self.stencil_factory, - quantity_factory=self.quantity_factory, config=config, cumulus_parameterization_config=cumulus_parameterization_config, ) diff --git a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/tests/translate_tests/convection/GF_2020/cumulus_parameterization/triggers/translate_GF2020_CumulusParameterization_ConvectionTrigger.py b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/tests/translate_tests/convection/GF_2020/cumulus_parameterization/triggers/translate_GF2020_CumulusParameterization_ConvectionTrigger.py index 972d562e3..4155b75ea 100644 --- a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/tests/translate_tests/convection/GF_2020/cumulus_parameterization/triggers/translate_GF2020_CumulusParameterization_ConvectionTrigger.py +++ b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/tests/translate_tests/convection/GF_2020/cumulus_parameterization/triggers/translate_GF2020_CumulusParameterization_ConvectionTrigger.py @@ -87,7 +87,7 @@ def __call__(self, constants: dict, cu_param_constants: dict, plume: str, **inpu if plume_dependent_constants.ENABLE_PLUME == 1: code( error_code=state.output.error_code, - convective_scale_velosity=state.input_output.convective_scale_velocity, + convective_scale_velocity=state.input_output.convective_scale_velocity, cin_0=locals.cin_0, plume=plume_dependent_constants.PLUME_INDEX, ) diff --git a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/tests/translate_tests/convection/GF_2020/cumulus_parameterization/updraft/translate_GF2020_CumulusParameterization_UpdateWorkfunctionAndPrecipitationEnsemble.py b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/tests/translate_tests/convection/GF_2020/cumulus_parameterization/updraft/translate_GF2020_CumulusParameterization_UpdateWorkfunctionAndPrecipitationEnsemble.py index 62f93982e..93f563311 100644 --- a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/tests/translate_tests/convection/GF_2020/cumulus_parameterization/updraft/translate_GF2020_CumulusParameterization_UpdateWorkfunctionAndPrecipitationEnsemble.py +++ b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/tests/translate_tests/convection/GF_2020/cumulus_parameterization/updraft/translate_GF2020_CumulusParameterization_UpdateWorkfunctionAndPrecipitationEnsemble.py @@ -124,7 +124,6 @@ def __call__(self, constants: dict, cu_param_constants: dict, plume: str, **inpu # initialize test code code = UpdateWorkfunctionAndPrecipitationEnsemble( stencil_factory=self.stencil_factory, - quantity_factory=self.quantity_factory, config=config, cumulus_parameterization_config=cumulus_parameterization_config, ) diff --git a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/tests/translate_tests/convection/GF_2020/cumulus_parameterization/updraft/translate_GF2020_CumulusParameterization_UpdraftCIN.py b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/tests/translate_tests/convection/GF_2020/cumulus_parameterization/updraft/translate_GF2020_CumulusParameterization_UpdraftCIN.py index 93863b7ba..8b3164a7b 100644 --- a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/tests/translate_tests/convection/GF_2020/cumulus_parameterization/updraft/translate_GF2020_CumulusParameterization_UpdraftCIN.py +++ b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/tests/translate_tests/convection/GF_2020/cumulus_parameterization/updraft/translate_GF2020_CumulusParameterization_UpdraftCIN.py @@ -114,7 +114,6 @@ def __call__(self, constants: dict, cu_param_constants: dict, plume: str, **inpu # initialize test code code = UpdraftCIN( stencil_factory=self.stencil_factory, - quantity_factory=self.quantity_factory, config=config, cumulus_parameterization_config=cumulus_parameterization_config, ) diff --git a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/tests/translate_tests/convection/GF_2020/cumulus_parameterization/updraft/translate_GF2020_CumulusParameterization_UpdraftInitialWorkfunctions.py b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/tests/translate_tests/convection/GF_2020/cumulus_parameterization/updraft/translate_GF2020_CumulusParameterization_UpdraftInitialWorkfunctions.py index c8e7b9b75..09d75f647 100644 --- a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/tests/translate_tests/convection/GF_2020/cumulus_parameterization/updraft/translate_GF2020_CumulusParameterization_UpdraftInitialWorkfunctions.py +++ b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/tests/translate_tests/convection/GF_2020/cumulus_parameterization/updraft/translate_GF2020_CumulusParameterization_UpdraftInitialWorkfunctions.py @@ -114,7 +114,6 @@ def __call__(self, constants: dict, cu_param_constants: dict, plume: str, **inpu # initialize test code code = UpdraftInitialWorkfunctions( stencil_factory=self.stencil_factory, - quantity_factory=self.quantity_factory, config=config, cumulus_parameterization_config=cumulus_parameterization_config, )