diff --git a/cmake_targets/autotests/test_case_list.xml b/cmake_targets/autotests/test_case_list.xml
index a2c68e9ef6..e31dc1e907 100755
--- a/cmake_targets/autotests/test_case_list.xml
+++ b/cmake_targets/autotests/test_case_list.xml
@@ -1308,10 +1308,20 @@
(Test12: SC-FDMA, 216 PRBs),
(Test13: SC-FDMA, 273 PRBs),
(Test14: SC-FDMA, 3 DMRS),
+<<<<<<< HEAD
(Test15: MCS 19 50 PRBs 2 RX_Antenna),
(Test16: MCS 9 106 PRBs MIMO 2 layers),
(Test17: MCS 9 106 PRBs MIMO 4 layers),
(Test18: 25 PRBs, 15 kHz SCS)
+=======
+ (Test15: MCS 19 50 PRBs 2 RX_Antenna)
+ (Test16: MCS 9 106 PRBs MIMO 2 layers)
+ (Test17: MCS 9 106 PRBs MIMO 4 layers)
+ (Test18: MCS 16 50 PRBs 2 RX_Antenna),
+ (Test19: 3GPP G-FR1-A4-13 2 RX Antennas Requirements Test),
+ (Test20: 3GPP G-FR1-A4-13 4 RX Antennas Requirements Test),
+ (Test21: 3GPP G-FR1-A4-13 8 RX Antennas Requirements Test)
+>>>>>>> Added 3GPP TS 38104 8.2.1.2-13 16QAM CI test cases
$OPENAIR_DIR/cmake_targets/build_oai
--phy_simulators -c
@@ -1335,8 +1345,17 @@
-n100 -m19 -s10 -S15 -z2
-n100 -m9 -r106 -s10 -W2 -y2 -z2
-n100 -m9 -r106 -s20 -W4 -y4 -z4
+<<<<<<< HEAD
-n100 -u0 -m0 -R25 -r25 -i
nr_ulsim.test1 nr_ulsim.test2 nr_ulsim.test3 nr_ulsim.test4 nr_ulsim.test5 nr_ulsim.test6 nr_ulsim.test7 nr_ulsim.test8 nr_ulsim.test9 nr_ulsim.test10 nr_ulsim.test11 nr_ulsim.test12 nr_ulsim.test13 nr_ulsim.test14 nr_ulsim.test15 nr_ulsim.test16 nr_ulsim.test17 nr_ulsim.test18
+=======
+ -n100 -m16 -s10 -z2
+ -m16 -r106 -s8.8 -S9 -z2 -n1000 -U 3 1 1 2 -gI -b14 -t70 -I15
+ -m16 -r106 -s5 -S6 -z4 -n1000 -U 3 1 1 2 -gI -b14 -t70 -I15
+ -m16 -r106 -s3 -S4 -z8 -n1000 -U 3 1 1 2 -gI -b14 -t70 -I15
+
+ nr_ulsim.test1 nr_ulsim.test2 nr_ulsim.test3 nr_ulsim.test4 nr_ulsim.test5 nr_ulsim.test6 nr_ulsim.test7 nr_ulsim.test8 nr_ulsim.test9 nr_ulsim.test10 nr_ulsim.test11 nr_ulsim.test12 nr_ulsim.test13 nr_ulsim.test14 nr_ulsim.test15 nr_ulsim.test16 nr_ulsim.test17 nr_ulsim.test18 nr_ulsim.test19 nr_ulsim.test20 nr_ulsim.test21
+>>>>>>> Added 3GPP TS 38104 8.2.1.2-13 16QAM CI test cases
PUSCH test OK
segmentation fault|assertion|exiting|fatal
3
diff --git a/openair1/SIMULATION/NR_PHY/ulsim.c b/openair1/SIMULATION/NR_PHY/ulsim.c
index 4f160f52ad..02038f34fa 100644
--- a/openair1/SIMULATION/NR_PHY/ulsim.c
+++ b/openair1/SIMULATION/NR_PHY/ulsim.c
@@ -312,7 +312,7 @@ int main(int argc, char **argv)
float roundStats[100];
double effRate[100];
double effTP[100];
- float eff_tp_check = 0.7;
+ float eff_tp_check = 100;
uint8_t snrRun;
int prb_inter = 0;
@@ -487,7 +487,7 @@ int main(int argc, char **argv)
break;
case 't':
- eff_tp_check = (float)atoi(optarg)/100;
+ eff_tp_check = (float)atoi(optarg);
break;
/*
@@ -1602,10 +1602,11 @@ int main(int argc, char **argv)
if(n_trials==1)
break;
- if (effRate[snrRun] > (eff_tp_check*TBS)) {
+ if ((float)effTP[snrRun] >= eff_tp_check) {
printf("*************\n");
printf("PUSCH test OK\n");
printf("*************\n");
+ break;
}
snrStats[snrRun] = SNR;