Changeset 166

Timestamp:

03/19/12 18:07:09 (12 years ago)

Author:

pinsard

Message:

interp_erai_dewt is now a function

Location:

trunk

Files:

• docs/docs_dev/source/guides/data_content.rst (modified) (1 diff)
• docs/docs_dev/source/guides/generate_tropflux.rst (modified) (1 diff)
• src/d2m_to_q2m_erai.pro (modified) (2 diffs)
• src/interp_erai_dewt.pro (moved) (moved from trunk/src/interp_erai_dewt_1989_2009.pro) (19 diffs)
• src/interp_erai_msl.pro (modified) (1 diff)
• src/interp_erai_t2m.pro (modified) (2 diffs)
• src/oaflux_mask_30n30s.pro (modified) (2 diffs)
• src/tropflux.sh (modified) (3 diffs)

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

@@ -135 +135 @@
  - :ref:`TropFlux_19890101_20091231.pro`
 
- - :ref:`interp_erai_dewt_1989_2009.pro`
+ - :func:`interp_erai_dewt`
  - :ref:`interp_erai_lwr_1989_2009.pro`
  - :ref:`interp_erai_sst_1989_2009.pro`

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

@@ -100 +100 @@
 
 tools :
- - :ref:`interp_erai_dewt_1989_2009.pro`
+ - :func:`interp_erai_dewt`
  - :ref:`interp_erai_lwr_1989_2009.pro`
  - :ref:`interp_erai_sst_1989_2009.pro`

trunk/src/d2m_to_q2m_erai.pro

@@ -13 +13 @@
 ; ++
 ; has been produced by
-; :ref:`interp_erai_dewt_1989_2009.pro`.
+; :func:`interp_erai_dewt`.
 ;
 ; :file:`${PROJECT_OD}/erai_t2m_19890101_20091231_oafluxgrid.nc`
@@ -74 +74 @@
 ; :ref:`project_profile.sh`
 ;
-; :ref:`interp_erai_dewt_1989_2009.pro`
+; :func:`interp_erai_dewt`
 ; :func:`interp_erai_msl`
 ; :func:`interp_erai_t2m`

trunk/src/interp_erai_dewt.pro

@@ -1 +1 @@
 ;+
 ;
-; .. _interp_erai_dewt_1989_2009.pro:
-;
-; ==============================
-; interp_erai_dewt_1989_2009.pro
-; ==============================
+; ====================
+; interp_erai_dewt.pro
+; ====================
+;
+; .. function:: interp_erai_dewt(yyyymmddb,yyyymmdde)
 ;
 ; DESCRIPTION
@@ -21 +21 @@
 ; containing OAFLUX grid
 ; has been produced by
-; :func:`oaflux_mask_30n30s.pro`.
+; :func:`oaflux_mask_30n30s`.
 ;
 ; Interpolated d2
 ; is written in
-; :file:`${PROJECT_OD}/erai_d2m_19890101_20091231_oafluxgrid.nc`
+; :file:`${PROJECT_OD}/erai_d2m_{yyyymmdd}_{yyyymmdd}_oafluxgrid.nc`
 ; if this file not already exists.
 ;
 ; This output file
-; :file:`${PROJECT_OD}/erai_d2m_19890101_20091231_oafluxgrid.nc`
+; :file:`${PROJECT_OD}/erai_d2m_{yyyymmdd}_{yyyymmdd}_oafluxgrid.nc`
 ; must be processed after by
 ; :ref:`d2m_to_q2m_erai.pro`.
@@ -41 +41 @@
 ;     .. graphviz::
 ;
