Fix issue of Nd1, Ndr, and Nfr only being in cool = 1

iiasa · Dec 19, 2024 · de60613 · de60613
1 parent 3589696
commit de60613
Showing 1 changed file with 27 additions and 27 deletions.
diff --git a/message_ix_buildings/chilled/core/climate.py b/message_ix_buildings/chilled/core/climate.py
@@ -1604,36 +1604,36 @@ def process_final_maps(config: "Config"):
             # =============================================================================
 
             for parset in par_var.itertuples():
-                if config.cool == 1:
-                    Nd1 = xr.open_dataarray(
-                        os.path.join(
-                            vdd_path,
-                            suff1 + "_" + str(parset.Index) + "_NdALL.nc",
-                        )
-                    ).load()  # For calculation
-                    # Nd = Nd.sum(dim=['arch','month'])/2    #<<< divide by 2 because 2 archetypes
-                    Nd1 = (
-                        Nd1.sum(dim=["urt", "month"]) / 2
-                    )  # <<< divide by 2 (rural + urban)
+                Nd1 = xr.open_dataarray(
+                    os.path.join(
+                        vdd_path,
+                        suff1 + "_" + str(parset.Index) + "_NdALL.nc",
+                    )
+                ).load()  # For calculation
+                # Nd = Nd.sum(dim=['arch','month'])/2    #<<< divide by 2 because 2 archetypes
+                Nd1 = (
+                    Nd1.sum(dim=["urt", "month"]) / 2
+                )  # <<< divide by 2 (rural + urban)
 
-                    Ndr = xr.open_dataarray(
-                        os.path.join(
-                            vdd_path,
-                            suff1 + "_" + str(parset.Index) + "_NdALL.nc",
-                        )
-                    ).load()  # For reporting
-                    # Nd = Nd.sum(dim=['arch','month'])/2    #<<< divide by 2 because 2 archetypes
-                    # Nd = Nd.sum(dim=['month'])    #<<< divide by 2 (rural + urban)
+                Ndr = xr.open_dataarray(
+                    os.path.join(
+                        vdd_path,
+                        suff1 + "_" + str(parset.Index) + "_NdALL.nc",
+                    )
+                ).load()  # For reporting
+                # Nd = Nd.sum(dim=['arch','month'])/2    #<<< divide by 2 because 2 archetypes
+                # Nd = Nd.sum(dim=['month'])    #<<< divide by 2 (rural + urban)
 
-                    Nfr = xr.open_dataarray(
-                        os.path.join(
-                            vdd_path,
-                            suff1 + "_" + str(parset.Index) + "_NfALL.nc",
-                        )
-                    ).load()
-                    # Nf = Nf.sum(dim=['arch','month'])/2    #<<< divide by 2 because 2 archetypes
-                    # Nf = Nf.sum(dim=['month'])  #<<< divide by 2 (rural + urban)
+                Nfr = xr.open_dataarray(
+                    os.path.join(
+                        vdd_path,
+                        suff1 + "_" + str(parset.Index) + "_NfALL.nc",
+                    )
+                ).load()
+                # Nf = Nf.sum(dim=['arch','month'])/2    #<<< divide by 2 because 2 archetypes
+                # Nf = Nf.sum(dim=['month'])  #<<< divide by 2 (rural + urban)
 
+                if config.cool == 1:
                     E_c_ac = (
                         xr.open_dataarray(
                             os.path.join(