ltbams 1.0.9__py3-none-any.whl → 1.0.10__py3-none-any.whl

ams/core/__init__.py

@@ -1,2 +1,3 @@
 from ams.core.model import Model  # NOQA
 from ams.core.var import Algeb  # NOQA
+from ams.core.common import Config  # NOQA

ams/core/common.py

@@ -0,0 +1,30 @@
+import logging
+
+from andes.core.common import Config as AndesConfig
+
+logger = logging.getLogger(__name__)
+
+
+class Config(AndesConfig):
+    """
+    A class for storing configuration, can be used in system,
+    model, routine, and other modules.
+
+    Revised from `andes.core.common.Config`.
+    """
+
+    def __init__(self, name, dct=None, **kwargs):
+        super().__init__(name, dct, **kwargs)
+
+    def update(self, dct: dict = None, **kwargs):
+        """
+        Update the configuration from a file.
+        """
+        if dct is not None:
+            kwargs.update(dct)
+
+        for key, val in kwargs.items():
+            self._set(key, val)
+            self._dict[key] = val
+
+        self.check()

ams/core/model.py

@@ -7,13 +7,13 @@ from collections import OrderedDict
 from typing import Iterable
 
 import numpy as np
-from andes.core.common import Config
 from andes.core.param import ExtParam
 from andes.core.service import BaseService, BackRef
 from andes.utils.func import list_flatten
 
 from ams.core.documenter import Documenter
 from ams.core.var import Algeb
+from ams.core.common import Config
 
 from ams.utils.misc import deprec_get_idx
 

ams/core/symprocessor.py

@@ -174,7 +174,7 @@ class SymProcessor:
         # Constraints
         # NOTE: constraints are included in sub_map for ExpressionCalc
         # thus, they don't have the suffix `.v`
-        for cname, constraint in self.parent.constrs.items():
+        for cname, _ in self.parent.constrs.items():
             self.sub_map[rf"\b{cname}\b"] = f'self.rtn.{cname}.optz'
 
         # store tex names defined in `self.config`

ams/extension/eva.py

@@ -17,7 +17,6 @@ from collections import OrderedDict
 
 import scipy.stats as stats
 
-from andes.core import Config
 from andes.core.param import NumParam
 from andes.core.model import ModelData
 from andes.shared import np, pd
@@ -25,6 +24,7 @@ from andes.utils.misc import elapsed
 
 from ams.core.model import Model
 from ams.utils.paths import ams_root
+from ams.core import Config
 
 logger = logging.getLogger(__name__)
 

ams/interface.py

