Merge remote-tracking branch 'origin/develop-nr' into develop-nr-merge2-parallel

Conflicts: targets/RT/USER/nr-ru.c

Merge remote-tracking branch 'origin/develop-nr' into develop-nr-merge2-parallel
Conflicts: targets/RT/USER/nr-ru.c
bad3c770 · Florian Kaltenberger · b6dc14f4 · 01aead2b · bad3c770 · bad3c770
Commit bad3c770 authored Nov 09, 2018 by Florian Kaltenberger
46 changed files
--- a/ci-scripts/Jenkinsfile-gitlab
+++ b/ci-scripts/Jenkinsfile-gitlab
--- a/ci-scripts/Jenkinsfile-tmp-ran
+++ b/ci-scripts/Jenkinsfile-tmp-ran
@@ -61,6 +61,7 @@ pipeline {
    options {
        disableConcurrentBuilds()
        ansiColor('xterm')
+        lock (ciSmartPhoneResource)
    }
    // the following parameter options are commented out so it shows the ones
    // that you SHALL have to run the job.
@@ -184,7 +185,6 @@ pipeline {
            steps {
                script {
                    dir ('ci-scripts') {
-                      lock (ciSmartPhoneResource) {
                        try {
                            echo "\u2705 \u001B[32m${testStageName}\u001B[0m"
                            withCredentials([
@@ -197,7 +197,6 @@ pipeline {
                        } catch (Exception e) {
                            currentBuild.result = 'FAILURE'
                        }
-                      }
                    }
                }
            }

--- a/ci-scripts/buildOnVM.sh
+++ b/ci-scripts/buildOnVM.sh
--- a/ci-scripts/conf_files/enb.band40.tm1.100PRB.FairScheduler.usrpb210.conf
+++ b/ci-scripts/conf_files/enb.band40.tm1.100PRB.FairScheduler.usrpb210.conf
@@ -134,7 +134,7 @@ eNBs =
    };
    ////////// MME parameters:
-    mme_ip_address      = ( { ipv4       = "10.0.0.2";
+    mme_ip_address      = ( { ipv4       = "CI_MME_IP_ADDR";
                              ipv6       = "192:168:30::17";
                              active     = "yes";
                              preference = "ipv4";
@@ -144,13 +144,11 @@ eNBs =
    NETWORK_INTERFACES :
    {
        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
-        ENB_IPV4_ADDRESS_FOR_S1_MME              = "10.0.0.1/24";
+        ENB_IPV4_ADDRESS_FOR_S1_MME              = "CI_ENB_IP_ADDR";
        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
-        ENB_IPV4_ADDRESS_FOR_S1U                 = "10.0.0.1/24";
+        ENB_IPV4_ADDRESS_FOR_S1U                 = "CI_ENB_IP_ADDR";
        ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
+        ENB_IPV4_ADDRESS_FOR_X2C                 = "CI_ENB_IP_ADDR";
-        ENB_IPV4_ADDRESS_FOR_X2C                 = "192.168.12.111/24";
        ENB_PORT_FOR_X2C                         = 36422; # Spec 36422
    };

--- a/ci-scripts/conf_files/enb.band40.tm1.25PRB.FairScheduler.usrpb210.conf
+++ b/ci-scripts/conf_files/enb.band40.tm1.25PRB.FairScheduler.usrpb210.conf
@@ -134,7 +134,7 @@ eNBs =
    };
    ////////// MME parameters:
-    mme_ip_address      = ( { ipv4       = "10.0.0.2";
+    mme_ip_address      = ( { ipv4       = "CI_MME_IP_ADDR";
                              ipv6       = "192:168:30::17";
                              active     = "yes";
                              preference = "ipv4";
@@ -144,13 +144,11 @@ eNBs =
    NETWORK_INTERFACES :
    {
        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
-        ENB_IPV4_ADDRESS_FOR_S1_MME              = "10.0.0.1/24";
+        ENB_IPV4_ADDRESS_FOR_S1_MME              = "CI_ENB_IP_ADDR";
        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
-        ENB_IPV4_ADDRESS_FOR_S1U                 = "10.0.0.1/24";
+        ENB_IPV4_ADDRESS_FOR_S1U                 = "CI_ENB_IP_ADDR";
        ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
+        ENB_IPV4_ADDRESS_FOR_X2C                 = "CI_ENB_IP_ADDR";
-        ENB_IPV4_ADDRESS_FOR_X2C                 = "192.168.12.111/24";
        ENB_PORT_FOR_X2C                         = 36422; # Spec 36422
    };

--- a/ci-scripts/conf_files/enb.band40.tm1.50PRB.FairScheduler.usrpb210.conf
+++ b/ci-scripts/conf_files/enb.band40.tm1.50PRB.FairScheduler.usrpb210.conf
@@ -134,7 +134,7 @@ eNBs =
    };
    ////////// MME parameters:
-    mme_ip_address      = ( { ipv4       = "10.0.0.2";
+    mme_ip_address      = ( { ipv4       = "CI_MME_IP_ADDR";
                              ipv6       = "192:168:30::17";
                              active     = "yes";
                              preference = "ipv4";
@@ -144,13 +144,11 @@ eNBs =
    NETWORK_INTERFACES :
    {
        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
-        ENB_IPV4_ADDRESS_FOR_S1_MME              = "10.0.0.1/24";
+        ENB_IPV4_ADDRESS_FOR_S1_MME              = "CI_ENB_IP_ADDR";
        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
-        ENB_IPV4_ADDRESS_FOR_S1U                 = "10.0.0.1/24";
+        ENB_IPV4_ADDRESS_FOR_S1U                 = "CI_ENB_IP_ADDR";
        ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
+        ENB_IPV4_ADDRESS_FOR_X2C                 = "CI_ENB_IP_ADDR";
-        ENB_IPV4_ADDRESS_FOR_X2C                 = "192.168.12.111/24";
        ENB_PORT_FOR_X2C                         = 36422; # Spec 36422
    };

--- a/ci-scripts/conf_files/enb.band7.tm1.100PRB.usrpb210.conf
+++ b/ci-scripts/conf_files/enb.band7.tm1.100PRB.usrpb210.conf
@@ -171,7 +171,7 @@ eNBs =
    ////////// MME parameters:
-    mme_ip_address      = ( { ipv4       = "192.168.12.26";
+    mme_ip_address      = ( { ipv4       = "CI_MME_IP_ADDR";
                              ipv6       = "192:168:30::17";
                              active     = "yes";
                              preference = "ipv4";
@@ -181,12 +181,11 @@ eNBs =
    NETWORK_INTERFACES :
    {
        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
-        ENB_IPV4_ADDRESS_FOR_S1_MME              = "192.168.12.111/24";
+        ENB_IPV4_ADDRESS_FOR_S1_MME              = "CI_ENB_IP_ADDR";
        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
-        ENB_IPV4_ADDRESS_FOR_S1U                 = "192.168.12.111/24";
+        ENB_IPV4_ADDRESS_FOR_S1U                 = "CI_ENB_IP_ADDR";
        ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
+        ENB_IPV4_ADDRESS_FOR_X2C                 = "CI_ENB_IP_ADDR";
-        ENB_IPV4_ADDRESS_FOR_X2C                 = "192.168.12.111/24";
        ENB_PORT_FOR_X2C                         = 36422; # Spec 36422
    };
  }

--- a/ci-scripts/conf_files/enb.band7.tm1.25PRB.usrpb210.conf
+++ b/ci-scripts/conf_files/enb.band7.tm1.25PRB.usrpb210.conf
@@ -171,7 +171,7 @@ eNBs =
    ////////// MME parameters:
-    mme_ip_address      = ( { ipv4       = "192.168.12.26";
+    mme_ip_address      = ( { ipv4       = "CI_MME_IP_ADDR";
                              ipv6       = "192:168:30::17";
                              active     = "yes";
                              preference = "ipv4";
@@ -181,12 +181,11 @@ eNBs =
    NETWORK_INTERFACES :
    {
        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
-        ENB_IPV4_ADDRESS_FOR_S1_MME              = "192.168.12.111/24";
+        ENB_IPV4_ADDRESS_FOR_S1_MME              = "CI_ENB_IP_ADDR";
        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
-        ENB_IPV4_ADDRESS_FOR_S1U                 = "192.168.12.111/24";
+        ENB_IPV4_ADDRESS_FOR_S1U                 = "CI_ENB_IP_ADDR";
        ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
+        ENB_IPV4_ADDRESS_FOR_X2C                 = "CI_ENB_IP_ADDR";
-        ENB_IPV4_ADDRESS_FOR_X2C                 = "192.168.12.111/24";
        ENB_PORT_FOR_X2C                         = 36422; # Spec 36422
    };
  }

--- a/ci-scripts/conf_files/enb.band7.tm1.50PRB.usrpb210.conf
+++ b/ci-scripts/conf_files/enb.band7.tm1.50PRB.usrpb210.conf
@@ -171,7 +171,7 @@ eNBs =
    ////////// MME parameters:
-    mme_ip_address      = ( { ipv4       = "192.168.12.26";
+    mme_ip_address      = ( { ipv4       = "CI_MME_IP_ADDR";
                              ipv6       = "192:168:30::17";
                              active     = "yes";
                              preference = "ipv4";
@@ -181,12 +181,11 @@ eNBs =
    NETWORK_INTERFACES :
    {
        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
-        ENB_IPV4_ADDRESS_FOR_S1_MME              = "192.168.12.111/24";
+        ENB_IPV4_ADDRESS_FOR_S1_MME              = "CI_ENB_IP_ADDR";
        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
-        ENB_IPV4_ADDRESS_FOR_S1U                 = "192.168.12.111/24";
+        ENB_IPV4_ADDRESS_FOR_S1U                 = "CI_ENB_IP_ADDR";
        ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
+        ENB_IPV4_ADDRESS_FOR_X2C                 = "CI_ENB_IP_ADDR";
-        ENB_IPV4_ADDRESS_FOR_X2C                 = "192.168.12.111/24";
        ENB_PORT_FOR_X2C                         = 36422; # Spec 36422
    };
  }

--- a/ci-scripts/conf_files/lte-fdd-basic-sim.conf
+++ b/ci-scripts/conf_files/lte-fdd-basic-sim.conf
@@ -186,7 +186,6 @@ eNBs =
        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
        ENB_IPV4_ADDRESS_FOR_S1U                 = "CI_ENB_IP_ADDR";
        ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
        ENB_IPV4_ADDRESS_FOR_X2C                 = "CI_ENB_IP_ADDR";
        ENB_PORT_FOR_X2C                         = 36422; # Spec 36422
    };

--- a/ci-scripts/conf_files/lte-tdd-basic-sim.conf
+++ b/ci-scripts/conf_files/lte-tdd-basic-sim.conf
@@ -145,11 +145,9 @@ eNBs =
    {
        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
        ENB_IPV4_ADDRESS_FOR_S1_MME              = "CI_ENB_IP_ADDR";
        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
        ENB_IPV4_ADDRESS_FOR_S1U                 = "CI_ENB_IP_ADDR";
        ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
        ENB_IPV4_ADDRESS_FOR_X2C                 = "CI_ENB_IP_ADDR";
        ENB_PORT_FOR_X2C                         = 36422; # Spec 36422
    };

--- a/ci-scripts/conf_files/rcc.band40.tm1.100PRB.FairScheduler.usrpb210.conf
+++ b/ci-scripts/conf_files/rcc.band40.tm1.100PRB.FairScheduler.usrpb210.conf
@@ -137,7 +137,7 @@ eNBs =
    };
    ////////// MME parameters:
-    mme_ip_address      = ( { ipv4       = "10.0.0.2";
+    mme_ip_address      = ( { ipv4       = "CI_MME_IP_ADDR";
                              ipv6       = "192:168:30::17";
                              active     = "yes";
                              preference = "ipv4";
@@ -147,13 +147,11 @@ eNBs =
    NETWORK_INTERFACES :
    {
        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
-        ENB_IPV4_ADDRESS_FOR_S1_MME              = "10.0.0.1/24";
+        ENB_IPV4_ADDRESS_FOR_S1_MME              = "CI_ENB_IP_ADDR";
        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
-        ENB_IPV4_ADDRESS_FOR_S1U                 = "10.0.0.1/24";
+        ENB_IPV4_ADDRESS_FOR_S1U                 = "CI_ENB_IP_ADDR";
        ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
+        ENB_IPV4_ADDRESS_FOR_X2C                 = "CI_ENB_IP_ADDR";
-        ENB_IPV4_ADDRESS_FOR_X2C                 = "192.168.12.111/24";
        ENB_PORT_FOR_X2C                         = 36422; # Spec 36422
    };

--- a/ci-scripts/conf_files/rcc.band40.tm1.25PRB.FairScheduler.usrpb210.conf
+++ b/ci-scripts/conf_files/rcc.band40.tm1.25PRB.FairScheduler.usrpb210.conf
@@ -137,7 +137,7 @@ eNBs =
    };
    ////////// MME parameters:
-    mme_ip_address      = ( { ipv4       = "10.0.0.2";
+    mme_ip_address      = ( { ipv4       = "CI_MME_IP_ADDR";
                              ipv6       = "192:168:30::17";
                              active     = "yes";
                              preference = "ipv4";
@@ -147,13 +147,11 @@ eNBs =
    NETWORK_INTERFACES :
    {
        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
-        ENB_IPV4_ADDRESS_FOR_S1_MME              = "10.0.0.1/24";
+        ENB_IPV4_ADDRESS_FOR_S1_MME              = "CI_ENB_IP_ADDR";
        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
-        ENB_IPV4_ADDRESS_FOR_S1U                 = "10.0.0.1/24";
+        ENB_IPV4_ADDRESS_FOR_S1U                 = "CI_ENB_IP_ADDR";
        ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
+        ENB_IPV4_ADDRESS_FOR_X2C                 = "CI_ENB_IP_ADDR";
-        ENB_IPV4_ADDRESS_FOR_X2C                 = "192.168.12.111/24";
        ENB_PORT_FOR_X2C                         = 36422; # Spec 36422
    };

--- a/ci-scripts/conf_files/rcc.band40.tm1.50PRB.FairScheduler.usrpb210.conf
+++ b/ci-scripts/conf_files/rcc.band40.tm1.50PRB.FairScheduler.usrpb210.conf
@@ -137,7 +137,7 @@ eNBs =
    };
    ////////// MME parameters:
-    mme_ip_address      = ( { ipv4       = "10.0.0.2";
+    mme_ip_address      = ( { ipv4       = "CI_MME_IP_ADDR";
                              ipv6       = "192:168:30::17";
                              active     = "yes";
                              preference = "ipv4";
@@ -147,13 +147,11 @@ eNBs =
    NETWORK_INTERFACES :
    {
        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
-        ENB_IPV4_ADDRESS_FOR_S1_MME              = "10.0.0.1/24";
+        ENB_IPV4_ADDRESS_FOR_S1_MME              = "CI_ENB_IP_ADDR";
        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
-        ENB_IPV4_ADDRESS_FOR_S1U                 = "10.0.0.1/24";
+        ENB_IPV4_ADDRESS_FOR_S1U                 = "CI_ENB_IP_ADDR";
        ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
+        ENB_IPV4_ADDRESS_FOR_X2C                 = "CI_ENB_IP_ADDR";
-        ENB_IPV4_ADDRESS_FOR_X2C                 = "192.168.12.111/24";
        ENB_PORT_FOR_X2C                         = 36422; # Spec 36422
    };

--- a/ci-scripts/conf_files/rcc.band7.tm1.if4p5.lo.100PRB.usrpb210.conf
+++ b/ci-scripts/conf_files/rcc.band7.tm1.if4p5.lo.100PRB.usrpb210.conf
@@ -174,7 +174,7 @@ eNBs =
    ////////// MME parameters:
-    mme_ip_address      = ( { ipv4       = "192.168.12.26";
+    mme_ip_address      = ( { ipv4       = "CI_MME_IP_ADDR";
                              ipv6       = "192:168:30::17";
                              active     = "yes";
                              preference = "ipv4";
@@ -184,12 +184,11 @@ eNBs =
    NETWORK_INTERFACES :
    {
        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
-        ENB_IPV4_ADDRESS_FOR_S1_MME              = "192.168.12.111/24";
+        ENB_IPV4_ADDRESS_FOR_S1_MME              = "CI_ENB_IP_ADDR";
        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
-        ENB_IPV4_ADDRESS_FOR_S1U                 = "192.168.12.111/24";
+        ENB_IPV4_ADDRESS_FOR_S1U                 = "CI_ENB_IP_ADDR";
        ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
+        ENB_IPV4_ADDRESS_FOR_X2C                 = "CI_ENB_IP_ADDR";
-        ENB_IPV4_ADDRESS_FOR_X2C                 = "192.168.12.111/24";
        ENB_PORT_FOR_X2C                         = 36422; # Spec 36422
    };
  }

--- a/ci-scripts/conf_files/rcc.band7.tm1.if4p5.lo.25PRB.usrpb210.conf
+++ b/ci-scripts/conf_files/rcc.band7.tm1.if4p5.lo.25PRB.usrpb210.conf
@@ -174,7 +174,7 @@ eNBs =
    ////////// MME parameters:
-    mme_ip_address      = ( { ipv4       = "192.168.12.26";
+    mme_ip_address      = ( { ipv4       = "CI_MME_IP_ADDR";
                              ipv6       = "192:168:30::17";
                              active     = "yes";
                              preference = "ipv4";
@@ -184,12 +184,11 @@ eNBs =
    NETWORK_INTERFACES :
    {
        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
-        ENB_IPV4_ADDRESS_FOR_S1_MME              = "192.168.12.111/24";
+        ENB_IPV4_ADDRESS_FOR_S1_MME              = "CI_ENB_IP_ADDR";
        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
-        ENB_IPV4_ADDRESS_FOR_S1U                 = "192.168.12.111/24";
+        ENB_IPV4_ADDRESS_FOR_S1U                 = "CI_ENB_IP_ADDR";
        ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
+        ENB_IPV4_ADDRESS_FOR_X2C                 = "CI_ENB_IP_ADDR";
-        ENB_IPV4_ADDRESS_FOR_X2C                 = "192.168.12.111/24";
        ENB_PORT_FOR_X2C                         = 36422; # Spec 36422
    };
  }

--- a/ci-scripts/conf_files/rcc.band7.tm1.if4p5.lo.50PRB.usrpb210.conf
+++ b/ci-scripts/conf_files/rcc.band7.tm1.if4p5.lo.50PRB.usrpb210.conf
@@ -174,7 +174,7 @@ eNBs =
    ////////// MME parameters:
-    mme_ip_address      = ( { ipv4       = "192.168.12.26";
+    mme_ip_address      = ( { ipv4       = "CI_MME_IP_ADDR";
                              ipv6       = "192:168:30::17";
                              active     = "yes";
                              preference = "ipv4";
@@ -184,12 +184,11 @@ eNBs =
    NETWORK_INTERFACES :
    {
        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
-        ENB_IPV4_ADDRESS_FOR_S1_MME              = "192.168.12.111/24";
+        ENB_IPV4_ADDRESS_FOR_S1_MME              = "CI_ENB_IP_ADDR";
        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
-        ENB_IPV4_ADDRESS_FOR_S1U                 = "192.168.12.111/24";
+        ENB_IPV4_ADDRESS_FOR_S1U                 = "CI_ENB_IP_ADDR";
        ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
+        ENB_IPV4_ADDRESS_FOR_X2C                 = "CI_ENB_IP_ADDR";
-        ENB_IPV4_ADDRESS_FOR_X2C                 = "192.168.12.111/24";
        ENB_PORT_FOR_X2C                         = 36422; # Spec 36422
    };
  }

--- a/ci-scripts/createVM.sh
+++ b/ci-scripts/createVM.sh
@@ -20,8 +20,8 @@
 # *      contact@openairinterface.org
 # */
-function usage {
+function create_usage {
-    echo "OAI VM Creation script"
+    echo "OAI CI VM script"
    echo "   Original Author: Raphael Defosseux"
    echo "   Requirements:"
    echo "     -- uvtool uvtool-libvirt apt-cacher"
@@ -31,9 +31,9 @@ function usage {
    echo ""
    echo "Usage:"
    echo "------"
-    echo "    createVM.sh [OPTIONS]"
+    echo "    oai-ci-vm-tool create [OPTIONS]"
    echo ""
-    echo "Options:"
+    echo "Mandatory Options:"
    echo "--------"
    echo "    --job-name #### OR -jn ####"
    echo "    Specify the name of the Jenkins job."
@@ -41,14 +41,7 @@ function usage {
    echo "    --build-id #### OR -id ####"
    echo "    Specify the build ID of the Jenkins job."
    echo ""
-    echo "    --variant enb-usrp     OR -v1"
+    variant_usage
-    echo "    --variant basic-sim    OR -v2"
-    echo "    --variant phy-sim      OR -v3"
-    echo "    --variant cppcheck     OR -v4"
-    echo "    --variant gnb-usrp     OR -v5"
-    echo "    --variant nu-ue-usrp   OR -v6"
-    echo "    --variant enb-ethernet OR -v7"
-    echo "    --variant ue-ethernet  OR -v8"
    echo "    Specify the variant to build."
    echo ""
    echo "    --help OR -h"
@@ -56,158 +49,21 @@ function usage {
    echo ""
 }
-function variant_usage {
+function create_vm {
-    echo "OAI VM Build Check script"
+    echo "############################################################"
-    echo "   Original Author: Raphael Defosseux"
+    echo "OAI CI VM script"
-    echo ""
+    echo "############################################################"
-    echo "    --variant enb-usrp     OR -v1"
+    echo "VM_NAME             = $VM_NAME"
-    echo "    --variant basic-sim    OR -v2"
+    echo "VM_MEMORY           = $VM_MEMORY MBytes"
-    echo "    --variant phy-sim      OR -v3"
+    echo "VM_CPU              = $VM_CPU"
-    echo "    --variant cppcheck     OR -v4"
-    echo "    --variant gnb-usrp     OR -v5"
-    echo "    --variant nu-ue-usrp   OR -v6"
-    echo "    --variant enb-ethernet OR -v7"
-    echo "    --variant ue-ethernet  OR -v8"
-    echo ""
-}
-if [ $# -lt 1 ] || [ $# -gt 6 ]
-then
-    echo "Syntax Error: not the correct number of arguments"
-    echo ""
-    usage
-    exit 1
-fi
-VM_TEMPLATE=ci-
-JOB_NAME=XX
-BUILD_ID=XX
-VM_NAME=ci-enb-usrp
-VM_MEMORY=2048
-VM_CPU=4
-while [[ $# -gt 0 ]]
+    echo "############################################################"
-do
+    echo "Creating VM ($VM_NAME) on Ubuntu Cloud Image base"
-key="$1"
+    echo "############################################################"
+    uvt-kvm create $VM_NAME release=xenial --memory $VM_MEMORY --cpu $VM_CPU --unsafe-caching --template ci-scripts/template-host.xml
+    echo "Waiting for VM to be started"
+    uvt-kvm wait $VM_NAME --insecure
-case $key in
+    VM_IP_ADDR=`uvt-kvm ip $VM_NAME`
-    -h|--help)
+    echo "$VM_NAME has for IP addr = $VM_IP_ADDR"
-    shift
+}
-    usage
-    exit 0
-    ;;
-    -jn|--job-name)
-    JOB_NAME="$2"
-    shift
-    shift
-    ;;
-    -id|--build-id)
-    BUILD_ID="$2"
-    shift
-    shift
-    ;;
-    -v1)
-    VM_NAME=ci-enb-usrp
-    shift
-    ;;
-    -v2)
-    VM_NAME=ci-basic-sim
-    VM_MEMORY=8192
-    shift
-    ;;
-    -v3)
-    VM_NAME=ci-phy-sim
-    shift
-    ;;
-    -v4)
-    VM_NAME=ci-cppcheck
-    VM_MEMORY=8192
-    shift
-    ;;
-    -v5)
-    VM_NAME=ci-gnb-usrp
-    shift
-    ;;
-    -v6)
-    VM_NAME=ci-ue-nr-usrp
-    shift
-    ;;
-    -v7)
-    VM_NAME=ci-enb-ethernet
-    shift
-    ;;
-    -v8)
-    VM_NAME=ci-ue-ethernet
-    shift
-    ;;
-    --variant)
-    variant="$2"
-    case $variant in
-        enb-usrp)
-        VM_NAME=ci-enb-usrp
-        ;;
-        basic-sim)
-        VM_NAME=ci-basic-sim
-        VM_MEMORY=8192
-        ;;
-        phy-sim)
-        VM_NAME=ci-phy-sim
-        ;;
-        cppcheck)
-        VM_NAME=ci-cppcheck
-        VM_MEMORY=8192
-        ;;
-        gnb-usrp)
-        VM_NAME=ci-gnb-usrp
-        ;;
-        nu-ue-usrp)
-        VM_NAME=ci-ue-nr-usrp
-        ;;
-        enb-ethernet)
-        VM_NAME=ci-enb-ethernet
-        ;;
-        ue-ethernet)
-        VM_NAME=ci-ue-ethernet
-        ;;
-        *)
-        echo ""
-        echo "Syntax Error: Invalid Variant option -> $variant"
-        echo ""
-        variant_usage
-        exit 1
-    esac
-    shift
-    shift
-    ;;
-    *)
-    echo "Syntax Error: unknown option: $key"
-    echo ""
-    usage
-    exit 1
-esac
-done
-if [ "$JOB_NAME" == "XX" ] || [ "$BUILD_ID" == "XX" ]
-then
-    VM_TEMPLATE=ci-
-else
-    VM_TEMPLATE=${JOB_NAME}-b${BUILD_ID}-
-fi
-VM_NAME=`echo $VM_NAME | sed -e "s#ci-#$VM_TEMPLATE#"`
-VM_CMDS=${VM_NAME}_cmds.txt
-echo "VM_NAME             = $VM_NAME"
-echo "VM_MEMORY           = $VM_MEMORY MBytes"
-echo "VM_CPU              = $VM_CPU"
-echo "############################################################"
-echo "Creating VM ($VM_NAME) on Ubuntu Cloud Image base"
-echo "############################################################"
-uvt-kvm create $VM_NAME release=xenial --memory $VM_MEMORY --cpu $VM_CPU --unsafe-caching --template ci-scripts/template-host.xml
-echo "Waiting for VM to be started"
-uvt-kvm wait $VM_NAME --insecure
-VM_IP_ADDR=`uvt-kvm ip $VM_NAME`
-echo "$VM_NAME has for IP addr = $VM_IP_ADDR"
-exit 0
--- a/ci-scripts/destroyAllRunningVM.sh
+++ b/ci-scripts/destroyAllRunningVM.sh
@@ -20,15 +20,17 @@
 # *      contact@openairinterface.org
 # */
-function usage {
+function destroy_usage {
-    echo "OAI VM Destroy script"
+    echo "OAI CI VM script"
    echo "   Original Author: Raphael Defosseux"
+    echo "   Requirements:"
+    echo "     -- uvtool uvtool-libvirt apt-cacher"
    echo ""
    echo "Usage:"
    echo "------"
-    echo "    destroyAllRunningVM.sh [OPTIONS]"
+    echo "    oai-ci-vm-tool destroy [OPTIONS]"
    echo ""
-    echo "Options:"
+    echo "Mandatory Options:"
    echo "--------"
    echo "    --job-name #### OR -jn ####"
    echo "    Specify the name of the Jenkins job."
@@ -36,66 +38,26 @@ function usage {
    echo "    --build-id #### OR -id ####"
    echo "    Specify the build ID of the Jenkins job."
    echo ""
+    echo "Options:"
+    echo "--------"
    echo "    --help OR -h"
    echo "    Print this help message."
    echo ""
 }
-if [ $# -gt 4 ]
+function destroy_vm {
-then
+    echo "############################################################"
-    echo "Syntax Error: not the correct number of arguments"
+    echo "OAI CI VM script"
-    echo ""
+    echo "############################################################"
-    usage
+    echo "VM_TEMPLATE         = $VM_TEMPLATE"
-    exit 1
-fi
+    LIST_CI_VM=`uvt-kvm list | grep $VM_TEMPLATE`
-VM_TEMPLATE=ci-
+    for CI_VM in $LIST_CI_VM
-JOB_NAME=XX
+    do
-BUILD_ID=XX
+        VM_IP_ADDR=`uvt-kvm ip $CI_VM`
+        echo "VM to destroy: $CI_VM -- IP $VM_IP_ADDR"
-while [[ $# -gt 0 ]]
+        uvt-kvm destroy $CI_VM
-do
+        ssh-keygen -R $VM_IP_ADDR
-key="$1"
+    done
-case $key in
+}
-    -h|--help)
-    shift
-    usage
-    exit 0
-    ;;
-    -jn|--job-name)
-    JOB_NAME="$2"
-    shift
-    shift
-    ;;
-    -id|--build-id)
-    BUILD_ID="$2"
-    shift
-    shift
-    ;;
-    *)
-    echo "Syntax Error: unknown option: $key"
-    echo ""
-    usage
-    exit 1
-esac
-done
-if [ "$JOB_NAME" == "XX" ] || [ "$BUILD_ID" == "XX" ]
-then
-    VM_TEMPLATE=ci-
-else
-    VM_TEMPLATE=${JOB_NAME}-b${BUILD_ID}-
-fi
-LIST_CI_VM=`uvt-kvm list | grep $VM_TEMPLATE`
-for CI_VM in $LIST_CI_VM
-do
-    VM_IP_ADDR=`uvt-kvm ip $CI_VM`
-    echo "VM to destroy: $CI_VM -- IP $VM_IP_ADDR"
-    uvt-kvm destroy $CI_VM
-    ssh-keygen -R $VM_IP_ADDR
-done
-exit 0
--- a/ci-scripts/main.py
+++ b/ci-scripts/main.py
@@ -367,10 +367,8 @@ class SSHConnection():
 			rruCheck = True
 		# Make a copy and adapt to EPC / eNB IP addresses
 		self.command('cp ' + full_config_file + ' ' + ci_full_config_file, '\$', 5)
-		self.command('sed -i -e \'s/mme_ip_address.*$/mme_ip_address      = ( { ipv4       = "' + self.EPCIPAddress + '";/\' ' + ci_full_config_file, '\$', 2);
+		self.command('sed -i -e \'s/CI_MME_IP_ADDR/' + self.EPCIPAddress + '/\' ' + ci_full_config_file, '\$', 2);
-		self.command('sed -i -e \'s/ENB_IPV4_ADDRESS_FOR_S1_MME.*$/ENB_IPV4_ADDRESS_FOR_S1_MME              = "' + self.eNBIPAddress + '";/\' ' + ci_full_config_file, '\$', 2);
+		self.command('sed -i -e \'s/CI_ENB_IP_ADDR/' + self.eNBIPAddress + '/\' ' + ci_full_config_file, '\$', 2);
-		self.command('sed -i -e \'s/ENB_IPV4_ADDRESS_FOR_S1U.*$/ENB_IPV4_ADDRESS_FOR_S1U                 = "' + self.eNBIPAddress + '";/\' ' + ci_full_config_file, '\$', 2);
-		self.command('sed -i -e \'s/ENB_IPV4_ADDRESS_FOR_X2C.*$/ENB_IPV4_ADDRESS_FOR_X2C                 = "' + self.eNBIPAddress + '";/\' ' + ci_full_config_file, '\$', 2);
 		# Launch eNB with the modified config file
 		self.command('source oaienv', '\$', 5)
 		self.command('cd cmake_targets', '\$', 5)

--- a/ci-scripts/oai-ci-vm-tool
+++ b/ci-scripts/oai-ci-vm-tool
--- a/ci-scripts/reportBuildLocally.sh
+++ b/ci-scripts/reportBuildLocally.sh
--- a/ci-scripts/reportTestLocally.sh
+++ b/ci-scripts/reportTestLocally.sh
--- a/ci-scripts/runTestOnVM.sh
+++ b/ci-scripts/runTestOnVM.sh
--- a/ci-scripts/waitBuildOnVM.sh
+++ b/ci-scripts/waitBuildOnVM.sh
--- a/cmake_targets/CMakeLists.txt
+++ b/cmake_targets/CMakeLists.txt
@@ -2142,6 +2142,9 @@ if (${XFORMS})
  set(XFORMS_SOURCE
    ${OPENAIR1_DIR}/PHY/TOOLS/lte_phy_scope.c
    )
+  set(XFORMS_SOURCE_NR
+    ${OPENAIR1_DIR}/PHY/TOOLS/nr_phy_scope.c
+    )
  set(XFORMS_SOURCE_SOFTMODEM
    ${OPENAIR_TARGETS}/RT/USER/stats.c
    )
@@ -2444,7 +2447,7 @@ add_executable(nr-uesoftmodem
  ${OPENAIR3_DIR}/NAS/UE/nas_ue_task.c
  ${OPENAIR_DIR}/common/utils/utils.c
  ${OPENAIR_DIR}/common/utils/system.c
-  ${XFORMS_SOURCE}
+  ${XFORMS_SOURCE_NR}
  ${XFORMS_SOURCE_SOFTMODEM}
  ${T_SOURCE}
  ${CONFIG_SOURCES}
@@ -2478,7 +2481,7 @@ add_executable(nr-uesoftmodem-nos1
  ${OPENAIR1_DIR}/SIMULATION/ETH_TRANSPORT/netlink_init.c
  ${OPENAIR_DIR}/common/utils/utils.c
  ${OPENAIR_DIR}/common/utils/system.c
-  ${XFORMS_SOURCE}
+  ${XFORMS_SOURCE_NR}
  ${XFORMS_SOURCE_SOFTMODEM}
  ${T_SOURCE}
  ${CONFIG_SOURCES}
@@ -2544,8 +2547,8 @@ target_link_libraries(polartest SIMU PHY PHY_NR PHY_COMMON m ${ATLAS_LIBRARIES})
 add_executable(ldpctest  ${OPENAIR1_DIR}/PHY/CODING/TESTBENCH/ldpctest.c)
 target_link_libraries(ldpctest SIMU PHY PHY_NR m ${ATLAS_LIBRARIES})
-add_executable(nr_pbchsim  ${OPENAIR1_DIR}/SIMULATION/NR_PHY/pbchsim.c )
+add_executable(nr_pbchsim  ${OPENAIR1_DIR}/SIMULATION/NR_PHY/pbchsim.c ${T_SOURCE})
-target_link_libraries(nr_pbchsim  -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB CONFIG_LIB -Wl,--end-group m pthread ${ATLAS_LIBRARIES} dl)
+target_link_libraries(nr_pbchsim  -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB CONFIG_LIB -Wl,--end-group m pthread ${ATLAS_LIBRARIES} ${T_LIB} dl)
 foreach(myExe dlsim dlsim_tm7 ulsim pbchsim scansim mbmssim pdcchsim pucchsim prachsim syncsim)

--- a/cmake_targets/autotests/run_exec_autotests.bash
+++ b/cmake_targets/autotests/run_exec_autotests.bash
@@ -303,8 +303,9 @@ function test_compile_and_run() {
      do
        global_result=1
        result_string=""
-        PROPER_DESC=`echo ${desc_array[$tags_array_index]} | sed -e "s@^.*lsim.*est case.*(Test@Test@" -e "s@^ *(@@" -e "s/),$//"`
+        PROPER_DESC=`echo ${desc_array[$tags_array_index]} | sed -e "s@^.*Test cases.*(Test@Test@" -e "s@^ *(@@" -e"s/)$//" -e "s/),$//"`
+        echo_info "$PROPER_DESC"
       for (( run_index=1; run_index <= $nruns; run_index++ ))
        do
          temp_exec_log=$log_dir/test.$test_case_name.${tags_array[$tags_array_index]}.run_$run_index

--- a/cmake_targets/autotests/test_case_list.xml
+++ b/cmake_targets/autotests/test_case_list.xml
@@ -933,23 +933,20 @@
    <testCase id="015100">
      <class>execution</class>
-      <desc>dlsim test cases (Test 1: 10 MHz, R2.FDD (MCS 5), EVA5, -1dB), 
+      <desc>dlsim Test cases. (Test 1: 10 MHz, R2.FDD (MCS 5), EVA5, -1dB),
      (Test 5: 1.4 MHz, R4.FDD (MCS 4), EVA5, 0dB (70%)),
-      (Test 6, 10 MHz, R3.FDD (MCS 15), EVA5, 6.7dB (70%)),
+      (Test 6: 10 MHz, R3.FDD (MCS 15), EVA5, 6.7dB (70%)),
-      (Test 6b, 5 MHz, R3-1.FDD (MCS 15), EVA5, 6.7dB (70%)),
+      (Test 6b: 5 MHz, R3-1.FDD (MCS 15), EVA5, 6.7dB (70%)),
-      (Test 7, 5 MHz, R3-1.FDD (MCS 15), EVA5, 6.7dB (30%)),
+      (Test 7: 10 MHz, R3-1.FDD (MCS 15), EVA5, 6.7dB (30%)),
-      (Test 7b, 5 MHz, R3-1.FDD (MCS 15), ETU70, 1.4 dB (30%)),
+      (Test 7b: 5 MHz, R3-1.FDD (MCS 15), ETU70, 1.4 dB (30%)),
-      (Test 10, 5 MHz, R6.FDD (MCS 25), EVA5, 17.4 dB (70%)),
+      (Test 10: 5 MHz, R6.FDD (MCS 25), EVA5, 17.4 dB (70%)),
-      (Test 10b, 5 MHz, R6-1.FDD (MCS 24,18 PRB), EVA5, 17.5dB (70%)),
+      (Test 10b: 5 MHz, R6-1.FDD (MCS 24,18 PRB), EVA5, 17.5dB (70%)),
-      (Test 11, 10 MHz, R7.FDD (MCS 25), EVA5, 17.7dB (70%)),
+      (Test 11: 10 MHz, R7.FDD (MCS 25), EVA5, 17.7dB (70%)),
-      (Test 11b, 10 MHz, R7-1.FDD (MCS 25), EVA5, 16.7dB (70%)),
+      (Test 15: 20 MHz, R.9 FDD	(MCS 26), EVA5, 17.6dB (70%)),
-      (Test 15, 20 MHz, R.9 FDD	(MCS 26), EVA5, 17.6dB (70%)),
+      (Test 15b: 20 MHz, R.9-2 FDD (MCS 26, 17PRB), EVA5, 17.3dB (70%)),
-      (Test 15b, 20 MHz, R.9-2 FDD (MCS 26, 17PRB), EVA5, 17.3dB (70%)),
+      (Test 15c: 20 MHz, R.9-1 FDD (MCS 26, 83 PRB), EVA5, 16.6dB (70%)),
-      (Test 15c, 20 MHz, R.9-1 FDD (MCS 26, 83 PRB), EVA5, 16.6dB (70%)),
+      (TM2 Test 1: 10 MHz, R.11 FDD (MCS 14), EVA5, 6.8 dB (70%)),
+      (TM2 Test 1b: 5 MHz, R.11-2 FDD (MCS 13), EVA5, 5.9 dB (70%))</desc>
-      (TM2 Test 1 10 MHz, R.11 FDD (MCS 14), EVA5, 6.8 dB (70%)),
-      (TM2 Test 1b 5 MHz, R.11-2 FDD (MCS 13), EVA5, 5.9 dB (70%)),
-       </desc>
      <pre_compile_prog></pre_compile_prog>
      <compile_prog>$OPENAIR_DIR/cmake_targets/build_oai</compile_prog>
      <compile_prog_args> --phy_simulators  -c </compile_prog_args>
@@ -970,7 +967,7 @@
                       -m26 -gF -s16.6 -w1.0 -f.2 -n500 -B100 -c2 -z2 -r1899 -O60
 		       -m14 -gF -s6.8  -w1.0 -f.2 -n500 -B50 -c2 -x2 -y2 -z2 -O60
                       -m13 -gF -s5.9  -w1.0 -f.2 -n500 -B25 -c3 -x2 -y2 -z2 -O60</main_exec_args>
-      <tags>dlsim.test1 dlsim.test5 dlsim.test6 dlsim.test6b dlsim.test7 dlsim.test7b dlsim.test10 dlsim.test10b dlsim.test11 dlsim.TM2_test1 dlsim.TM2_test1b</tags>
+      <tags>dlsim.test1 dlsim.test5 dlsim.test6 dlsim.test6b dlsim.test7 dlsim.test7b dlsim.test10 dlsim.test10b dlsim.test11 dlsim.test11a dlsim.test11b dlsim.test11c dlsim.TM2_test1 dlsim.TM2_test1b</tags>
      <search_expr_true>"passed"</search_expr_true>
      <search_expr_false>segmentation fault|assertion|exiting|fatal</search_expr_false>
      <nruns>3</nruns>
@@ -978,12 +975,12 @@
    <testCase id="015101">
      <class>execution</class>
-      <desc>ulsim Test cases. (Test 1, 5 MHz, FDD (MCS 5), AWGN, 6dB), 
+      <desc>ulsim Test cases. (Test 1: 5 MHz, FDD (MCS 5), AWGN, 6dB),
-             (Test 2, 5 MHz, FDD (MCS 16), AWGN , 12dB (70%)),
+             (Test 2: 5 MHz, FDD (MCS 16), AWGN , 12dB (70%)),
-             (Test 3, 10 MHz, R3.FDD (MCS 5), AWGN, 6dB (70%)),
+             (Test 3: 10 MHz, R3.FDD (MCS 5), AWGN, 6dB (70%)),
-             (Test 4, 10 MHz, R3-1.FDD (MCS 16), AWGN, 12dB (70%)),
+             (Test 4: 10 MHz, R3-1.FDD (MCS 16), AWGN, 12dB (70%)),
-             (Test 5, 20 MHz, FDD (MCS 5), AWGN, 6dB (70%)),
+             (Test 5: 20 MHz, FDD (MCS 5), AWGN, 6dB (70%)),
-             (Test 6, 20 MHz, FDD (MCS 16), AWGN, 12 dB (70%))</desc>
+             (Test 6: 20 MHz, FDD (MCS 16), AWGN, 12 dB (70%))</desc>
      <pre_compile_prog></pre_compile_prog>
      <compile_prog>$OPENAIR_DIR/cmake_targets/build_oai</compile_prog>
      <compile_prog_args> --phy_simulators  -c </compile_prog_args>
@@ -1004,7 +1001,16 @@
    <testCase id="015102">
      <class>execution</class>
-      <desc>ldpctest test cases.</desc>
+      <desc>ldpc Test cases. (Test1: block length = 3872),
+             (Test2: block length = 4224),
+             (Test3: block length = 4576),
+             (Test4: block length = 4928),
+             (Test5: block length = 5280),
+             (Test6: block length = 5632),
+             (Test7: block length = 6336),
+             (Test8: block length = 7040),
+             (Test9: block length = 7744),
+             (Test10: block length = 8448)</desc>
      <pre_compile_prog></pre_compile_prog>
      <compile_prog>$OPENAIR_DIR/cmake_targets/build_oai</compile_prog>
      <compile_prog_args> --phy_simulators  -c </compile_prog_args>
@@ -1021,7 +1027,7 @@
 		      -l7040 -s10 -n100
 		      -l7744 -s10 -n100
 		      -l8448 -s10 -n100</main_exec_args>
-      <tags>ldpctest.test1</tags>
+      <tags>ldpctest.test1 ldpctest.test2 ldpctest.test3 ldpctest.test4 ldpctest.test5 ldpctest.test6 ldpctest.test7 ldpctest.test8 ldpctest.test9 ldpctest.test10</tags>
      <search_expr_true>BLER 0.000000</search_expr_true>
      <search_expr_false>segmentation fault|assertion|exiting|fatal</search_expr_false>
      <nruns>3</nruns>
@@ -1029,7 +1035,7 @@
    <testCase id="015103">
      <class>execution</class>
-      <desc>polartest test cases.</desc>
+      <desc>polartest Test cases. (Test1: PBCH polar test)</desc>
      <pre_compile_prog></pre_compile_prog>
      <compile_prog>$OPENAIR_DIR/cmake_targets/build_oai</compile_prog>
      <compile_prog_args> --phy_simulators  -c </compile_prog_args>
@@ -1045,7 +1051,8 @@
     <testCase id="015104">
      <class>execution</class>
-      <desc>nr_pbchsim test cases.</desc>
+      <desc>nr_pbchsim Test cases. (Test1: PBCH-only),
+             (Test2: PBCH and synchronization)</desc>
      <pre_compile_prog></pre_compile_prog>
      <compile_prog>$OPENAIR_DIR/cmake_targets/build_oai</compile_prog>
      <compile_prog_args> --phy_simulators  -c </compile_prog_args>
@@ -1054,8 +1061,8 @@
      <main_exec> $OPENAIR_DIR/targets/bin/nr_pbchsim.Rel15</main_exec>
      <main_exec_args>-s-11 -S-10 -n1000
                      -s-11 -S-10 -n10 -I</main_exec_args>
-      <tags>nr_pbchsim.test1</tags>
+      <tags>nr_pbchsim.test1 nr_pbchsim.test2</tags>
-      <search_expr_true>n_errors \(negative CRC\) = 0</search_expr_true>
+      <search_expr_true>PBCH test OK</search_expr_true>
      <search_expr_false>segmentation fault|assertion|exiting|fatal</search_expr_false>
      <nruns>3</nruns>
    </testCase> 

--- a/cmake_targets/phy_simulators/CMakeLists.txt
+++ b/cmake_targets/phy_simulators/CMakeLists.txt
@@ -9,5 +9,5 @@ set(MU_RECIEVER False)
 set(NAS_UE False)
 set(MESSAGE_CHART_GENERATOR False)
 set(RRC_ASN1_VERSION "Rel14")
-set(T_TRACER False)
+set(T_TRACER True)
 include(${CMAKE_CURRENT_SOURCE_DIR}/../CMakeLists.txt)
--- a/openair1/PHY/CODING/nrPolar_init.c
+++ b/openair1/PHY/CODING/nrPolar_init.c
-/*
- * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.1  (the "License"); you may not use this file
- * except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.openairinterface.org/?page_id=698
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *-------------------------------------------------------------------------------
- * For more information about the OpenAirInterface (OAI) Software Alliance:
- *      contact@openairinterface.org
- */
-#include "nrPolar_tools/nr_polar_defs.h"
-#include "nrPolar_tools/nr_polar_pbch_defs.h"
-#include "nrPolar_tools/nr_polar_uci_defs.h"
-void nr_polar_init(t_nrPolar_params* polarParams, int messageType) {
-uint32_t poly6 = 0x84000000; // 1000100000... -> D^6+D^5+1
-uint32_t poly11 = 0x63200000; //11000100001000... -> D^11+D^10+D^9+D^5+1
-//uint32_t poly16 = 0x81080000; //100000010000100... - > D^16+D^12+D^5+1
-//uint32_t poly24a = 0x864cfb00; //100001100100110011111011 -> D^24+D^23+D^18+D^17+D^14+D^11+D^10+D^7+D^6+D^5+D^4+D^3+D+1
-//uint32_t poly24b = 0x80006300; //100000000000000001100011 -> D^24+D^23+D^6+D^5+D+1
-uint32_t poly24c = 0xB2B11700; //101100101011000100010111 -> D^24...
-	if (messageType == 0) { //DCI
-	} else if (messageType == 1) { //PBCH
-		polarParams->n_max = NR_POLAR_PBCH_N_MAX;
-		polarParams->i_il = NR_POLAR_PBCH_I_IL;
-		polarParams->i_seg = NR_POLAR_PBCH_I_SEG;
-		polarParams->n_pc = NR_POLAR_PBCH_N_PC;
-		polarParams->n_pc_wm = NR_POLAR_PBCH_N_PC_WM;
-		polarParams->i_bil = NR_POLAR_PBCH_I_BIL;
-		polarParams->payloadBits = NR_POLAR_PBCH_PAYLOAD_BITS;
-		polarParams->encoderLength = NR_POLAR_PBCH_E;
-		polarParams->crcParityBits = NR_POLAR_PBCH_CRC_PARITY_BITS;
-		polarParams->K = polarParams->payloadBits + polarParams->crcParityBits; // Number of bits to encode.
-		polarParams->N = nr_polar_output_length(polarParams->K, polarParams->encoderLength, polarParams->n_max);
-		polarParams->n = log2(polarParams->N);
-		polarParams->crc_generator_matrix=crc24c_generator_matrix(polarParams->payloadBits);
-		polarParams->crc_polynomial = poly24c;
-		polarParams->G_N = nr_polar_kronecker_power_matrices(polarParams->n);
-		//polar_encoder vectors:
-		polarParams->nr_polar_crc = malloc(sizeof(uint8_t) * polarParams->crcParityBits);
-		polarParams->nr_polar_cPrime = malloc(sizeof(uint8_t) * polarParams->K);
-		polarParams->nr_polar_d = malloc(sizeof(uint8_t) * polarParams->N);
-		//Polar Coding vectors
-		polarParams->nr_polar_u = malloc(sizeof(uint8_t) * polarParams->N); //Decoder: nr_polar_uHat
-		polarParams->nr_polar_cPrime = malloc(sizeof(uint8_t) * polarParams->K); //Decoder: nr_polar_cHat
-		polarParams->nr_polar_b = malloc(sizeof(uint8_t) * polarParams->K); //Decoder: nr_polar_bHat
-		polarParams->decoder_kernel = NULL;//polar_decoder_K56_N512_E864;
-	} else if (messageType == 2) { //UCI
-		polarParams->payloadBits = NR_POLAR_PUCCH_PAYLOAD_BITS;	//A depends on what they carry...
-		polarParams->encoderLength = NR_POLAR_PUCCH_E ; //E depends on other standards 6.3.1.4
-	        if (polarParams->payloadBits <= 11) //Ref. 38-212, Section 6.3.1.2.2
-			polarParams->crcParityBits = 0; //K=A
-       		else //Ref. 38-212, Section 6.3.1.2.1
-		{
-	 	        if (polarParams->payloadBits < 20)
-                		polarParams->crcParityBits = NR_POLAR_PUCCH_CRC_PARITY_BITS_SHORT;
-            		else
-                		polarParams->crcParityBits =  NR_POLAR_PUCCH_CRC_PARITY_BITS_LONG;
-            		if (polarParams->payloadBits >= 360 && polarParams->encoderLength >= 1088)
-		                polarParams->i_seg = NR_POLAR_PUCCH_I_SEG_LONG; // -> C=2
-		        else
-		                polarParams->i_seg = NR_POLAR_PUCCH_I_SEG_SHORT; // -> C=1
-	        }
-	        polarParams->K = polarParams->payloadBits + polarParams->crcParityBits; // Number of bits to encode.
-	        //K_r = K/C ; C = I_seg+1
-	        if((polarParams->K)/(polarParams->i_seg+1)>=18 && (polarParams->K)/(polarParams->i_seg+1)<=25) //Ref. 38-212, Section 6.3.1.3.1
-	        {
-		        polarParams->n_max = NR_POLAR_PUCCH_N_MAX;
-		        polarParams->i_il =NR_POLAR_PUCCH_I_IL;
-		        polarParams->n_pc = NR_POLAR_PUCCH_N_PC_SHORT;
-            		if( (polarParams->encoderLength - polarParams->K)/(polarParams->i_seg + 1) + 3 > 192 )
-		                polarParams->n_pc_wm = NR_POLAR_PUCCH_N_PC_WM_LONG;
-            		else
-		                polarParams->n_pc_wm = NR_POLAR_PUCCH_N_PC_WM_SHORT;
-		}
-	        if( (polarParams->K)/(polarParams->i_seg + 1) > 30 ) //Ref. 38-212, Section 6.3.1.3.1
-	        {
-		        polarParams->n_max = NR_POLAR_PUCCH_N_MAX;
-                        polarParams->i_il =NR_POLAR_PUCCH_I_IL;
-		        polarParams->n_pc = NR_POLAR_PUCCH_N_PC_LONG;
-		        polarParams->n_pc_wm = NR_POLAR_PUCCH_N_PC_WM_LONG;
-        	}
-	        polarParams->i_bil = NR_POLAR_PUCCH_I_BIL; //Ref. 38-212, Section 6.3.1.4.1
-		polarParams->N = nr_polar_output_length(polarParams->K, polarParams->encoderLength, polarParams->n_max);
-		polarParams->n = log2(polarParams->N);
-		if((polarParams->payloadBits) <= 19)
-		{
-			polarParams->crc_generator_matrix=crc6_generator_matrix(polarParams->payloadBits);
-			polarParams->crc_polynomial = poly6;
-		}
-		else
-		{
-			polarParams->crc_generator_matrix=crc11_generator_matrix(polarParams->payloadBits); 
-			polarParams->crc_polynomial = poly11;
-		}
-		polarParams->G_N = nr_polar_kronecker_power_matrices(polarParams->n);
-                //polar_encoder vectors:
-                polarParams->nr_polar_crc = malloc(sizeof(uint8_t) * polarParams->crcParityBits);
-                polarParams->nr_polar_cPrime = malloc(sizeof(uint8_t) * polarParams->K);
-                polarParams->nr_polar_d = malloc(sizeof(uint8_t) * polarParams->N);
-                //Polar Coding vectors
-                polarParams->nr_polar_u = malloc(sizeof(uint8_t) * polarParams->N); //Decoder: nr_polar_uHat
-                polarParams->nr_polar_cPrime = malloc(sizeof(uint8_t) * polarParams->K); //Decoder: nr_polar_cHat
-                polarParams->nr_polar_b = malloc(sizeof(uint8_t) * polarParams->K); //Decoder: nr_polar_bHat
-	}
-	polarParams->crcCorrectionBits = NR_POLAR_CRC_ERROR_CORRECTION_BITS;
-	polarParams->crc256Table = malloc(sizeof(uint32_t)*256);	
-	crcTable256Init(polarParams->crc_polynomial, polarParams->crc256Table);
-	polarParams->Q_0_Nminus1 = nr_polar_sequence_pattern(polarParams->n);
-	polarParams->interleaving_pattern = malloc(sizeof(uint16_t) * polarParams->K);
-	nr_polar_interleaving_pattern(polarParams->K, polarParams->i_il, polarParams->interleaving_pattern);
-	polarParams->rate_matching_pattern = malloc(sizeof(uint16_t) * polarParams->encoderLength);
-	uint16_t *J = malloc(sizeof(uint16_t) * polarParams->N);
-	nr_polar_rate_matching_pattern(polarParams->rate_matching_pattern, J,
-		nr_polar_subblock_interleaver_pattern, polarParams->K, polarParams->N, polarParams->encoderLength);
-	polarParams->information_bit_pattern = malloc(sizeof(uint8_t) * polarParams->N);
-	polarParams->Q_I_N = malloc(sizeof(int16_t) * (polarParams->K + polarParams->n_pc));
-	polarParams->Q_F_N = malloc(sizeof(int16_t) * (polarParams->N+1)); // Last element shows the final array index assigned a value.
-	polarParams->Q_PC_N = malloc(sizeof(int16_t) * (polarParams->n_pc));
-	for (int i=0; i<=polarParams->N; i++) polarParams->Q_F_N[i] = -1; // Empty array.
-	nr_polar_info_bit_pattern(polarParams->information_bit_pattern,
-			polarParams->Q_I_N, polarParams->Q_F_N, J, polarParams->Q_0_Nminus1,
-			polarParams->K, polarParams->N, polarParams->encoderLength, polarParams->n_pc);
-	polarParams->channel_interleaver_pattern = malloc(sizeof(uint16_t) * polarParams->encoderLength);
-	nr_polar_channel_interleaver_pattern(polarParams->channel_interleaver_pattern,
-			polarParams->i_bil, polarParams->encoderLength);
-	polarParams->extended_crc_generator_matrix = malloc(polarParams->K * sizeof(uint8_t *)); //G_P3
-	uint8_t tempECGM[polarParams->K][polarParams->crcParityBits];
-	for (int i = 0; i < polarParams->K; i++){
-	  polarParams->extended_crc_generator_matrix[i] = malloc(polarParams->crcParityBits * sizeof(uint8_t));
-	}
-	for (int i=0; i<polarParams->payloadBits; i++) {
-	  for (int j=0; j<polarParams->crcParityBits; j++) {
-	    tempECGM[i][j]=polarParams->crc_generator_matrix[i][j];
-	  }
-	}
-	for (int i=polarParams->payloadBits; i<polarParams->K; i++) {
-	  for (int j=0; j<polarParams->crcParityBits; j++) {
-	    if( (i-polarParams->payloadBits) == j ){
-	      tempECGM[i][j]=1;
-	    } else {
-	      tempECGM[i][j]=0;
-	    }
-	  }
-	}
-	for (int i=0; i<polarParams->K; i++) {
-	  for (int j=0; j<polarParams->crcParityBits; j++) {
-	    polarParams->extended_crc_generator_matrix[i][j]=tempECGM[polarParams->interleaving_pattern[i]][j];
-	  }
-	}
-	build_decoder_tree(polarParams);
-	printf("decoder tree nodes %d\n",polarParams->tree.num_nodes);
-	free(J);
-}
--- a/openair1/PHY/CODING/nr_polar_init.c
+++ b/openair1/PHY/CODING/nr_polar_init.c
@@ -148,7 +148,7 @@ void nr_polar_init(t_nrPolar_paramsPtr *polarParams,
 		free(J);
 		build_decoder_tree(newPolarInitNode);
-		printf("decoder tree nodes %d\n",newPolarInitNode->tree.num_nodes);
+		//printf("decoder tree nodes %d\n",newPolarInitNode->tree.num_nodes);
 	} else {
 		AssertFatal(1 == 0, "[nr_polar_init] New t_nrPolar_paramsPtr could not be created");

--- a/openair1/PHY/INIT/nr_init.c
+++ b/openair1/PHY/INIT/nr_init.c
@@ -384,7 +384,7 @@ void nr_phy_config_request_sim(PHY_VARS_gNB *gNB,int N_RB_DL,int N_RB_UL,int mu)
  gNB_config->rf_config.ul_carrier_bandwidth.value = N_RB_UL;
  gNB_config->sch_config.half_frame_index.value = 0;
  gNB_config->sch_config.ssb_subcarrier_offset.value = 0;
-  gNB_config->sch_config.n_ssb_crb.value = (N_RB_DL-20)>>1;
+  gNB_config->sch_config.n_ssb_crb.value = (N_RB_DL-20);
  gNB_config->sch_config.ssb_subcarrier_offset.value = 0;
@@ -419,7 +419,7 @@ void nr_phy_config_request(NR_PHY_Config_t *phy_config)
  gNB_config->rf_config.ul_carrier_bandwidth.value      = phy_config->cfg->rf_config.ul_carrier_bandwidth.value;//106;
  gNB_config->sch_config.half_frame_index.value         = 0;
  gNB_config->sch_config.ssb_subcarrier_offset.value    = phy_config->cfg->sch_config.ssb_subcarrier_offset.value;//0;
-  gNB_config->sch_config.n_ssb_crb.value                = 86;
+  gNB_config->sch_config.n_ssb_crb.value                = (phy_config->cfg->rf_config.dl_carrier_bandwidth.value-20);
  gNB_config->sch_config.physical_cell_id.value         = phy_config->cfg->sch_config.physical_cell_id.value;
  if (phy_config->cfg->subframe_config.duplex_mode.value == 0) {

--- a/openair1/PHY/INIT/nr_init_ue.c
+++ b/openair1/PHY/INIT/nr_init_ue.c
@@ -655,7 +655,7 @@ int init_nr_ue_signal(PHY_VARS_NR_UE *ue,
  int i,j,k,l;
  int eNB_id;
  int th_id;
-  int n_ssb_crb=(fp->N_RB_DL-20)>>1;
+  int n_ssb_crb=(fp->N_RB_DL-20);
  abstraction_flag = 0;
  fp->nb_antennas_tx = 1;
  fp->nb_antennas_rx=1;

--- a/openair1/PHY/NR_UE_TRANSPORT/dci_nr.c
+++ b/openair1/PHY/NR_UE_TRANSPORT/dci_nr.c
@@ -49,7 +49,7 @@
 //#define NR_LTE_PDCCH_DCI_SWITCH
 #define NR_PDCCH_DCI_RUN              // activates new nr functions
-//#define NR_PDCCH_DCI_DEBUG            // activates NR_PDCCH_DCI_DEBUG logs
+#define NR_PDCCH_DCI_DEBUG            // activates NR_PDCCH_DCI_DEBUG logs
 #define NR_NBR_CORESET_ACT_BWP 3      // The number of CoreSets per BWP is limited to 3 (including initial CORESET: ControlResourceId 0)
 #define NR_NBR_SEARCHSPACE_ACT_BWP 10 // The number of SearSpaces per BWP is limited to 10 (including initial SEARCHSPACE: SearchSpaceId 0)
 #define PDCCH_TEST_POLAR_TEMP_FIX

--- a/openair1/PHY/NR_UE_TRANSPORT/nr_initial_sync.c
+++ b/openair1/PHY/NR_UE_TRANSPORT/nr_initial_sync.c
@@ -149,13 +149,14 @@ int nr_initial_sync(PHY_VARS_NR_UE *ue, runmode_t mode)
  int rx_power=0; //aarx,
  //nfapi_nr_config_request_t* config;
-  int n_ssb_crb=(fp->N_RB_DL-20)>>1;
+  int n_ssb_crb=(fp->N_RB_DL-20);
  // First try TDD normal prefix, mu 1
  fp->Ncp=NORMAL;
  fp->frame_type=TDD;
  // FK: added N_RB_DL paramter here as this function shares code with the gNB where it is needed. We should rewrite this function for the UE. 
  nr_init_frame_parms_ue(fp,NR_MU_1,NORMAL,fp->N_RB_DL,n_ssb_crb,0);
  LOG_D(PHY,"nr_initial sync ue RB_DL %d\n", fp->N_RB_DL);
  /*
  write_output("rxdata0.m","rxd0",ue->common_vars.rxdata[0],10*fp->samples_per_subframe,1,1);
  exit(-1);
@@ -196,7 +197,7 @@ int nr_initial_sync(PHY_VARS_NR_UE *ue, runmode_t mode)
 #endif
  /* check that SSS/PBCH block is continuous inside the received buffer */
-  if (sync_pos < (10*fp->slots_per_subframe*fp->samples_per_subframe - (NB_SYMBOLS_PBCH * fp->ofdm_symbol_size))) {
+  if (sync_pos < (NR_NUMBER_OF_SUBFRAMES_PER_FRAME*fp->samples_per_subframe - (NB_SYMBOLS_PBCH * fp->ofdm_symbol_size))) {
 #ifdef DEBUG_INITIAL_SYNCH
    LOG_I(PHY,"Calling sss detection (normal CP)\n");
@@ -212,12 +213,12 @@ int nr_initial_sync(PHY_VARS_NR_UE *ue, runmode_t mode)
    nr_gold_pdcch(ue,0, 2);
    /*
-    int nb_prefix_samples0 = frame_parms->nb_prefix_samples0;
+    int nb_prefix_samples0 = fp->nb_prefix_samples0;
-    frame_parms->nb_prefix_samples0 = frame_parms->nb_prefix_samples.
+    fp->nb_prefix_samples0 = fp->nb_prefix_samples;
    nr_slot_fep(ue,0, 0, ue->ssb_offset, 0, 1, NR_PDCCH_EST);
    nr_slot_fep(ue,1, 0, ue->ssb_offset, 0, 1, NR_PDCCH_EST);
-    frame_parms->nb_prefix_samples0 = nb_prefix_samples0;	
+    fp->nb_prefix_samples0 = nb_prefix_samples0;	
    LOG_I(PHY,"[UE  %d] AUTOTEST Cell Sync : frame = %d, rx_offset %d, freq_offset %d \n",
              ue->Mod_id,

--- a/openair1/PHY/NR_UE_TRANSPORT/pss_nr.c
+++ b/openair1/PHY/NR_UE_TRANSPORT/pss_nr.c
@@ -838,14 +838,15 @@ int pss_search_time_nr(int **rxdata, ///rx data in time domain
  /* Search pss in the received buffer each 4 samples which ensures a memory alignment on 128 bits (32 bits x 4 ) */
  /* This is required by SIMD (single instruction Multiple Data) Extensions of Intel processors. */
  /* Correlation computation is based on a a dot product which is realized thank to SIMS extensions */
-  for (int pss_index = 0; pss_index < NUMBER_PSS_SEQUENCE; pss_index++) avg[pss_index]=0;
+  for (int pss_index = 0; pss_index < NUMBER_PSS_SEQUENCE; pss_index++) {
+    avg[pss_index]=0;
+    memset(pss_corr_ue[pss_index],0,length*sizeof(int64_t)); 
+  }
-  for (n=0; n < length; n+=4) {
+  for (n=0; n < length; n+=4) { //
    for (int pss_index = 0; pss_index < NUMBER_PSS_SEQUENCE; pss_index++) {
-      pss_corr_ue[pss_index][n] = 0; /* clean correlation for position n */
      if ( n < (length - frame_parms->ofdm_symbol_size)) {
        /* calculate dot product of primary_synchro_time_nr and rxdata[ar][n] (ar=0..nb_ant_rx) and store the sum in temp[n]; */
@@ -886,24 +887,19 @@ int pss_search_time_nr(int **rxdata, ///rx data in time domain
  LOG_I(PHY,"[UE] nr_synchro_time: Sync source = %d, Peak found at pos %d, val = %llu (%d dB) avg %d dB\n", pss_source, peak_position, (unsigned long long)peak_value, dB_fixed64(peak_value),dB_fixed64(avg[pss_source]));
-//#ifdef DEBUG_PSS_NR
+  if (peak_value < 5*avg[pss_source])
-#define  PSS_DETECTION_FLOOR_NR     (31)
-  if (peak_value < 5*avg[pss_source]) { //PSS_DETECTION_FLOOR_NR)
    return(-1);
-  }
-//#endif
 #ifdef DBG_PSS_NR
-  static debug_cnt = 0;
+  static int debug_cnt = 0;
  if (debug_cnt == 0) {
-    /*    LOG_M("pss_corr_ue0.m","pss_corr_ue0",pss_corr_ue[0],length,1,6);
+    LOG_M("pss_corr_ue0.m","pss_corr_ue0",pss_corr_ue[0],length,1,6);
    LOG_M("pss_corr_ue1.m","pss_corr_ue1",pss_corr_ue[1],length,1,6);
    LOG_M("pss_corr_ue2.m","pss_corr_ue2",pss_corr_ue[2],length,1,6);
-    LOG_M("rxdata0.m","rxd0",rxdata[0],length,1,1); */
+    LOG_M("rxdata0.m","rxd0",rxdata[0],length,1,1); 
  } else {
    debug_cnt++;
  }

--- a/openair1/PHY/TOOLS/nr_phy_scope.c
+++ b/openair1/PHY/TOOLS/nr_phy_scope.c
--- a/openair1/PHY/TOOLS/nr_phy_scope.h
+++ b/openair1/PHY/TOOLS/nr_phy_scope.h
+/*
+ * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The OpenAirInterface Software Alliance licenses this file to You under
+ * the OAI Public License, Version 1.1  (the "License"); you may not use this file
+ * except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.openairinterface.org/?page_id=698
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *-------------------------------------------------------------------------------
+ * For more information about the OpenAirInterface (OAI) Software Alliance:
+ *      contact@openairinterface.org
+ */
+/* Header file generated by fdesign on Tue Nov 13 09:42:50 2012 */
+#ifndef FD_lte_scope_h_
+#define FD_lte_scope_h_
+#include <forms.h>
+//#include "PHY/defs_eNB.h"
+//#include "PHY/defs_UE.h"
+//#include "PHY/impl_defs_top.h"
+#include "PHY/defs_nr_UE.h"
+/* Forms and Objects */
+typedef struct {
+  FL_FORM   * lte_phy_scope_enb;
+  FL_OBJECT * rxsig_t;
+  FL_OBJECT * chest_f;
+  FL_OBJECT * chest_t;
+  FL_OBJECT * pusch_comp;
+  FL_OBJECT * pucch_comp;
+  FL_OBJECT * pucch_comp1;
+  FL_OBJECT * pusch_llr;
+  FL_OBJECT * pusch_tput;
+  FL_OBJECT * button_0;
+} FD_lte_phy_scope_enb;
+typedef struct {
+    FL_FORM   * lte_phy_scope_ue;
+    FL_OBJECT * rxsig_t;
+    FL_OBJECT * chest_f;
+    FL_OBJECT * chest_t;
+    FL_OBJECT * pbch_comp;
+    FL_OBJECT * pbch_llr;
+    FL_OBJECT * pdcch_comp;
+    FL_OBJECT * pdcch_llr;
+    FL_OBJECT * pdsch_comp;
+    FL_OBJECT * pdsch_llr;
+    FL_OBJECT * pdsch_comp1;
+    FL_OBJECT * pdsch_llr1;
+    FL_OBJECT * pdsch_tput;
+    FL_OBJECT * button_0;
+} FD_lte_phy_scope_ue;
+FD_lte_phy_scope_enb * create_lte_phy_scope_enb( void );
+FD_lte_phy_scope_ue * create_lte_phy_scope_ue( void );
+/*
+void phy_scope_eNB(FD_lte_phy_scope_enb *form,
+                   PHY_VARS_gNB *phy_vars_enb,
+                   int UE_id);
+*/
+void phy_scope_UE(FD_lte_phy_scope_ue *form,
+                  PHY_VARS_NR_UE *phy_vars_ue,
+                  int eNB_id,
+                  int UE_id,
+                  uint8_t subframe);
+#endif /* FD_lte_scope_h_ */
--- a/openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
+++ b/openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
@@ -5913,8 +5913,8 @@ int phy_procedures_nrUE_RX(PHY_VARS_NR_UE *ue,UE_nr_rxtx_proc_t *proc,uint8_t eN
 #endif
  //nr_gold_pdcch(ue,0, 2);
-/*
-  for (l=0; l<2; l++) {
+  for (int l=0; l<2; l++) {
    if (abstraction_flag == 0) {
 #if UE_TIMING_TRACE
        start_meas(&ue->ofdm_demod_stats);
@@ -5922,60 +5922,63 @@ int phy_procedures_nrUE_RX(PHY_VARS_NR_UE *ue,UE_nr_rxtx_proc_t *proc,uint8_t eN
      VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_UE_SLOT_FEP, VCD_FUNCTION_IN);
      nr_slot_fep(ue,
-         l,
+		  l,
-         nr_tti_rx,
+		  nr_tti_rx,
-         0,
+		  0,
-         1,
+		  0,
-         1,
+		  1,
 		 NR_PDCCH_EST);
      VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_UE_SLOT_FEP, VCD_FUNCTION_OUT);
 #if UE_TIMING_TRACE
      stop_meas(&ue->ofdm_demod_stats);
 #endif
    }
-  }*/
+  }
-    //ue_measurement_procedures(l-1,ue,proc,eNB_id,(nr_tti_rx<<1),abstraction_flag,mode);
-    //if (do_pdcch_flag) {
+  write_output("rxdataF.m","rxF",ue->common_vars.common_vars_rx_data_per_thread[ue->current_thread_id[nr_tti_rx>>1]].rxdataF[0],ue->frame_parms.ofdm_symbol_size*2,1,1);
-//      if ((l==pilot1) || ((pmch_flag==1)&(l==l2)))  {
-//	LOG_D(PHY,"[UE  %d] Frame %d: Calling pdcch procedures (eNB %d)\n",ue->Mod_id,frame_rx,eNB_id);
-	//start_meas(&ue->rx_pdcch_stats[ue->current_thread_id[nr_tti_rx]]);
+  //ue_measurement_procedures(l-1,ue,proc,eNB_id,(nr_tti_rx<<1),abstraction_flag,mode);
-//printf(">>> at phy_procedures_nrUE_RX, nr_ue_pdcch_procedures init, dlsch->active=%d\n",
+  //if (do_pdcch_flag) {
-//        ue->dlsch[ue->current_thread_id[nr_tti_rx]][eNB_id][0]->active); 
+  //      if ((l==pilot1) || ((pmch_flag==1)&(l==l2)))  {
-	if (nr_ue_pdcch_procedures(eNB_id,ue,proc,abstraction_flag) == -1) {
+  //	LOG_D(PHY,"[UE  %d] Frame %d: Calling pdcch procedures (eNB %d)\n",ue->Mod_id,frame_rx,eNB_id);
-	  LOG_E(PHY,"[UE  %d] Frame %d, nr_tti_rx %d: Error in pdcch procedures\n",ue->Mod_id,frame_rx,nr_tti_rx);
-	  return(-1);
-	}
-//for (int m=0;m<1000;m++) printf("%d",m); 
-//printf("\n>>> at phy_procedures_nrUE_RX, nr_ue_pdcch_procedures end, dlsch->active=%d\n",
-//        ue->dlsch[ue->current_thread_id[nr_tti_rx]][eNB_id][0]->active); 
+  //start_meas(&ue->rx_pdcch_stats[ue->current_thread_id[nr_tti_rx]]);
+  //printf(">>> at phy_procedures_nrUE_RX, nr_ue_pdcch_procedures init, dlsch->active=%d\n",
+  //        ue->dlsch[ue->current_thread_id[nr_tti_rx]][eNB_id][0]->active); 
+  if (nr_ue_pdcch_procedures(eNB_id,ue,proc,abstraction_flag) == -1) {
+    LOG_E(PHY,"[UE  %d] Frame %d, nr_tti_rx %d: Error in pdcch procedures\n",ue->Mod_id,frame_rx,nr_tti_rx);
+    return(-1);
+  }
+  //for (int m=0;m<1000;m++) printf("%d",m); 
+  //printf("\n>>> at phy_procedures_nrUE_RX, nr_ue_pdcch_procedures end, dlsch->active=%d\n",
+  //        ue->dlsch[ue->current_thread_id[nr_tti_rx]][eNB_id][0]->active); 
  // preparing for PDSCH procedures
-//  if (ue->dlsch[ue->current_thread_id[nr_tti_rx]][eNB_id][0]->active == 1) {
+  //  if (ue->dlsch[ue->current_thread_id[nr_tti_rx]][eNB_id][0]->active == 1) {
-//    ue_pdsch_procedures(ue,
+  //    ue_pdsch_procedures(ue,
-//			proc,
+  //			proc,
-//			eNB_id,
+  //			eNB_id,
-//			PDSCH,
+  //			PDSCH,
-//			ue->dlsch[ue->current_thread_id[nr_tti_rx]][eNB_id][0],
+  //			ue->dlsch[ue->current_thread_id[nr_tti_rx]][eNB_id][0],
-//			NULL,
+  //			NULL,
-//			ue->pdcch_vars[ue->current_thread_id[nr_tti_rx]][eNB_id]->num_pdcch_symbols,
+  //			ue->pdcch_vars[ue->current_thread_id[nr_tti_rx]][eNB_id]->num_pdcch_symbols,
-//			ue->frame_parms.symbols_per_tti>>1,
+  //			ue->frame_parms.symbols_per_tti>>1,
-//			abstraction_flag);
+  //			abstraction_flag);
-//  }
+  //  }
 #if 0
-	//stop_meas(&ue->rx_pdcch_stats[ue->current_thread_id[nr_tti_rx]]);
+  //stop_meas(&ue->rx_pdcch_stats[ue->current_thread_id[nr_tti_rx]]);
-    //printf("nr_tti_rx %d n_pdcch_sym %d pdcch procedures  %5.3f \n",
+  //printf("nr_tti_rx %d n_pdcch_sym %d pdcch procedures  %5.3f \n",
-    //        nr_tti_rx, ue->pdcch_vars[ue->current_thread_id[nr_tti_rx]][eNB_id]->num_pdcch_symbols,
+  //        nr_tti_rx, ue->pdcch_vars[ue->current_thread_id[nr_tti_rx]][eNB_id]->num_pdcch_symbols,
-    //     (ue->rx_pdcch_stats[ue->current_thread_id[nr_tti_rx]].p_time)/(cpuf*1000.0));
+  //     (ue->rx_pdcch_stats[ue->current_thread_id[nr_tti_rx]].p_time)/(cpuf*1000.0));
-	LOG_D(PHY,"num_pdcch_symbols %d\n",ue->pdcch_vars[ue->current_thread_id[nr_tti_rx]][eNB_id]->num_pdcch_symbols);
+  LOG_D(PHY,"num_pdcch_symbols %d\n",ue->pdcch_vars[ue->current_thread_id[nr_tti_rx]][eNB_id]->num_pdcch_symbols);
-//      }
+  //      }
-    //}
+  //}
-//  } // for l=1..l2
+  //  } // for l=1..l2
  ue_measurement_procedures(l-1,ue,proc,eNB_id,(nr_tti_rx<<1),abstraction_flag,mode);
  LOG_D(PHY," ------  end FFT/ChannelEst/PDCCH slot 0: AbsSubframe %d.%d ------  \n", frame_rx%1024, nr_tti_rx);

--- a/openair1/SIMULATION/LTE_PHY/dlsim.c
+++ b/openair1/SIMULATION/LTE_PHY/dlsim.c
--- a/openair1/SIMULATION/LTE_PHY/ulsim.c
+++ b/openair1/SIMULATION/LTE_PHY/ulsim.c
--- a/openair1/SIMULATION/NR_PHY/pbchsim.c
+++ b/openair1/SIMULATION/NR_PHY/pbchsim.c
--- a/targets/RT/USER/nr-ru.c
+++ b/targets/RT/USER/nr-ru.c
--- a/targets/RT/USER/nr-ue.c
+++ b/targets/RT/USER/nr-ue.c
--- a/targets/RT/USER/nr-uesoftmodem.c
+++ b/targets/RT/USER/nr-uesoftmodem.c
--- a/targets/RT/USER/nr-uesoftmodem.h
+++ b/targets/RT/USER/nr-uesoftmodem.h