Changeset 944

Timestamp:

Apr 27, 2013, 3:47:01 PM (12 years ago)

Author:

aslmd

Message:

associated changes to previous commit. additional readmes and fixes.

Location:

trunk/UTIL/PYTHON

Files:

• README.ABSOLUTELY (added)
• README.INSTALL (modified) (5 diffs)
• api/NEED_planetoplot_v2 (added)
• api/api.F90 (modified) (1 diff)
• mcd/examples/exampleascii.py (modified) (1 diff)
• mcd/frozen_mymath.py (moved) (moved from trunk/UTIL/PYTHON/mcd/mymath.py)
• mcd/frozen_myplot.py (moved) (moved from trunk/UTIL/PYTHON/mcd/myplot.py) (8 diffs)
• mcd/mcd.py (modified) (1 diff)
• mcd/mcdtest.py (modified) (2 diffs)
• planetoplot_v1/README.MCS (moved) (moved from trunk/UTIL/PYTHON/sparse/README.MCS)
• planetoplot_v1/README.PP (modified) (1 diff)
• planetoplot_v1/mcs.py (moved) (moved from trunk/UTIL/PYTHON/sparse/mcs.py)
• planetoplot_v2/README.INSTALL (deleted)
• simple_scripts/singlet.py (moved) (moved from trunk/UTIL/PYTHON/papers/singlet.py)
• sparse/NEED_planetoplot_v1 (added)

trunk/UTIL/PYTHON/README.INSTALL

@@ -1 @@
-###########################
-############ README.INSTALL
-###########################
+####################################
+## README.INSTALL                 ##
+## if you are outside LMD or IPSL ##
+## e.g. on your laptop            ##
+####################################
 
-This README describes the required steps to install the python distribution and packages necessary to run the graphical routines.
+This README describes the required steps to install the necessary python distribution and packages.
+This is only an example. The necessary python libraries (numpy, matplotlib, etc...) can also be installed one by one.
 
 ----------------
@@ -10 +13 @@
 
 "The Enthought Python Distribution (EPD) provides scientists with a comprehensive set of tools to perform rigorous data analysis and visualization."
-EPD includes a distribution of Python and a set of libraries for plots and data analysis. It is free for academics, and can be downloaded at:
+EPD includes a distribution of Python and a set of libraries for plots and data analysis. It is free for academics.
 
-http://download.enthought.com/epd-7.1/
-
-Different versions are available. 
+e.g. different versions are available. 
 64 bit version for linux: epd-7.1-2-rh5-x86_64.sh (recommended)
 32 bit version for linux is also available if the above fails: epd-7.1-2-rh5-x86.sh
@@ -37 +38 @@
 Note that a version of python was probably already installed on your machine, in /usr/bin/. Make sure that "which python" gets you the correct path to EPD python after you sourced your .env_pers.ksh.
 
-LMD routines for python plots are on the svn repository in YOUR_SVN_INSTALL/trunk/UTIL/PYTHON/. You must declare the $PYTHONPATH environment variable to point to these routines. For example:
-export PYTHONPATH=/san0/bwhitelmd/SVN/trunk/UTIL/PYTHON/
-
-Finally, you might want to add $PYTHONPATH to your $PATH so that the main scripts can be called from anywhere in command line.
-
-------------------------------
-Step 4/- Read the README.PP ;)
-------------------------------
-
-NB: To use the movie capability, you will have to install mencoder.
-NB: To use advance interpolation methods for GCM and mesoscale files, you will have to compile fortran routines with f2py (or compile those independently).
-
-###########################
-############ README.INSTALL.LMD
-###########################
+###################################
+## README.INSTALL                ##
+## if you are inside LMD or IPSL ##
+## e.g. on your laptop           ##
+###################################
 
 If you work on LMD or IPSL computers, you don't necessarily need to install EPD.
-
-[NB: You don't necessarily need to download pp.py sources either but in case
-you would like to try modifications of the code please use the command
-   svn co http://svn.lmd.jussieu.fr/Planeto/trunk/UTIL/PYTHON
-and change PYTHONPATH accordingly in the lines given in what follows]
 
 -------------------------
@@ -66 +52 @@
 A. Spiga installed on his account a version of EPD.
 --> Add the following lines to your env_pers.ksh, then source the file. You're OK! 
