Changeset 165

Timestamp:

03/19/12 17:22:36 (12 years ago)

Author:

pinsard

Message:

interp_erai_msl i now a function

Location:

trunk

Files:

• docs/docs_dev/source/guides/generate_tropflux.rst (modified) (2 diffs)
• src/d2m_to_q2m_erai.pro (modified) (1 diff)
• src/interp_erai_msl.pro (moved) (moved from trunk/src/interp_erai_msl_1989_2009.pro) (16 diffs)
• src/interp_erai_t2m.pro (modified) (3 diffs)
• src/tropflux.sh (modified) (5 diffs)

trunk/docs/docs_dev/source/guides/generate_tropflux.rst

@@ -9 +9 @@
 ..
 .. pb with math directives on aedon : probably some latex installation pb
+..
+.. ref to tropflux.sh covering the 3 last steps
+..
 ..
 .. EVOLUTIONS
@@ -100 +103 @@
  - :ref:`interp_erai_lwr_1989_2009.pro`
  - :ref:`interp_erai_sst_1989_2009.pro`
- - :ref:`interp_erai_msl_1989_2009.pro`
+ - :func:`interp_erai_msl.pro`
  - :func:`interp_erai_t2m`
  - :ref:`interp_erai_ws_1989_2009.pro`

trunk/src/d2m_to_q2m_erai.pro

@@ -75 +75 @@
 ;
 ; :ref:`interp_erai_dewt_1989_2009.pro`
-; :ref:`interp_erai_msl_1989_2009.pro`
+; :func:`interp_erai_msl`
 ; :func:`interp_erai_t2m`
 ;

trunk/src/interp_erai_msl.pro

@@ -1 +1 @@
 ;+
 ;
-; .. _interp_erai_msl_1989_2009.pro:
-;
-; =============================
-; interp_erai_msl_1989_2009.pro
-; =============================
+; ===================
+; interp_erai_msl.pro
+; ===================
+;
+; .. function:: interp_erai_msl(yyyymmddb,yyyymmdde)
 ;
 ; DESCRIPTION
@@ -26 +26 @@
 ; Interpolated msl
 ; is written in
-; :file:`${PROJECT_OD}/erai_msl_19890101_20091231_oafluxgrid.nc`
+; :file:`${PROJECT_OD}/erai_msl_{yyyymmdd}_{yyyymmdd}_oafluxgrid.nc`
 ; if this file not already exists.
 ;
 ; This output file
-; :file:`${PROJECT_OD}/erai_msl_19890101_20091231_oafluxgrid.nc`
+; :file:`${PROJECT_OD}/erai_msl_{yyyymmdd}_{yyyymmdd}_oafluxgrid.nc`
 ; must be processed after by
 ; :ref:`d2m_to_q2m_erai.pro`.
@@ -42 +42 @@
 ;     .. graphviz::
 ;