-;        digraph interp_erai_dewt_1989_2009 {
+;        digraph interp_erai_dewt {
 ;
 ;           file_in [shape=ellipse,fontname=Courier,label="${PROJECT_ID}/20c3m_erai_d2_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_d2m_19890101_20091231_oafluxgrid.nc"];
-;
-;           interp_erai_dewt_1989_2009 [shape=box,
+;           file_out [shape=ellipse,fontname=Courier,label="${PROJECT_OD}/erai_d2m_{yyyymmdd}_{yyyymmdd}_oafluxgrid.nc"];
+;
+;           interp_erai_dewt [shape=box,
 ;           fontname=Courier,
 ;           color=blue,
-;           URL="http://forge.ipsl.jussieu.fr/tropflux/browser/trunk/src/interp_erai_dewt_1989_2009.pro",
-;           label="${PROJECT}/src/interp_erai_dewt_1989_2009.pro"];
-;
-;           {file_in mask} -> {interp_erai_dewt_1989_2009} -> {file_out}
+;           URL="http://forge.ipsl.jussieu.fr/tropflux/browser/trunk/src/interp_erai_dewt.pro",
+;           label="${PROJECT}/src/interp_erai_dewt.pro"];
+;
+;           {file_in mask} -> {interp_erai_dewt} -> {file_out}
 ;
 ;        }
@@ -61 +61 @@
 ;
 ; :ref:`interpolate_data`
+;
+; Used by :ref:`tropflux.sh`
 ;
 ; :ref:`project_profile.sh`
@@ -81 +83 @@
 ;
 ;  IDL> .compile file_interp
-;  IDL> interp_erai_dewt_1989_2009
+;  IDL> yyyymmddb = 19890101
+;  IDL> yyyymmdde = 20091231
+;  IDL> result = interp_erai_dewt(yyyymmddb, yyymmdde)
+;  IDL> print, result
 ;
 ; TIPS
@@ -89 +94 @@
 ;
 ;   $ ncks -v d2m -d time,0,1 -d latitude,0,1 -d longitude,0,1 \
-;     $PROJECT_ID/erai_d2m_19890101_200 1231_oafluxgrid.nc
+;     $PROJECT_ID/erai_d2m_19890101_20091231_oafluxgrid.nc
 ;
 ; TODO
@@ -98 +103 @@
 ; use real output of :ref:`compute_erai_daily_region_2d.sh`.
 ;
+; why 19880101,20100930 as dates in read_ncdf.
+; now (20120319) should be yyyymmddb and yyymmdde
+;
+; check [yyyymmddb,yyyymmdde] validity
+;
+; check if [yyyymmddb,yyyymmdde] is included in ERA-I file
+;
+; what happen if yyyymmdde > 20091231 : need to read an other ERA-I file
+;
+; add an example with only one month (ie 200001)
+;
 ; coding rules
+;
+; check time values
 ;
 ; KNOWN ISSUES
@@ -111 +129 @@
 ; $Id$
 ;
-; $URL: svn+ssh://pinsard@forge.ipsl.jussieu.fr/ipsl/forge/projets/tropflux/svn/trunk/src/interp_erai_dewt_1989_2009.pro $
+; $URL: svn+ssh://pinsard@forge.ipsl.jussieu.fr/ipsl/forge/projets/tropflux/svn/trunk/src/interp_erai_dewt.pro $
+;
+; - fplod 20120319
+;
+;   * taking project_overwite into account
+;   * try to add compile_opt seems to be incompatible with ncdf_quickwrite
+;   * pro -> function
 ;
 ; - pinsard 2011-08-23T09:09:16Z loholt1.ipsl.polytechnique.fr (Linux)
@@ -142 +166 @@
 ;
 ;-
-pro interp_erai_dewt_1989_2009
+function interp_erai_dewt $
+         , yyyymmddb $
+         , yyyymmdde
+;
+;++compile_opt idl2, strictarrsubs, logical_predicate
 ;
 @cm_4cal
@@ -150 +178 @@
 @cm_project
 ;
+; Return to caller if errors
+ON_ERROR, 2
+;
+result = -1
+;
+usage = 'result = interp_erai_t2m(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
 ;
@@ -157 +199 @@
      msg = 'eee : ${PROJECT_ID} is not defined'
      ras = report(msg)
-     STOP
+     return, result
            END
  ELSE: BEGIN
@@ -171 +213 @@
    msg = 'eee : the directory' + iodirin  + ' is not accessible.'
    ras = report(msg)
-   STOP
+   return, result
 ENDIF
 ;
@@ -184 +226 @@
    msg = 'eee : the file ' + fullfilename_msk + ' was not found.'
    ras = report(msg)
-   STOP
+   return, result
 ENDIF
 ;
@@ -197 +239 @@
    msg = 'eee : the file ' + fullfilename + ' was not found.'
    ras = report(msg)
-   STOP
+   return, result
 ENDIF
 ;
@@ -205 +247 @@
          msg = 'eee : ${PROJECT_OD} is not defined'
          ras = report(msg)
-       STOP
+       return, result
        END
   ELSE: BEGIN
@@ -220 +262 @@
     msg = 'eee : the directory' + iodirout  + ' was not found.'
     ras = report(msg)
-    STOP
+    return, result
 ENDIF
 ;
 ; build output filename
-filename_out = 'erai_d2m_19890101_20091231_oafluxgrid.nc'
+filename_out = 'erai_d2m_' + 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]
 d2min=read_ncdf("d2",19881201,20101231,file=fullfilename,/nostr)
 ;
 jptin=jpt
-tab=d2min(*,*,0)
+tab=d2min[*,*,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)
 ;
@@ -258 +300 @@
 for jt=0,jptin-1 do begin
   ; ++ print, 'Interpolation jt=',jt,' / ',jptin-1
-  tab=reform(d2min(*,*,jt))
-  d2mout(*,*,jt)=call_interp2d(tab,lonin,latin,mskin $
+  tab=reform(d2min[*,*,jt])
+  d2mout[*,*,jt]=call_interp2d(tab,lonin,latin,mskin $
       , lonout,latout,method='bilinear' $
       , OUTMASK_IND=mskout, SET_OUTMSKVAL=mskout)
-  d2mout(*,*,jt)=d2mout(*,*,jt)*mskout+(1.-mskout)*1.e20
+  d2mout[*,*,jt]=d2mout[*,*,jt]*mskout+(1.-mskout)*1.e20
 endfor
 ;
@@ -269 +311 @@
 time=timegen(7670, start=julday(1,1,1989,0), units='days')
 jpt=n_elements(time)
-cda0=string(jul2date(time(0)),format='(i8.8)')
-cda1=string(jul2date(time(jpt-1)),format='(i8.8)')
+cda0=string(jul2date(time[0]),format='(i8.8)')
+cda1=string(jul2date(time[jpt-1]),format='(i8.8)')
 time=time-julday(1,1,1950,00,00)
 ;
@@ -290 +332 @@
 @ncdf_quickwrite
 ;
+result = 0
+return, result
+;
 end

trunk/src/interp_erai_msl.pro

@@ -324 +324 @@
 @ncdf_quickwrite
 ;
+result = 0
+return, result
+;
 end

trunk/src/interp_erai_t2m.pro

@@ -97 +97 @@
 ; ====
 ;
-; scientific validation (starnge look of data with ncview now)
+; scientific validation (strange look of data with ncview now)
 ;
 ; check [yyyymmddb,yyyymmdde] validity
@@ -105 +105 @@
 ; what happen if yyyymmdde > 20091231 : need to read an other ERA-I file
 ;
-; add an example with only one month (ie 200912)
+; add an example with only one month (ie 200001)
 ;
 ; make it work : pb on loholt1 idl8

trunk/src/oaflux_mask_30n30s.pro

@@ -63 +63 @@
 ; Following program use :func:`oaflux_mask_30n30s` output:
 ; :ref:`TropFlux_19890101_20091231.pro`,
-; :ref:`interp_erai_dewt_1989_2009.pro`,
+; :func:`interp_erai_dewt`,
 ; :ref:`interp_erai_lwr_1989_2009.pro`,
 ; :ref:`interp_erai_sst_1989_2009.pro`,
@@ -220 +220 @@
 
 @ncdf_quickwrite
-
+;
 result = 0
-
 return, result
+;
 END

trunk/src/tropflux.sh

@@ -90 +90 @@
 # Use :
 # :func:`oaflux_mask_30n30s`, :func:`interp_erai_t2m`, 
-# :func:`interp_erai_msl`, etc.
+# :func:`interp_erai_msl`, :func:`interp_erai_dewt`, etc.
 #
 # Next step : +validation ++ comparison
@@ -116 +116 @@
 #   * add project_overwrite usage
 #   * handling error of inter_erai_msl (now function)
+#   * handling error of inter_erai_dewt (now function)
 #
 # - pinsard 20120306
@@ -296 +297 @@
    exit
 ENDIF
-;interp_erai_dewt_1989_2009
+result = interp_erai_dewt(${yyyymmddb}, ${yyyymmdde})
+IF result < 0 THEN BEGIN
+   msg = 'eee : pb after interp_erai_dewt' + string(result)
+   err = report(msg)
+   exit
+ENDIF
 ;interp_erai_lwr_1989_2009
 result = interp_erai_msl(${yyyymmddb}, ${yyyymmdde})