Use last version of pyft

UMR-CNRM · Jul 4, 2024 · 73384a3 · 73384a3
1 parent 019fa59
commit 73384a3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/build/with_fcm/arch/arch-pgi_CPU_preGPU_MFflavour.env b/build/with_fcm/arch/arch-pgi_CPU_preGPU_MFflavour.env
@@ -33,7 +33,7 @@ specificTransfos="^progs/:=:
 ^ext/:=:
 ^micro/minpack.F90:=:
 ^aux/tools.F90:=:
-^turb/mode_turb_hor:=:
+^turb/mode_turb_hor:=:--empty --simplify
 ^turb/mode_rotate_wind.F90:=:
 ^micro/mode_lima:=:
 ^micro/lima:=:
@@ -47,7 +47,7 @@ trap "\rm -f $descTree" EXIT
 #The --wrapH is automatically set by prep_code
 #The --mnhExpand is controlled by the different check_commit_* scripts
 #--addIncludes must be before --descTree because --addIncludes removes a wrong "file" node
-common_opts="--tree . --addIncludes --descTreeWithIncludes $descTree --simplify --enableCache" #General options
+common_opts="--tree . --addIncludes --descTree $descTree --simplify --enableCache" #General options
 common_opts="$common_opts --inlineContainedSubroutinesPHYEX" #Inlining
 common_opts="$common_opts --deleteDrHook --deleteBudgetDDH" #Not available on GPU
 common_opts="$common_opts --addACC_routine_seq" #add 'acc routine' directive

diff --git a/tools/INSTALL.sh b/tools/INSTALL.sh
@@ -4,7 +4,7 @@
 set -e
 set -o pipefail #abort if left command on a pipe fails
 
-pyft_version=1f6b43ac68e4135988d46797df650577b1f02f4e
+pyft_version=3bead4d4b54baafc113f239f72e8bd90b6381dcc
 
 #This script installs PHYEX
 #Call the script with the -h option to get more information.

diff --git a/tools/pybinding.py b/tools/pybinding.py
@@ -37,8 +37,7 @@ def pybinding(fortran_in, scope, fortran_out, python_out, libso,
 
     #Open input FORTRAN file and get the right scope
     pftin = PYFT(fortran_in)
-    virtualScopeNode = ET.Element('virtual')
-    virtualScopeNode.extend(pftin.getScopeChildNodes(scope))
+    scopeNode = pftin.getScopeNode(scope, excludeContains=True)
     kind, name = scope.split('/')[-1].split(':')
     name = name.upper()
     kind = {'sub': 'SUBROUTINE',
@@ -56,7 +55,7 @@ def pybinding(fortran_in, scope, fortran_out, python_out, libso,
     flush = [] #list of unit to flush
     docstringIN = ["Input arguments:"]
     docstringOUT = ["Output arguments:"]
-    for N in virtualScopeNode[0].findall('.//{*}dummy-arg-LT/{*}arg-N/{*}N'):
+    for N in scopeNode.findall('.//{*}dummy-arg-LT/{*}arg-N/{*}N'):
         var = pftin.findVar(n2name(N), scope, varList=varList, exactScope=True)
         vartype = var['t'].replace(' ', '').upper()
         if vartype == 'TYPE(DIMPHYEX_T)':