---> (ask for an installation of mencoder if you'd like to use movie capabilities)
 
 #####################################
@@ -76 +61 @@
   fi
 fi
-PYTHONPATH=/donnees/aslmd/MODELES/UTIL/PYTHON/
-export PYTHONPATH
-PATH=$PYTHONPATH:$PATH
 #####################################
 

trunk/UTIL/PYTHON/api/api.F90

@@ -1 @@
-link ../../MESOSCALE/LMD_MM_MARS/SRC/POSTPROC/api.F90
+link ../../../MESOSCALE/LMD_MM_MARS/SRC/POSTPROC/api.F90

trunk/UTIL/PYTHON/mcd/examples/exampleascii.py

@@ -1 @@
-#! /usr/bin/python
+#! /usr/bin/env python
 
 from mcd import mcd

trunk/UTIL/PYTHON/mcd/frozen_myplot.py

@@ -252 +252 @@
     ### ... note, anomaly is only computed over d1 and d2 for the moment
     import numpy as np
-    from mymath import max,mean,min,sum,getmask
+    from frozen_mymath import max,mean,min,sum,getmask
     csmooth = 12 ## a fair amount of grid points (too high results in high computation time)
     if redope is not None:
@@ -437 +437 @@
 ## Author: AC + AS
 def reduce_zaxis (input,ax=None,yint=False,vert=None,indice=None):
-    from mymath import max,mean
+    from frozen_mymath import max,mean
     from scipy import integrate
     import numpy as np
@@ -869 +869 @@
     import  numpy                           as np
     import  matplotlib                      as mpl
-    from mymath import max
+    from frozen_mymath import max
     meanlon = 0.5*(wlon[0]+wlon[1])
     meanlat = 0.5*(wlat[0]+wlat[1])
@@ -972 +972 @@
 def calculate_bounds(field,vmin=None,vmax=None):
     import numpy as np
-    from mymath import max,min,mean
+    from frozen_mymath import max,min,mean
     ind = np.where(field < 9e+35)
     fieldcalc = field[ ind ] # la syntaxe compacte ne marche si field est un tuple
@@ -993 +993 @@
 ## Author: AS
 def bounds(what_I_plot,zevmin,zevmax):
-    from mymath import max,min,mean
+    from frozen_mymath import max,min,mean
     ### might be convenient to add the missing value in arguments
     #what_I_plot[ what_I_plot < zevmin ] = zevmin#*(1. + 1.e-7)
@@ -1006 +1006 @@
 ## Author: AS
 def nolow(what_I_plot):
-    from mymath import max,min
+    from frozen_mymath import max,min
     lim = 0.15*0.5*(abs(max(what_I_plot))+abs(min(what_I_plot)))
     print "NO PLOT BELOW VALUE ", lim
@@ -1476 +1476 @@
 ## Handles calls to specific computations (e.g. wind norm, enrichment factor...)
 def select_getfield(zvarname=None,znc=None,ztypefile=None,mode=None,ztsat=None,ylon=None,ylat=None,yalt=None,ytime=None,analysis=None):
-      from mymath import get_tsat
+      from frozen_mymath import get_tsat
  
       ## Specific variables are described here:
@@ -1578 +1578 @@
     import numpy as np
     from scipy import ndimage
-    from mymath import array2image,image2array
+    from frozen_mymath import array2image,image2array
 
     varinfile = nc.variables.keys()

trunk/UTIL/PYTHON/mcd/mcd.py

@@ -9 +9 @@
 import numpy as np
 import matplotlib.pyplot as mpl
-import myplot
+import frozen_myplot as myplot
 
 

trunk/UTIL/PYTHON/mcd/mcdtest.py

@@ -6 +6 @@
 query = mcd()
 
-query.toversion5()
+#query.toversion5()
 query.loct = 12.
 
@@ -20 +20 @@
 query.printextvar(95)
 
-end
 
 query.viking1()

trunk/UTIL/PYTHON/planetoplot_v1/README.PP

@@ -14 +14 @@
 The program pp.py works on virtually any NETCDF file. 
 If not, please contact us, it is usually an easy fix to make it work.
+
+NB: To use the movie capability, you will have to install mencoder.
+NB: To use advance interpolation methods for GCM and mesoscale files, you will have to compile fortran routines with f2py (or compile those independently).
 
 ************************************