Changeset 167 for trunk/src

Timestamp:

03/19/12 18:51:42 (12 years ago)

Author:

pinsard

Message:

interp_erai_lwr is now a function

Location:

trunk/src

Files:

• add_19890101.sh (modified) (1 diff)
• compute_erai_daily_region_2d.sh (modified) (1 diff)
• d2m_to_q2m_erai.pro (modified) (1 diff)
• interp_erai_dewt.pro (modified) (1 diff)
• interp_erai_lwr.pro (moved) (moved from trunk/src/interp_erai_lwr_1989_2009.pro) (20 diffs)
• lwr_correction_ncdf.pro (modified) (3 diffs)
• oaflux_mask_30n30s.pro (modified) (1 diff)
• tropflux.sh (modified) (3 diffs)

trunk/src/add_19890101.sh

@@ -31 +31 @@
 # ++
 # has been produced by
-# :ref:`interp_erai_lwr_1989_2009.pro`.
+# :func:`interp_erai_lwr`.
 # repeat the first time step in 
 #

trunk/src/compute_erai_daily_region_2d.sh

@@ -106 +106 @@
 # :func:`divc <cdo:divc>`
 #
-# :ref:`interp_erai_dewt_1989_2009.pro`
-# :ref:`interp_erai_lwr_1989_2009.pro`
+# :func:`interp_erai_dewt`
+# :func:`interp_erai_lwr`
 # :ref:`interp_erai_sst_1989_2009.pro`
 # :func:`interp_erai_t2m`

trunk/src/d2m_to_q2m_erai.pro

@@ -26 +26 @@
 ; has been
 ; produced by
-; :ref:`interp_erai_msl_1989_2009.pro`.
+; :func:`interp_erai_msl`.
 ;
 ; q2m on OAFLUX grid

trunk/src/interp_erai_dewt.pro

@@ -183 +183 @@
 result = -1
 ;
-usage = 'result = interp_erai_t2m(yyyymmddb, yyyymmdde)
+usage = 'result = interp_erai_dewt(yyyymmddb, yyyymmdde)
 nparam = N_PARAMS()
 IF (nparam NE 2) THEN BEGIN

trunk/src/interp_erai_lwr.pro

@@ -1 +1 @@
 ;+
 ;
-; .. _interp_erai_lwr_1989_2009.pro:
-;
-; =============================
-; interp_erai_lwr_1989_2009.pro
-; =============================
+;
+; ===================
+; interp_erai_lwr.pro
+; ===================
+;
+; .. function:: interp_erai_lwr(yyyymmddb,yyyymmdde)
 ;
 ; DESCRIPTION
@@ -24 +25 @@
 ; Interpolated str
 ; is written in
-; :file:`${PROJECT_OD}/erai_lwr_19890102_20091231_oafluxgrid.nc`
+; :file:`${PROJECT_OD}/erai_lwr_{yyyymmdd}_{yyyymmdd}_oafluxgrid.nc`
 ; if this file not already exists.
 ;
 ; This output file
-; :file:`${PROJECT_OD}/erai_lwr_19890102_20091231_oafluxgrid.nc`
+; :file:`${PROJECT_OD}/erai_lwr_{yyyymmdd}_{yyyymmdd}_oafluxgrid.nc`
 ; must be processed after by
 ; :ref:`add_19890101.sh`.
@@ -40 +41 @@
 ;     .. graphviz::
 ;