-;        digraph interp_erai_msl_1989_2009 {
+;        digraph interp_erai_msl {
 ;
 ;           file_in [shape=ellipse,fontname=Courier,label="${PROJECT_ID}/20c3m_erai_msl_TROP_1989_2009.nc"];
 ;           mask [shape=ellipse,fontname=Courier,label="${PROJECT_ID}/mask_oaflux_30N30S.nc"];
-;           file_out [shape=ellipse,fontname=Courier,label="${PROJECT_OD}/erai_msl_19890101_20091231_oafluxgrid.nc"];
-;
-;           interp_erai_msl_1989_2009 [shape=box,
+;           file_out [shape=ellipse,fontname=Courier,label="${PROJECT_OD}/erai_msl_{yyyymmdd}_{yyyymmdd}_oafluxgrid.nc"];
+;
+;           interp_erai_msl [shape=box,
 ;           fontname=Courier,
 ;           color=blue,
-;           URL="http://forge.ipsl.jussieu.fr/tropflux/browser/trunk/src/interp_erai_msl_1989_2009.pro",
-;           label="${PROJECT}/src/interp_erai_msl_1989_2009.pro"];
-;
-;           {file_in mask} -> {interp_erai_msl_1989_2009} -> {file_out}
+;           URL="http://forge.ipsl.jussieu.fr/tropflux/browser/trunk/src/interp_erai_msl.pro",
+;           label="${PROJECT}/src/interp_erai_msl.pro"];
+;
+;           {file_in mask} -> {interp_erai_msl} -> {file_out}
 ;
 ;        }
@@ -64 +64 @@
 ;
 ; :ref:`project_profile.sh`
+;
+; Used by :ref:`tropflux.sh`
 ;
 ; :func:`report <saxo:report>`
@@ -82 +84 @@
 ;
 ;  IDL> .compile file_interp
-;  IDL> interp_erai_msl_1989_2009
+;  IDL> yyyymmddb = 20000101
+;  IDL> yyyymmdde = 20000302
+;  IDL> result = interp_erai_msl(yyyymmddb, yyymmdde)
+;  IDL> print, result
 ;
 ; TODO
 ; ====
 ;
-; use real output of :ref:`compute_erai_daily_region_2d.sh`.
+; use real output of :ref:`compute_erai_daily_region_2d.sh`
+;
+; get_erai.py + grib to netcdf conversion
 ;
 ; msl_attr={units:'milibars' .. millibar at least, hPa will be probably
 ; more SI
 ;
-; why 19880101,20100930 as dates
+; why 19880101,20100930 as dates in read_ncdf.
+; now (20120319) should be yyyymmddb and yyymmdde but desastrous side effect
 ;
 ; first step time 14245.5 (days since 1950-01-01 00:00:00) : correct ?
@@ -105 +113 @@
 ; ==========
 ;
-; $Id: interp_erai_msl_1989_2009.pro 88 2011-08-19 15:40:14Z pinsard $
+; $Id: interp_erai_msl.pro 88 2011-08-19 15:40:14Z pinsard $
 ;
 ; $URL$
+;
+; - fplod 20120319
+;
+;   * taking project_overwite into account
+;   * pro -> function
 ;
 ; - pinsard 2011-08-23T09:09:16Z loholt1.ipsl.polytechnique.fr (Linux)
@@ -131 +144 @@
 ;
 ;-
-pro interp_erai_msl_1989_2009
+function interp_erai_msl $
+         , yyyymmddb $
+         , yyyymmdde
+;
+;++compile_opt idl2, strictarrsubs, logical_predicate
 ;
 @cm_4cal
@@ -139 +156 @@
 @cm_project
 ;
+; Return to caller if errors
+ON_ERROR, 2
+;
+result = -1
+;
+usage = 'result = interp_erai_msl(yyyymmddb, yyyymmdde)
+nparam = N_PARAMS()
+IF (nparam NE 2) THEN BEGIN
+   ras = report(['Incorrect number of arguments.' $
+   + '!C' $
+   + 'Usage : ' + usage])
+   return, result
+ENDIF
+;
 ; check for input directory
 ;
@@ -146 +177 @@
      msg = 'eee : ${PROJECT_ID} is not defined'
      ras = report(msg)
-     STOP
+     return, result
            END
  ELSE: BEGIN
@@ -160 +191 @@
    msg = 'eee : the directory' + iodirin  + ' is not accessible.'
    ras = report(msg)
-   STOP
+   return, result
 ENDIF
 ;
@@ -173 +204 @@
    msg = 'eee : the file ' + fullfilename_msk + ' was not found.'
    ras = report(msg)
-   STOP
+   return, result
 ENDIF
 ;
@@ -186 +217 @@
    msg = 'eee : the file ' + fullfilename + ' was not found.'
    ras = report(msg)
-   STOP
+   return, result
 ENDIF
 ;
@@ -194 +225 @@
          msg = 'eee : ${PROJECT_OD} is not defined'
          ras = report(msg)
-       STOP
+       return, result
        END
   ELSE: BEGIN
@@ -209 +240 @@
     msg = 'eee : the directory' + iodirout  + ' was not found.'
     ras = report(msg)
-    STOP
+    return, result
 ENDIF
 ;
 ; build output filename
-filename_out = 'erai_msl_19890101_20091231_oafluxgrid.nc'
+filename_out = 'erai_msl_' +  string(yyyymmddb,format='(I8.8)') + '_' + string(yyyymmdde,format='(I8.8)') + '_oafluxgrid.nc'
 fullfilename_out = iodirout + filename_out
 ; in order to avoid unexpected overwritten
-IF (FILE_TEST(fullfilename_out) EQ 1) THEN BEGIN
+IF ((FILE_TEST(fullfilename_out) EQ 1)  AND (project_overwrite EQ 0)) THEN BEGIN
    msg = 'eee : the file ' + fullfilename_out  + ' already exists.'
    ras = report(msg)
-   STOP
+   return, result
 ENDIF
 ;
 initncdf, fullfilename
 domdef
-latin=reform(gphit(0,*))
-lonin=reform(glamt(*,0))
-print, 'lat grid ',min(latin),max(latin),latin(1)-latin(0)
-print, 'lon grid ',min(lonin),max(lonin),lonin(1)-lonin(0)
+latin=reform(gphit[0,*])
+lonin=reform(glamt[*,0])
+print, 'lat grid ',min(latin),max(latin),latin[1]-latin[0]
+print, 'lon grid ',min(lonin),max(lonin),lonin[1]-lonin[0]
+;++mslin=read_ncdf("msl",yyyymmddb,yyymmdde,file=fullfilename,/nostr)
 mslin=read_ncdf("msl",19880101,20100930,file=fullfilename,/nostr)
+;
 ;
 timein=time
 jptin=jpt
-tab=mslin(*,*,0)
+tab=mslin[*,*,0]
 mskin=glamt*0.+1.
 ;
 initncdf, fullfilename_msk
 domdef
-latout=reform(gphit(0,*))
-lonout=reform(glamt(*,0))
-print, 'lat grid ',min(latout),max(latout),latout(1)-latout(0)
-print, 'lon grid ',min(lonout),max(lonout),lonout(1)-lonout(0)
+latout=reform(gphit[0,*])
+lonout=reform(glamt[*,0])
+print, 'lat grid ',min(latout),max(latout),latout[1]-latout[0]
+print, 'lon grid ',min(lonout),max(lonout),lonout[1]-lonout[0]
 mskout=read_ncdf("msk", file=fullfilename_msk,/nostr)
 ;
@@ -252 +285 @@
         msg = 'eee : ' + units + ' unknown'
         ras = report(msg)
-        STOP
+        return, result
     END
 ENDCASE
@@ -261 +294 @@
 for jt=0,jptin-1 do begin
   ; ++ print, 'Interpolation jt=',jt,' / ',jptin-1
-  tab=reform(mslin(*,*,jt))
-  mslout(*,*,jt)=call_interp2d(tab,lonin,latin,mskin $
+  tab=reform(mslin[*,*,jt])
+  mslout[*,*,jt]=call_interp2d(tab,lonin,latin,mskin $
       , lonout,latout,method='bilinear' $
       , OUTMASK_IND=mskout, SET_OUTMSKVAL=mskout)
-  mslout(*,*,jt)=mslout(*,*,jt)*mskout+(1.-mskout)*1.e20
+  mslout[*,*,jt]=mslout[*,*,jt]*mskout+(1.-mskout)*1.e20
 endfor
 ;
 initncdf, fullfilename_msk
 time=timegen(jptin, start=julday(1,1,1989,0), units='days')
-cda0=string(jul2date(time(0)),format='(i8.8)')
+cda0=string(jul2date(time[0]),format='(i8.8)')
 cda1=string(jul2date(time(jpt-1)),format='(i8.8)')
 timein=time-julday(1,1,1950,00,00)

trunk/src/interp_erai_t2m.pro

@@ -5 +5 @@
 ; ===================
 ;
-; .. function interp_erai_t2m(yyyymmddb,yyyymmdde)
+; .. function:: interp_erai_t2m(yyyymmddb,yyyymmdde)
 ;
 ; DESCRIPTION
@@ -61 +61 @@
 ;
 ; :ref:`interpolate_data`
+;
+; Used by :ref:`tropflux.sh`
 ;
 ; :ref:`project_profile.sh`
@@ -260 +262 @@
          + '!C' $
          + 'Usage : ' + usage])
-   return, -1
+   return, result
 ENDIF
 

trunk/src/tropflux.sh

@@ -61 +61 @@
 #
 # You already used :ref:`get_erai.sh` to get ERAI data, etc.,
-# during [20060801, 20060802[ and you want to produce NetCDF files::
-#
-#   $ tropflux.sh -b 20060801 -e 20060802
+# during [20000101, 20000302[ and you want to produce NetCDF files::
+#
+#   $ tropflux.sh -b 20000101 -e 20000302
 #
 # A more global example::
@@ -89 +89 @@
 #
 # Use :
-# :func:`oaflux_mask_30n30s`, :func:`inter_erai_t2m`, etc.
+# :func:`oaflux_mask_30n30s`, :func:`interp_erai_t2m`, 
+# :func:`interp_erai_msl`, etc.
 #
 # Next step : +validation ++ comparison
@@ -114 +115 @@
 #
 #   * add project_overwrite usage
+#   * handling error of inter_erai_msl (now function)
 #
 # - pinsard 20120306
@@ -162 +164 @@
 # default
 debug=0
-yyyymmddb=20060420
-yyyymmdde=20060420
+yyyymmddb=20000101
+yyyymmdde=20000302
 #
 minargcount=4
@@ -296 +298 @@
 ;interp_erai_dewt_1989_2009
 ;interp_erai_lwr_1989_2009
-;interp_erai_msl_1989_2009
+result = interp_erai_msl(${yyyymmddb}, ${yyyymmdde})
+IF result < 0 THEN BEGIN
+   msg = 'eee : pb after interp_erai_msl' + string(result)
+   err = report(msg)
+   exit
+ENDIF
 ;interp_erai_sst_1989_2009
 result = interp_erai_t2m(${yyyymmddb}, ${yyyymmdde})