@@ -3,6 +3,7 @@ Module for interfacing ANDES
 """
 
 import os
+import json
 import logging
 from collections import OrderedDict, Counter
 
@@ -81,7 +82,8 @@ def sync_adsys(amsys, adsys):
             try:
                 ad_mdl.set(src=param, attr='v', idx=idx,
                            value=am_mdl.get(src=param, attr='v', idx=idx))
-            except Exception:
+            except Exception as e:
+                logger.warning(f"Failed to sync parameter '{param}' for model '{mname}': {e}")
                 continue
     return True
 
@@ -242,24 +244,43 @@ def parse_addfile(adsys, amsys, addfile):
             logger.debug('Addfile format guessed as %s.', key)
             break
 
-    if key != 'xlsx':
-        logger.error('Addfile format "%s" is not supported yet.', add_format)
-        # FIXME: xlsx input file with dyr addfile result into KeyError: 'Toggle'
-        # add_parser = importlib.import_module('andes.io.' + add_format)
-        # if not add_parser.read_add(system, addfile):
-        #     logger.error('Error parsing addfile "%s" with %s parser.', addfile, add_format)
-        return adsys
+    # FIXME: xlsx input file with dyr addfile result into KeyError: 'Toggle'
+    # add_parser = importlib.import_module('andes.io.' + add_format)
+    # if not add_parser.read_add(system, addfile):
+    #     logger.error('Error parsing addfile "%s" with %s parser.', addfile, add_format)
 
     # Try parsing the addfile
     logger.info('Parsing additional file "%s"...', addfile)
 
-    reader = pd.ExcelFile(addfile)
+    if add_format == 'xlsx':
+        reads = pd.read_excel(addfile,
+                              sheet_name=None,
+                              index_col=0,
+                              engine='openpyxl',
+                              )
+    elif add_format == 'json':
+        if isinstance(addfile, str):
+            f = open(addfile, 'r')
+        else:
+            f = addfile
+
+        json_in = json.load(f)
+
+        if f is not addfile:
+            f.close()
+
+        reads = dict()
+        for keys, dct in json_in.items():
+            reads[keys] = pd.DataFrame(dct)
+    else:
+        logger.error("Unsupported addfile format, only 'xlsx' and 'json' formats are supported.")
+        return adsys
 
     pflow_mdl = list(pflow_dict.keys())
 
     pflow_mdls_overlap = []
     for mdl_name in pflow_dict.keys():
-        if mdl_name in reader.sheet_names:
+        if mdl_name in reads.keys():
             pflow_mdls_overlap.append(mdl_name)
 
     if len(pflow_mdls_overlap) > 0:
@@ -269,14 +290,10 @@ def parse_addfile(adsys, amsys, addfile):
 
     pflow_mdl_nonempty = [mdl for mdl in pflow_mdl if amsys.models[mdl].n > 0]
     logger.debug(f"Non-empty PFlow models: {pflow_mdl}")
-    pflow_df_models = pd.read_excel(addfile,
-                                    sheet_name=pflow_mdl_nonempty,
-                                    index_col=0,
-                                    engine='openpyxl',
-                                    )
-    # drop rows that all nan
-    for name, df in pflow_df_models.items():
-        df.dropna(axis=0, how='all', inplace=True)
+    pflow_df_models = {}
+    for key, df in reads.items():
+        if key in pflow_mdl_nonempty:
+            pflow_df_models[key] = df.dropna(axis=0, how='all', inplace=False)
 
     # collect idx_map if difference exists
     idx_map = OrderedDict([])
@@ -290,13 +307,12 @@ def parse_addfile(adsys, amsys, addfile):
             idx_map[name] = dict(zip(ad_idx, am_idx))
 
     # --- dynamic models to be added ---
-    mdl_to_keep = list(set(reader.sheet_names) - set(pflow_mdl))
+    mdl_to_keep = list(set(reads.keys()) - set(pflow_mdl))
     mdl_to_keep.sort(key=str.lower)
-    df_models = pd.read_excel(addfile,
-                              sheet_name=mdl_to_keep,
-                              index_col=0,
-                              engine='openpyxl',
-                              )
+    df_models = {}
+    for key, df in reads.items():
+        if key in mdl_to_keep:
+            df_models[key] = df.dropna(axis=0, how='all', inplace=False)
 
     # adjust models index
     for name, df in df_models.items():

ams/io/matpower.py

@@ -188,6 +188,9 @@ def mpc2system(mpc: dict, system) -> bool:
     Note that `mbase` in mpc is converted to `Sn`, but it is not actually used in
     MATPOWER nor AMS.
 
+    In converted AMS system, StaticGen idxes are 1-based, while the sequence follow
+    the order of the original MATPOWER data.
+
     Parameters
     ----------
     system : ams.system.System
@@ -401,22 +404,27 @@ def mpc2system(mpc: dict, system) -> bool:
                        )
 
     # --- Area ---
-    area_id = np.unique(system.Bus.area.v).astype(int)
-    for area in area_id:
-        area_idx = f'AREA_{area}'
-        system.add('Area', idx=area_idx, name=area)
-    bus_area = system.Bus.area.v
-    bus_area = [f'AREA_{int(area)}' for area in bus_area]
-    system.Bus.area.v = bus_area
+    area = system.Bus.area.v
+    area_map = {}
+    if area:
+        for a in set(area):
+            a_new = system.add('Area',
+                               param_dict=dict(idx=a, name=a))
+            area_map[a] = a_new
+        system.Bus.area.v = [area_map[a] for a in area]
 
     # --- Zone ---
-    zone_id = np.unique(system.Bus.zone.v).astype(int)
-    for zone in zone_id:
-        zone_idx = f'ZONE_{zone}'
-        system.add('Zone', idx=zone_idx, name=zone)
-    bus_zone = system.Bus.zone.v
-    bus_zone = [f'ZONE_{int(zone)}' for zone in bus_zone]
-    system.Bus.zone.v = bus_zone
+    zone = system.Bus.zone.v
+    zone_map = {}
+    if zone:
+        n_zone = system.Area.n
+        for z in set(zone):
+            z_new = system.add('Zone',
+                               param_dict=dict(idx=int(n_zone + 1),
+                                               name=f'{n_zone + 1}'))
+            zone_map[z] = z_new
+            n_zone += 1
+        system.Bus.zone.v = [zone_map[z] for z in zone]
 
     return True
 
@@ -506,8 +514,9 @@ def system2mpc(system) -> dict:
     # --- PQ ---
     if system.PQ.n > 0:
         pq_pos = system.Bus.idx2uid(system.PQ.bus.v)
-        bus[pq_pos, 2] = system.PQ.p0.v * base_mva
-        bus[pq_pos, 3] = system.PQ.q0.v * base_mva
+        u = system.PQ.u.v
+        bus[pq_pos, 2] = u * system.PQ.p0.v * base_mva
+        bus[pq_pos, 3] = u * system.PQ.q0.v * base_mva
 
     # --- Shunt ---
     if system.Shunt.n > 0:
@@ -695,11 +704,16 @@ def mpc2m(mpc: dict, outfile: str) -> str:
 
 def write(system, outfile: str, overwrite: bool = None) -> bool:
     """
