Mercurial > repos > siwaa > redelac_stics_e

comparison redelacPlanExpander.py @ 6:40595ca55c78 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
"planemo upload for repository https://forgemia.inra.fr/redelac/redelac-toolbox/-/tree/fa822bd9c974bf5ffb4e632905dd65c2f097e325/tools/REDELACplanExpander commit fa822bd9c974bf5ffb4e632905dd65c2f097e325-dirty"
author siwaa
date Fri, 26 Jun 2026 13:15:23 +0000
parents 996b8019f5d5
children c8f0edcc1330
comparison
equal deleted inserted replaced
5:996b8019f5d5 6:40595ca55c78
115 tmpDf['num_sol'] = row['num_sol'] 115 tmpDf['num_sol'] = row['num_sol']
116 116
117 if typeOfRotation == 'GC' : 117 if typeOfRotation == 'GC' :
118 tmpDf['Norg_sols'] = row['Norg_sols_GC'] 118 tmpDf['Norg_sols'] = row['Norg_sols_GC']
119 tmpDf['nom_sol_sans_point'] = row['nom_sols_GC_dans_USM'] 119 tmpDf['nom_sol_sans_point'] = row['nom_sols_GC_dans_USM']
120 tmpDf['nomsol'] = row['nom_sols_GC_dans_sols.xml']
120 else : 121 else :
121 tmpDf['Norg_sols'] = row['Norg_sols_PP'] 122 tmpDf['Norg_sols'] = row['Norg_sols_PP']
122 tmpDf['nom_sol_sans_point'] = row['nom_sols_PP_dans_USM'] 123 tmpDf['nom_sol_sans_point'] = row['nom_sols_PP_dans_USM']
124 tmpDf['nomsol'] = row['nom_sols_PP_dans_sols.xml']
123 125
124 tmpDf['maille_drias'] = drias 126 tmpDf['maille_drias'] = drias
125 tmpDf['maille_safran'] = safran 127 tmpDf['maille_safran'] = safran
126 128
127 # Updating the id_simu column 129 # Updating the id_simu column
160 print(tmpDf['usm_name']) 162 print(tmpDf['usm_name'])
161 163
162 # Updating the nomsol column 164 # Updating the nomsol column
163 # alias =CONCATENATE(G2;"_";H2) 165 # alias =CONCATENATE(G2;"_";H2)
164 166
165 tmpDf['nomsol'] = \ 167 #tmpDf['nomsol'] = \
166 tmpDf['num_sol'].astype(str) + '_' + \ 168 # tmpDf['num_sol'].astype(str) + '_' + \
167 tmpDf['Norg_sols'].astype(str) 169 # tmpDf['Norg_sols'].astype(str)
168 170
169 if SafranOrDrias : 171 if SafranOrDrias :
170 # Updating the fstation column 172 # Updating the fstation column
171 # alias =CONCATENATE($E2;"_";M2;"_sta.xml") 173 # alias =CONCATENATE($E2;"_";M2;"_sta.xml")
172 174