-;        digraph interp_erai_lwr_1989_2009 {
+;        digraph interp_erai_lwr {
 ;
 ;           file_in [shape=ellipse,fontname=Courier,label="${PROJECT_ID}/20c3m_erai_str_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_lwr_19890102_20091231_oafluxgrid.nc"];
-;
-;           interp_erai_lwr_1989_2009 [shape=box,
+;           file_out [shape=ellipse,fontname=Courier,label="${PROJECT_OD}/erai_lwr_{yyyymmdd}_{yyyymmdd}_oafluxgrid.nc"];
+;
+;           interp_erai_lwr [shape=box,
 ;           fontname=Courier,
 ;           color=blue,
-;           URL="http://forge.ipsl.jussieu.fr/tropflux/browser/trunk/src/interp_erai_lwr_1989_2009.pro",
-;           label="${PROJECT}/src/interp_erai_lwr_1989_2009.pro"];
-;
-;           {file_in mask} -> {interp_erai_lwr_1989_2009} -> {file_out}
+;           URL="http://forge.ipsl.jussieu.fr/tropflux/browser/trunk/src/interp_erai_lwr.pro",
+;           label="${PROJECT}/src/interp_erai_lwr.pro"];
+;
+;           {file_in mask} -> {interp_erai_lwr} -> {file_out}
 ;
 ;        }
@@ -60 +61 @@
 ;
 ; :ref:`interpolate_data`
+;
+; Used by :ref:`tropflux.sh`
 ;
 ; :ref:`project_profile.sh`
@@ -80 +83 @@
 ;
 ;  IDL> .compile file_interp
-;  IDL> interp_erai_lwr_1989_2009
+;  IDL> yyyymmddb = 19890101
+;  IDL> yyyymmdde = 20091231
+;  IDL> result = interp_erai_lwr(yyyymmddb, yyymmdde)
+;  IDL> print, result
 ;
 ; TODO
@@ -92 +98 @@
 ;
 ;   lwr[longitude,latitude,time]=lwrout:lwr_attr; longitude[]=xlon:lon_attr; latitude[]=ylat:lat_attr; tt[*time]=tt:time_attr  @ globattr
-;   % NCDF_VARPUT: Operation Failed, bad file (4) or variable (0) id ?
+;   % NCDF_VARPUT: Operation Failed, bad file (4) or variable [0] id ?
 ;                  (NC_ERROR=-31)
 ;   % Stop encountered: INTERP_ERAI_LWR_1989_2009    1
@@ -106 +112 @@
 ; dataset to 19890101 using nco after this processing. see :ref:`compute_erai_daily_region_2d.sh`
 ;
+; st and en not used
+;
+; check if there is the same issue with 19790101 vs 19790102.
+;
 ; coding rules
 ;
@@ -119 +129 @@
 ; $Id$
 ;
-; $URL: svn+ssh://pinsard@forge.ipsl.jussieu.fr/ipsl/forge/projets/tropflux/svn/trunk/src/interp_erai_lwr_1989_2009.pro $
+; $URL: svn+ssh://pinsard@forge.ipsl.jussieu.fr/ipsl/forge/projets/tropflux/svn/trunk/src/interp_erai_lwr.pro $
+;
+; - fplod 20120319
+;
+;   * taking project_overwite into account
+;   * try to add compile_opt seems to be incompatible with ncdf_quickwrite
+;   * pro -> function
 ;
 ; - fplod 20110830T145010Z cratos (Linux)
@@ -173 +189 @@
 ;
 ;-
-pro interp_erai_lwr_1989_2009
+function interp_erai_lwr $
+         , yyyymmddb $
+         , yyyymmdde
+;
+;++compile_opt idl2, strictarrsubs, logical_predicate
 ;
 @cm_4cal
@@ -181 +201 @@
 @cm_project
 ;
+; Return to caller if errors
+ON_ERROR, 2
+;
+result = -1
+;
+usage = 'result = interp_erai_lwr(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
 ;
@@ -188 +222 @@
      msg = 'eee : ${PROJECT_ID} is not defined'
      ras = report(msg)
-     STOP
+     return, result
            END
  ELSE: BEGIN
@@ -202 +236 @@
    msg = 'eee : the directory' + iodirin  + ' is not accessible.'
    ras = report(msg)
-   STOP
+   return, result
 ENDIF
 ;
@@ -215 +249 @@
    msg = 'eee : the file ' + fullfilename_msk + ' was not found.'
    ras = report(msg)
-   STOP
+   return, result
 ENDIF
 ;
@@ -231 +265 @@
    msg = 'eee : the file ' + fullfilename + ' was not found.'
    ras = report(msg)
-   STOP
+   return, result
 ENDIF
 ;
@@ -239 +273 @@
          msg = 'eee : ${PROJECT_OD} is not defined'
          ras = report(msg)
-       STOP
+       return, result
        END
   ELSE: BEGIN
@@ -254 +288 @@
     msg = 'eee : the directory' + iodirout  + ' was not found.'
     ras = report(msg)
-    STOP
+    return, result
 ENDIF
 ;
 ; build output filename
-filename_out = 'erai_lwr_19890102_20091231_oafluxgrid.nc'
+filename_out = 'erai_lwr_' + 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
 ;
@@ -273 +307 @@
 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]
 ;
 jptin=jpt
-tab=lwrin(*,*,0)
+tab=lwrin[*,*,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)
 ;
@@ -295 +329 @@
   ; ++print, 'Interpolation jt=',jt,' / ',jptin-1
 ;
-  tab=reform(lwrin(*,*,jt))
-  lwrout(*,*,jt)=call_interp2d(tab,lonin,latin,mskin $
+  tab=reform(lwrin[*,*,jt])
+  lwrout[*,*,jt]=call_interp2d(tab,lonin,latin,mskin $
       , lonout,latout,method='bilinear' $
       , OUTMASK_IND=mskout, SET_OUTMSKVAL=mskout)
-  lwrout(*,*,jt)=lwrout(*,*,jt)*mskout+(1.-mskout)*1.e20
+  lwrout[*,*,jt]=lwrout[*,*,jt]*mskout+(1.-mskout)*1.e20
 ;
 endfor
@@ -305 +339 @@
 time=timegen(7669, start=julday(1,2,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,00)
 ;
@@ -326 +360 @@
 @ncdf_quickwrite
 ;
+result = 0
+return, result
+;
 end

trunk/src/lwr_correction_ncdf.pro

@@ -13 +13 @@
 ; ++
 ; have been produced by
-; :ref:`add_19890101.sh`.
+; :func:`interp_erai_lwr` and :ref:`add_19890101.sh`.
 ;
 ; Corrected lwr on OAFLUX grid
@@ -55 +55 @@
 ; :ref:`mooring_corrections`
 ;
-; :ref:`add_19890101.sh`
+; :func:`interp_erai_lwr` and :ref:`add_19890101.sh`
 ;
 ; :func:`initncdf <saxo:initncdf>`
@@ -97 +97 @@
 ; - fplod 20110819T105050Z aedon.locean-ipsl.upmc.fr (Darwin)
 ;
-;   * replace previous step :ref:`interp_erai_lwr_1989_2009.pro`
+;   * replace previous step interp_erai_lwr_1989_2009.pro
 ;     by :ref:`add_19890101.sh`
 ;   * change 19890102 to 19890101

trunk/src/oaflux_mask_30n30s.pro

@@ -64 +64 @@
 ; :ref:`TropFlux_19890101_20091231.pro`,
 ; :func:`interp_erai_dewt`,
-; :ref:`interp_erai_lwr_1989_2009.pro`,
+; :func:`interp_erai_lwr`,
 ; :ref:`interp_erai_sst_1989_2009.pro`,
 ; :func:`interp_erai_t2m`,

trunk/src/tropflux.sh

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