-    Export an AMS system to a MATPOWER mpc file.
+    Export an AMS system to a MATPOWER M-file.
 
     This function converts an AMS system object into a MATPOWER-compatible
     mpc dictionary and writes it to a specified output file in MATPOWER format.
 
+    In the converted MPC, the indices of area (bus[:, 6]) and zone (bus[:, 10])
+    may differ from the original MPC. However, the mapping relationship is preserved.
+    For example, if the original MPC numbers areas starting from 1, the converted
+    MPC may number them starting from 0.
+
     Parameters
     ----------
     system : ams.system.System

ams/io/psse.py

@@ -3,4 +3,281 @@ PSS/E .raw reader for AMS.
 This module is the existing module in ``andes.io.psse``.
 """
 
-from andes.io.psse import (read, testlines)  # NOQA
+from andes.io.psse import testlines  # NOQA
+from andes.io.psse import read as ad_read
+from andes.io.xlsx import confirm_overwrite
+from andes.shared import rad2deg, pd
+
+from ams import __version__ as version
+from ams.shared import copyright_msg, nowarranty_msg, report_time
+
+
+def read(system, file):
+    """
+    Read PSS/E RAW file v32/v33 formats.
+
+    Revised from ``andes.io.psse.read`` to complete model ``Zone`` when necessary.
+    """
+    ret = ad_read(system, file)
+    # Extract zone data
+    zone = system.Bus.zone.v
+    zone_map = {}
+
+    # Check if there are zones to process
+    # NOTE: since `Zone` and `Area` below to group `Collection`, we add
+    # numerical Zone idx after the last Area idx.
+    if zone:
+        n_zone = system.Area.n
+        for z in set(zone):
+            # Add new zone and update the mapping
+            z_new = system.add(
+                'Zone',
+                param_dict=dict(idx=n_zone + 1, name=f'{n_zone + 1}')
+            )
+            zone_map[z] = z_new
+            n_zone += 1
+
+        # Update the zone values in the system
+        system.Bus.zone.v = [zone_map[z] for z in zone]
+    return ret
+
+
+def write_raw(system, outfile: str, overwrite: bool = None):
+    """
+    Convert AMS system to PSS/E RAW file.
+
+    Parameters
+    ----------
+    system : System
+        The AMS system to be converted.
+    outfile : str
+        The output file path.
+    overwrite : bool, optional
+        If True, overwrite the file if it exists. If False, do not overwrite.
+    """
+    if not confirm_overwrite(outfile, overwrite=overwrite):
+        return False
+
+    mva = system.config.mva
+    freq = system.config.freq
+    name = system.files.name
+
+    with open(outfile, 'w') as f:
+        # PSS/E version and date
+        f.write(f"0, {mva:.2f}, 33, 0, 1, {freq:.2f}     ")
+
+        f.write(f"/ PSS/E 33 RAW, {report_time}\n")
+        f.write(f"Created by AMS {version}\n")
+        f.write(f"{copyright_msg}\n")
+        f.write(f"{nowarranty_msg}\n")
+        f.write(f"{name.upper()} \n")
+
+        # --- Bus ---
+        bus = system.Bus.cache.df_in
+        # 0,  1,    2,      3,    4,    5,    6,     7,  8,  9,    10
+        # ID, Name, BaseKV, Type, Area, Zone, Owner, Vm, Va, Vmax, Vmin
+        # Define column widths for alignment
+        column_widths = [6, 8, 8, 2, 3, 3, 3, 8, 8, 8, 8]
+        bus_owner = {}
+        for i, o in enumerate(set(bus['owner'])):
+            bus_owner[o] = i + 1
+        for row in bus.itertuples():
+            # Prepare the data for each column
+            data = [
+                int(row.idx), row.name, row.Vn, int(row.type),
+                int(system.Collection.idx2uid(row.area) + 1),
+                int(system.Collection.idx2uid(row.zone) + 1),
+                int(bus_owner[row.owner]),
+                float(row.v0), float(row.a0 * rad2deg),
+                float(row.vmax), float(row.vmin)]
+            # Format each column with ',' as the delimiter
+            formatted_row = ",".join(
+                f"{value:>{width}}" if isinstance(value, (int, float)) else f"'{value:>{width - 2}}'"
+                for value, width in zip(data, column_widths)
+            ) + "\n"
+            # Write the formatted row to the file
+            f.write(formatted_row)
+
+        # --- Load ---
+        f.write("0 / END OF BUS DATA, BEGIN LOAD DATA\n")
+        load = system.PQ.cache.df_in
+        # 0,   1,  2,      3,    4,    5,      6,       7,  8,  9,  10, 11
+        # Bus, Id, Status, Area, Zone, PL(MW), QL (MW), IP, IQ, YP, YQ, Owner
+        # NOTE: load are converted to constant load, IP, IQ, YP, YQ are ignored by setting to 0
+        column_widths = [6, 8, 2, 3, 3, 10, 10, 2, 2, 10, 10, 3]
+        for row in load.itertuples():
+            # Prepare the data for each column
+            data = [
+                int(row.bus),  # Bus number
+                int(system.PQ.idx2uid(row.idx) + 1),  # Load ID (unique index + 1)
+                int(row.u),  # Status
+                int(system.Collection.idx2uid(system.PQ.get('area', row.idx, 'v')) + 1),  # Area number
+                int(system.Collection.idx2uid(system.PQ.get('zone', row.idx, 'v')) + 1),  # Zone number
+                float(row.p0 * mva),  # PL (MW)
+                float(row.q0 * mva),  # QL (MVar)
+                0.0,  # IP (ignored, set to 0)
+                0.0,  # IQ (ignored, set to 0)
+                0.0,  # YP (ignored, set to 0)
+                0.0,  # YQ (ignored, set to 0)
+                int(bus_owner[row.owner])  # Owner
+            ]
+            # Format each column with ',' as the delimiter
+            formatted_row = ",".join(
+                f"{value:>{width}}" if isinstance(value, (int, float)) else f"'{value:>{width - 2}}'"
+                for value, width in zip(data, column_widths)
+            ) + "\n"
+            # Write the formatted row to the file
+            f.write(formatted_row)
+
+        # --- Fixed Shunt ---
+        f.write("0 / END OF LOAD DATA, BEGIN FIXED SHUNT DATA\n")
+        shunt = system.Shunt.cache.df_in
+        # 0,   1,  2,      3,      4
+        # Bus, Id, Status, G (MW), B (Mvar)
+        # NOTE: ANDES parse v33 swshunt into fixed shunt
+        column_widths = [6, 8, 2, 10, 10]
+        for row in shunt.itertuples():
+            # Prepare the data for each column
+            data = [
+                int(row.bus),                                   # Bus number
+                int(system.Shunt.idx2uid(row.idx) + 1),         # Shunt ID (unique index + 1)
+                int(row.u),                                     # Status
+                float(row.g * mva),                             # Conductance (MW at system base)
+                float(row.b * mva)                              # Susceptance (Mvar at system base)
+            ]
+
+            # Format each column with ',' as the delimiter
+            formatted_row = ",".join(
+                f"{value:>{width}}" if isinstance(value, (int, float)) else f"'{value:>{width - 2}}'"
+                for value, width in zip(data, column_widths)
+            ) + "\n"
+            # Write the formatted row to the file
+            f.write(formatted_row)
+
+        # --- Generator ---
+        f.write("0 / END OF FIXED SHUNT DATA, BEGIN GENERATOR DATA\n")
+        pv = system.PV.cache.df_in
+        slack = system.Slack.cache.df_in
+
+        gen = pd.concat([pv, slack.drop(columns=['a0'])], axis=0)
+        gen["subidx"] = gen.groupby('bus').cumcount() + 1
+
+        column_widths = [6, 8, 2, 3, 3, 3, 3, 8, 8, 8, 8, 8, 8]
+        # 0,  1,  2,  3,  4,  5,  6,    7,     8,  9, 10, 11, 12,   13,   14,
+        # I, ID, PG, QG, QT, QB, VS, IREG, MBASE, ZR, ZX, RT, XT, GTAP, STAT,
+        #    15, 16, 17, 18, 19, ...,           26,  27
+        # RMPCT, PT, PB, O1, F1, ..., O4, F4, WMOD, WPF
+        # The columns above for v33 is different from the manual of v34.5, which includes two new columns:
+        # `NREG`` at 8 and `BSLOD` before `O1`
+        for row in gen.itertuples():
+            # Prepare the data for each column
+            data = [
+                int(row.bus),                  # I: Bus number
+                int(row.subidx),               # ID: Generator ID (subindex)
+                float(row.p0 * mva),           # PG: Generated MW
+                float(row.q0 * mva),           # QG: Generated MVar
+                float(row.qmax * mva),         # QT: Max Q (MVar)
+                float(row.qmin * mva),         # QB: Min Q (MVar)
+                float(row.v0),                 # VS: Setpoint voltage (p.u.)
+                int(0),                        # IREG: Regulated bus (not tracked)
+                float(row.Sn if hasattr(row, 'Sn') else mva),  # MBASE: Machine base MVA
+                float(row.ra),                 # ZR: Armature resistance (p.u.)
+                float(row.xs),                 # ZX: Synchronous reactance (p.u.)
+                float(0),                      # RT: Step-up transformer resistance (not tracked)
+                float(0),                      # XT: Step-up transformer reactance (not tracked)
+                int(0),                        # GTAP: Step-up transformer off-nominal turns ratio (not tracked)
+                int(row.u)                     # STAT: Status
+            ]
+            # Format each column with ',' as the delimiter
+            formatted_row = ",".join(
+                f"{value:>{width}}" if isinstance(value, (int, float)) else f"'{value:>{width - 2}}'"
+                for value, width in zip(data, column_widths)
+            ) + "\n"
+            # Write the formatted row to the file
+            f.write(formatted_row)
+
+        # --- Line ---
+        f.write("0 / END OF GENERATOR DATA, BEGIN BRANCH DATA\n")
+        line = system.Line.cache.df_in
+        branch = line[line['trans'] == 0].reset_index(drop=True)
+        transf = line[line['trans'] == 1].reset_index(drop=True)
+        # 1) branch
+        # 0,  1,   2,   3,   4,   5,     6,     7,     8,   9,  10, 11, 12, 13,  14, 15, 16
+        # I,  J,  CKT,  R,   X,   B,  RATEA, RATEB, RATEC, GI,  BI, GJ, BJ, ST, LEN, O1, F1, ..., O4, F4
+        column_widths = [6, 6, 4, 10, 10, 10, 8, 8, 8, 8, 8, 8, 8, 3, 8]
+        for row in branch.itertuples():
+            data = [
+                int(row.bus1),                      # I: From bus number
+                int(row.bus2),                      # J: To bus number
+                "'1'",                              # CKT: Circuit ID (default '1')
+                float(row.r),                       # R: Resistance (p.u.)
+                float(row.x),                       # X: Reactance (p.u.)
+                float(row.b),                       # B: Total line charging (p.u.)
+                float(row.rate_a),                  # RATEA: Rating A (MVA)
+                float(row.rate_b),                  # RATEB: Rating B (MVA)
+                float(row.rate_c),                  # RATEC: Rating C (MVA)
+                0.0,                                # GI: From bus conductance (not tracked)
+                0.0,                                # BI: From bus susceptance (not tracked)
+                0.0,                                # GJ: To bus conductance (not tracked)
+                0.0,                                # BJ: To bus susceptance (not tracked)
+                int(row.u),                         # ST: Status
+                0.0                                 # LEN: Line length (not tracked)
+                # O1, F1, ..., O4, F4 omitted for v33
+            ]
+            formatted_row = ",".join(
+                f"{value:>{width}}" if isinstance(value, (int, float)) else f"{value:>{width}}"
+                for value, width in zip(data, column_widths)
+            ) + "\n"
+            f.write(formatted_row)
+        # 2) transformer
+        f.write("0 / END OF BRANCH DATA, BEGIN TRANSFORMER DATA\n")
+        for row in transf.itertuples():
+            # Map AMS Line (trans) fields to PSSE RAW transformer columns
+            # Only 2-winding transformers are supported here
+            # 0,  1,   2,   3,   4,   5,     6,     7,     8,   9,  10, 11, 12, 13,  14, 15, 16
+            # I,  J,  CKT,  R,   X,   B,  RATEA, RATEB, RATEC, GI,  BI, GJ, BJ, ST, LEN
+            data = [
+                int(row.bus1),                      # I: From bus number
+                int(row.bus2),                      # J: To bus number
+                "'1'",                              # CKT: Circuit ID (default '1')
+                float(row.r),                       # R: Resistance (p.u.)
+                float(row.x),                       # X: Reactance (p.u.)
+                float(row.b),                       # B: Total line charging (p.u.)
+                float(row.rate_a),                  # RATEA: Rating A (MVA)
+                float(row.rate_b),                  # RATEB: Rating B (MVA)
+                float(row.rate_c),                  # RATEC: Rating C (MVA)
+                0.0,                                # GI: From bus conductance (not tracked)
+                0.0,                                # BI: From bus susceptance (not tracked)
+                0.0,                                # GJ: To bus conductance (not tracked)
+                0.0,                                # BJ: To bus susceptance (not tracked)
+                int(row.u),                         # ST: Status
+                0.0                                 # LEN: Line length (not tracked)
+                # O1, F1, ..., O4, F4 omitted for v33
+            ]
+            formatted_row = ",".join(
+                f"{value:>{width}}" if isinstance(value, (int, float)) else f"{value:>{width}}"
+                for value, width in zip(data, column_widths)
+            ) + "\n"
+            f.write(formatted_row)
+
+            # --- Area ---
+            f.write("0 / END OF TRANSFORMER DATA, BEGIN AREA DATA\n")
+            area = system.Area.cache.df_in
+            for row in area.itertuples():
+                # PSSE expects: ID, ISW, PDES, PTOL, NAME
+                # Here, ISW, PDES, PTOL are set to 0 by default
+                f.write(f"{int(system.Area.idx2uid(row.idx) + 1):6d}, 0, 0.0, 0.0, '{row.name}'\n")
+
+            # --- Zone ---
+            f.write("0 / END OF AREA DATA, BEGIN ZONE DATA\n")
+            zone = system.Zone.cache.df_in
+            # 0,    1
+            # ID, Name
+            for row in zone.itertuples():
+                f.write(f"{int(system.Zone.idx2uid(row.idx) + 1):6d}, '{row.name}'\n")
+            f.write("0 / END OF ZONE DATA\n")
+
+        # End of file
+        f.write("Q\n")
+
+    return True

ams/main.py

@@ -105,8 +105,8 @@ def config_logger(stream_level=logging.INFO, *,
 
     else:
         # update the handlers
-        set_logger_level(logger, logging.StreamHandler, stream_level)
-        set_logger_level(logger, logging.FileHandler, file_level)
+        set_logger_level(lg, logging.StreamHandler, stream_level)
+        set_logger_level(lg, logging.FileHandler, file_level)
 
     if not is_interactive():
         coloredlogs.install(logger=lg, level=stream_level, fmt=sh_formatter_str)

ams/models/group.py

@@ -220,7 +220,8 @@ class StaticShunt(GroupBase):
     """
     Static shunt compensator group.
     """
-    pass
+    def __init__(self):
+        super().__init__()
 
 
 class Information(GroupBase):

ams/models/static/pq.py

@@ -53,9 +53,13 @@ class PQ(PQData, Model):
                               q2z=r"\gamma_{q2z}",
                               )
 
-        self.area = ExtParam(model='Bus', src='area', indexer=self.bus, export=False,
-                             info='Retrieved area idx', vtype=str, default=None,
-                             )
         self.ctrl = NumParam(default=1,
                              info="load controllability",
                              tex_name=r'c_{trl}',)
+
+        self.area = ExtParam(model='Bus', src='area', indexer=self.bus, export=False,
+                             info='Retrieved area idx', vtype=str, default=None,
+                             )
+        self.zone = ExtParam(model='Bus', src='zone', indexer=self.bus, export=False,
+                             info='Retrieved zone idx', vtype=str, default=None,
+                             )

ams/opt/param.py

@@ -9,10 +9,9 @@ import re
 
 import numpy as np
 
-from andes.core.common import Config
-
 import cvxpy as cp
 
+from ams.core import Config
 from ams.shared import sps
 
 from ams.opt import OptzBase, ensure_symbols, ensure_mats_and_parsed

ams/routines/__init__.py

@@ -8,7 +8,6 @@ from andes.utils.func import list_flatten
 all_routines = OrderedDict([
     ('dcpf', ['DCPF']),
     ('pflow', ['PFlow']),
-    ('cpf', ['CPF']),
     ('acopf', ['ACOPF']),
     ('dcopf', ['DCOPF']),
     ('dcopf2', ['DCOPF2']),
@@ -16,8 +15,8 @@ all_routines = OrderedDict([
     ('rted', ['RTED', 'RTEDDG', 'RTEDES', 'RTEDVIS']),
     ('uc', ['UC', 'UCDG', 'UCES']),
     ('dopf', ['DOPF', 'DOPFVIS']),
-    ('pflow0', ['PFlow0']),
-    ('dcpf0', ['DCPF0']),
+    ('pypower', ['DCPF1', 'PFlow1', 'DCOPF1', 'ACOPF1']),
+    ('grbopt', ['OPF']),
 ])
 
 class_names = list_flatten(list(all_routines.values()))