Use pyft version 0.1.1

Author: SebastienRietteMTO

build/with_fcm/arch/arch-pgi_CPU_preGPU_MFflavour.env

@@ -39,7 +39,7 @@ specificTransfos="^(./)?progs/:=:
 ^(./)?turb/mode_tridiag_w\.F90:=:--empty --simplify
 ^(./)?micro/mode_lima:=:
 ^(./)?micro/lima:=:
-^(./)?micro/lima_adjust_split\.F90:=:--removeCall sub:LIMA_ADJUST_SPLIT CONDENSATION
+^(./)?micro/lima_adjust_split\.F90:=:--removeCall CONDENSATION
 ^(./)?micro/[_.a-z0-9]*\.h:=:
 ^(./)?turb/[_.a-z0-9]*\.h:=:"
 
@@ -62,8 +62,8 @@ PYFT_OPTS_MNH="$PYFT_OPTS_MNH --buildACCTypeHelpers"
 PYFT_OPTS_MNH="$PYFT_OPTS_MNH --addArrayParentheses --expandAllArraysPHYEX --attachArraySpecToEntity --applyCPPifdef %REPRO48 --replaceAutomaticWithAllocatable"
 PYFT_OPTS_MNH="$PYFT_OPTS_MNH
 $specificTransfos
-^(./)?turb/mode_bl_depth_diag.F90:=:--removeCall module:MODE_BL_DEPTH_DIAG/sub:BL_DEPTH_DIAG_1D BL_DEPTH_DIAG_3D $PYFT_OPTS_MNH
-^(./)?micro/rain_ice.F90:=:--removeCall sub:RAIN_ICE ELEC_TENDENCIES $PYFT_OPTS_MNH"
+^(./)?turb/mode_bl_depth_diag.F90:=:--removeCall BL_DEPTH_DIAG_3D $PYFT_OPTS_MNH
+^(./)?micro/rain_ice.F90:=:--removeCall ELEC_TENDENCIES $PYFT_OPTS_MNH"
 
 #For IAL, stack transformation is replaced by allocatables
 #source this file, then: "export PYFT_OPTS_IAL; check_commit_ial.sh --prep_code-opts '--pyft_opts_env PYFT_OPTS_IAL' ...."
@@ -80,8 +80,8 @@ PYFT_OPTS_IAL="$PYFT_OPTS_IAL --buildACCTypeHelpers"
 PYFT_OPTS_IAL="$PYFT_OPTS_IAL --addArrayParentheses --expandAllArraysPHYEX --attachArraySpecToEntity --applyCPPifdef REPRO48 --deleteNonColumnCallsPHYEX --replaceAutomaticWithAllocatable"
 PYFT_OPTS_IAL="$PYFT_OPTS_IAL
 $specificTransfos
-^(./)?turb/mode_bl_depth_diag.F90:=:--removeCall module:MODE_BL_DEPTH_DIAG/sub:BL_DEPTH_DIAG_1D BL_DEPTH_DIAG_3D $PYFT_OPTS_IAL
-^(./)?micro/rain_ice.F90:=:--removeCall sub:RAIN_ICE ELEC_TENDENCIES $PYFT_OPTS_IAL"
+^(./)?turb/mode_bl_depth_diag.F90:=:--removeCall BL_DEPTH_DIAG_3D $PYFT_OPTS_IAL
+^(./)?micro/rain_ice.F90:=:--removeCall ELEC_TENDENCIES $PYFT_OPTS_IAL"
 
 #For testprogs
 #check_commit_testprogs.sh -a <this conf>
@@ -100,6 +100,6 @@ PYFT_OPTS="$PYFT_OPTS --applyCPPifdef REPRO48 --deleteNonColumnCallsPHYEX --remo
 PYFT_OPTS="$PYFT_OPTS --removeACC --addACCRoutineSeq" #remove pre-existing ACC directives, then add 'acc routine seq' directive
 PYFT_OPTS="$PYFT_OPTS
 $specificTransfos
-^(./)?turb/mode_bl_depth_diag\.F90:=:--removeCall module:MODE_BL_DEPTH_DIAG/sub:BL_DEPTH_DIAG_1D BL_DEPTH_DIAG_3D $PYFT_OPTS
-^(./)?micro/rain_ice\.F90:=:--removeCall sub:RAIN_ICE ELEC_TENDENCIES $PYFT_OPTS"
+^(./)?turb/mode_bl_depth_diag\.F90:=:--removeCall BL_DEPTH_DIAG_3D $PYFT_OPTS
+^(./)?micro/rain_ice\.F90:=:--removeCall ELEC_TENDENCIES $PYFT_OPTS"
 

tools/INSTALL.sh

@@ -4,7 +4,7 @@
 set -e
 set -o pipefail #abort if left command on a pipe fails
 
-pyft_version=76f61bcd9eae523ced16e8d854e0f065fa82078e
+pyft_version=tags/0.1.1
 
 #This script installs PHYEX
 #Call the script with the -h option to get more information.

tools/pybinding.py

@@ -55,7 +55,7 @@ def pybinding(fortran_in, scope, fortran_out, python_out, libso,
     docstringIN = ["Input arguments:"]
     docstringOUT = ["Output arguments:"]
     for N in scopeNode.findall('.//{*}dummy-arg-LT/{*}arg-N/{*}N'):
-        var = pftin.varList.findVar(n2name(N), scope, exactScope=True)
+        var = scopeNode.varList.findVar(n2name(N), exactScope=True)
         vartype = var['t'].replace(' ', '').upper()
         if vartype == 'TYPE(DIMPHYEX_T)':
             moduleList.append('USE MODD_DIMPHYEX,   ONLY: DIMPHYEX_t')