diff --git a/compare.py b/compare.py index e2f86dbe8f16e559158a1d29c771681ee67427d9..b368f4791c5f193297079e0f4a8446757ea3566d 100755 --- a/compare.py +++ b/compare.py @@ -8,15 +8,28 @@ def compareFiles(path_user, path_ref): filen = '16JAN.1.12B18.001.nc' da = xr.open_dataset(path_user + '/' + filen) da2 = xr.open_dataset(path_ref + '/' + filen) + JPHEXT=1 + JPVEXT=1 + ni=len(da['ni']) + nj=len(da['nj']) + nk=len(da['level']) variables = list(da.keys()) for var in variables: try: - ecart_min = float(da2[var].min())-float(da[var].min()) - ecart_moy = float(da2[var].mean())-float(da[var].mean()) - ecart_max = float(da2[var].max())-float(da[var].max()) + if da[var].ndim == 4: #Variables time, level, nj, ni + ecart_min=float(da2[var][0,JPVEXT:nk-1-JPVEXT,JPHEXT:nj-1-JPHEXT,JPHEXT:ni-1-JPHEXT].min())-float(da[var][0,JPVEXT:nk-1-JPVEXT,JPHEXT:nj-1-JPHEXT,JPHEXT:ni-1-JPHEXT].min()) + ecart_moy=float(da2[var][0,JPVEXT:nk-1-JPVEXT,JPHEXT:nj-1-JPHEXT,JPHEXT:ni-1-JPHEXT].mean())-float(da[var][0,JPVEXT:nk-1-JPVEXT,JPHEXT:nj-1-JPHEXT,JPHEXT:ni-1-JPHEXT].mean()) + ecart_max=float(da2[var][0,JPVEXT:nk-1-JPVEXT,JPHEXT:nj-1-JPHEXT,JPHEXT:ni-1-JPHEXT].max())-float(da[var][0,JPVEXT:nk-1-JPVEXT,JPHEXT:nj-1-JPHEXT,JPHEXT:ni-1-JPHEXT].max()) + elif da[var].ndim == 3: #Variables time, nj, ni + ecart_min=float(da2[var][0,JPHEXT:nj-1-JPHEXT,JPHEXT:ni-1-JPHEXT].min())-float(da[var][0,JPHEXT:nj-1-JPHEXT,JPHEXT:ni-1-JPHEXT].min()) + ecart_moy=float(da2[var][0,JPHEXT:nj-1-JPHEXT,JPHEXT:ni-1-JPHEXT].mean())-float(da[var][0,JPHEXT:nj-1-JPHEXT,JPHEXT:ni-1-JPHEXT].mean()) + ecart_max=float(da2[var][0,JPHEXT:nj-1-JPHEXT,JPHEXT:ni-1-JPHEXT].max())-float(da[var][0,JPHEXT:nj-1-JPHEXT,JPHEXT:ni-1-JPHEXT].max()) + else: + ecart_min=float(da2[var].min())-float(da[var].min()) + ecart_moy=float(da2[var].mean())-float(da[var].mean()) + ecart_max=float(da2[var].max())-float(da[var].max()) if (ecart_min !=0 or ecart_moy !=0 or ecart_max !=0): - status += 1 - print(var, ecart_min, ecart_moy, ecart_max) + print(var,ecart_min,ecart_moy,ecart_max) except: pass diff --git a/correct_indent.py b/correct_indent.py index ef8e5adbbd105a810e9ce436e1e0371e79a09fb2..f3f5605859a1d700db6153b5fdd4870dccdb1e25 100755 --- a/correct_indent.py +++ b/correct_indent.py @@ -109,7 +109,6 @@ def correct_indent(f): textwrite = check_indent(ncurrline, indent_score, i) # #ifdef handling = pass to next lines with no indent elif "#if" in i7: # ifdef or ifndef - print(i) textwrite = i passNextLine['Pass'], passNextLine['Reason'] = (True, "#ifdef") elif "#else" in i7: