Changeset 4345 for BOL/Multi_atlas/atlas

Timestamp:

Nov 10, 2022, 3:10:32 PM (2 years ago)

Author:

musat

Message:

Plusieurs appels climaf et tracers moyennes
zonales par climaf commentes
IonelaMusat?

File:

• BOL/Multi_atlas/atlas/atlas_none.py (modified) (3 diffs)

BOL/Multi_atlas/atlas/atlas_none.py

@@ -272 +272 @@
     if not is3d(variable):
         # -- apply a mask corresponding to the reference
-        mask = div(reff,reff)
-        msimu = mul(wsimu,mask)
+        #IMorig mask = div(reff,reff)
+        #IMorig msimu = mul(wsimu,mask)
         # -- Compute the zonal mean
-        zmean=ccdo(msimu, operator='zonmean')
-        ref_zmean=ccdo(wreff, operator='zonmean')
+        #IMorig zmean=ccdo(msimu, operator='zonmean')
+        #IMorig ref_zmean=ccdo(wreff, operator='zonmean')
         #
-        sim=opts.simulation
+        #IMorig sim=opts.simulation
         #if variable in ['zg500']:
         #   ref_zmean = ccdo(ref_zmean,operator='-b F32 mulc,1')
         #   zmean = ccdo(zmean,operator='-b F32 mulc,1')
-        zmean_fig=curves(cens([sim,ref],zmean,ref_zmean),
-                         title="",
-                         lgcols=3,
-                         options=#'tiYAxisString=""|'+\
-                                 #'+\'+\
-                                 'tmYROn=True|'+\
-                                 'tmYRBorderOn=True|'+\
-                                 'tmYLOn=False|'+\
-                                 'tmYUseRight=True|'+\
-                                 'vpXF=0|'+\
-                                 'vpWidthF=0.66|'+\
-                                 'vpHeightF=0.33|'+\
-                                 'tmYRLabelsOn=True|'+\
-                                 'tmXBLabelFontHeightF=0.018|'+\
-                                 'tmYLLabelFontHeightF=0.016|'+\
-                                 'lgLabelFontHeightF=0.018|'+\
-                                 #'pmLegendSide=Bottom|'+\
-                                 'pmLegendOrthogonalPosF=-0.32|'+\
-                                 'pmLegendParallelPosF=1.0|'+\
-                                 'tmXMajorGrid=True|'+\
-                                 'tmYMajorGrid=True|'+\
-                                 'tmXMajorGridLineDashPattern=2|'+\
-                                 'tmYMajorGridLineDashPattern=2|'+\
-                                 'xyLineThicknessF=8|'+\
-                                 'gsnLeftString='+variable+'|'+\
-                                 'gsnCenterString='+opts.simulation+' vs '+ref+'|'+\
-                                 'gsnRightString='+opts.season+'|'+\
-                                 'gsnStringFontHeightF='+str(stringFontHeight))
+        #IMorig zmean_fig=curves(cens([sim,ref],zmean,ref_zmean),
+        #IMorig                  title="",
+        #IMorig                  lgcols=3,
+               #IMorig           options=#'tiYAxisString=""|'+\
+                #IMorig                  #'+\'+\
+                #IMorig                  'tmYROn=True|'+\
+        #IMorig                          'tmYRBorderOn=True|'+\
+        #IMorig                          'tmYLOn=False|'+\
+        #IMorig                          'tmYUseRight=True|'+\
+        #IMorig                          'vpXF=0|'+\
+        #IMorig                          'vpWidthF=0.66|'+\
+        #IMorig                          'vpHeightF=0.33|'+\
+        #IMorig                          'tmYRLabelsOn=True|'+\
+        #IMorig                          'tmXBLabelFontHeightF=0.018|'+\
+        #IMorig                          'tmYLLabelFontHeightF=0.016|'+\
+        #IMorig                          'lgLabelFontHeightF=0.018|'+\
+        #IMorig                          #'pmLegendSide=Bottom|'+\
+        #IMorig                          'pmLegendOrthogonalPosF=-0.32|'+\
+        #IMorig                          'pmLegendParallelPosF=1.0|'+\
+        #IMorig                          'tmXMajorGrid=True|'+\
+        #IMorig                          'tmYMajorGrid=True|'+\
+        #IMorig                          'tmXMajorGridLineDashPattern=2|'+\
+        #IMorig                          'tmYMajorGridLineDashPattern=2|'+\
+        #IMorig                          'xyLineThicknessF=8|'+\
+        #IMorig                          'gsnLeftString='+variable+'|'+\
+        #IMorig                          'gsnCenterString='+opts.simulation+' vs '+ref+'|'+\
+        #IMorig                          'gsnRightString='+opts.season+'|'+\
+        #IMorig                          'gsnStringFontHeightF='+str(stringFontHeight))
     #    # Single figures
         page=cpage([[simu_fig]],orientation='landscape', page_trim=True, fig_trim=True)
@@ -333 +333 @@
                    page_trim=True, fig_trim=True, format='pdf', title=variable+" "+opts.simulation)
     else:
-        page=cpage([[simu_fig,ref_fig],[diff_fig,zmean_fig]],orientation='landscape', page_trim=True, fig_trim=True)
-        pdf_page=cpage([[simu_fig,ref_fig],[diff_fig,zmean_fig]],orientation='landscape', 
+        #IMorig page=cpage([[simu_fig,ref_fig],[diff_fig,zmean_fig]],orientation='landscape', page_trim=True, fig_trim=True)
+        page=cpage([[simu_fig,ref_fig],[diff_fig,diff_fig]],orientation='landscape', page_trim=True, fig_trim=True)
+        #IMorig pdf_page=cpage([[simu_fig,ref_fig],[diff_fig,zmean_fig]],orientation='landscape', 
+        pdf_page=cpage([[simu_fig,ref_fig],[diff_fig,diff_fig]],orientation='landscape', 
                    page_trim=True, fig_trim=True, format='pdf', title=variable+" "+opts.simulation)
     pdfargs.append(cfile(pdf_page))
@@ -357 +359 @@
                     cell(ref,cfile(ref_fig),thumbnail=thumbnail_size,hover=False)+\
                     cell(text_diff,cfile(diff_fig),thumbnail=thumbnail_size,hover=False)+\
-                    cell('zonal mean',cfile(zmean_fig),thumbnail=thumbnail_size,hover=False)+\
+                    cell('zonal mean',cfile(diff_fig),thumbnail=thumbnail_size,hover=False)+\
                     cell('page',cfile(page),thumbnail=thumbnail_size,hover=False)+\
                     cell('Pdf',cfile(pdf_page))
             close_line()
-#
+#IMorig: au-dessus cell('zonal mean',cfile(zmean_fig),thumbnail=thumbnail_size,hover=False)+\
+
 # Finalisons l'index html
 index += close_table()