diff --git a/open-reac/src/main/resources/openreac/acopf.mod b/open-reac/src/main/resources/openreac/acopf.mod index 5ed1d276..35b42846 100644 --- a/open-reac/src/main/resources/openreac/acopf.mod +++ b/open-reac/src/main/resources/openreac/acopf.mod @@ -134,7 +134,7 @@ var Red_Tran_Rea_Inv{(qq,m,n) in BRANCHCC } = var Red_Tran_Act_Dir_Side_2_Opened{(qq,m,n) in BRANCHCC_WITH_SIDE_2_OPENED} = (branch_Ror[qq,m,n])**2 * V[m] * (branch_Gor_mod[qq,m,n] + (branch_admi[qq,m,n])**2 * branch_Gex_mod[qq,m,n] / ( (branch_Gex_mod[qq,m,n] + branch_admi[qq,m,n] * sin(branch_angper[qq,m,n]))**2 - + (- branch_Bex_mod[qq,m,n] + branch_admi[qq,m,n] * cos(branch_angper[qq,m,n]))**2 ) + + (- branch_Bex_mod[qq,m,n] + branch_admi[qq,m,n] * cos(branch_angper[qq,m,n]))**2 ) + ((branch_Bex_mod[qq,m,n])**2 + (branch_Gex_mod[qq,m,n])**2) * branch_admi[qq,m,n] * sin(branch_angper[qq,m,n]) / ( (branch_Gex_mod[qq,m,n] + branch_admi[qq,m,n] * sin(branch_angper[qq,m,n]))**2 + (- branch_Bex_mod[qq,m,n] + branch_admi[qq,m,n] * cos(branch_angper[qq,m,n]))**2 )) ; diff --git a/open-reac/src/main/resources/openreac/commons.mod b/open-reac/src/main/resources/openreac/commons.mod index 65f33080..5d9fd540 100644 --- a/open-reac/src/main/resources/openreac/commons.mod +++ b/open-reac/src/main/resources/openreac/commons.mod @@ -108,7 +108,7 @@ check {vsc in VSCCONV_NUM}: vscconv_targetP[vsc] != NaN; # set VSCCONVON := setof{(t,v,n) in VSCCONV: n in BUSCC - and abs(vscconv_targetP[v] ) <= PQmax + and abs(vscconv_targetP[v]) <= PQmax and abs(vscconv_Pmin[t,v,n]) <= PQmax and abs(vscconv_Pmax[t,v,n]) <= PQmax and vscconv_targetP[v] >= vscconv_Pmin[t,v,n] @@ -121,7 +121,7 @@ set VSCCONVON := setof{(t,v,n) in VSCCONV: set LCCCONVON := setof{(t,l,n) in LCCCONV: n in BUSCC and abs(lccconv_targetP[l]) <= PQmax - and abs(lccconv_q0[1,l,n]) <= PQmax + and abs(lccconv_q0[1,l,n]) <= PQmax } (l,n);