Changeset 183 for trunk

Timestamp:

03/29/12 13:59:31 (12 years ago)

Author:

pinsard

Message:

tropflux_wind_stress is now a function

Location:

trunk/src

Files:

• tropflux.sh (modified) (4 diffs)
• tropflux_wind_stress.pro (moved) (moved from trunk/src/TropFlux_wind_stress_19890101_20101231.pro) (4 diffs)

trunk/src/tropflux.sh

@@ -96 +96 @@
 # :func:`t2m_correction_ncdf`, :func:`ws_correction_ncdf`,
 # :func:`tropflux_swr_dt`, :func:`tropflux_swr_nrt`, :func:`tropflux_swr_blnd`,
-# :func:`tropflux_nrt_cdf`,
+# :func:`tropflux_nrt_cdf`,:func:`tropflux_wind_stress`
 # etc.
 #
@@ -108 +108 @@
 # make it work
 #
+# if yyyymmdd < 20071231, is it meaningfull to call all the fucntions ?
+#
 # idl status = 0 even if not ok
 #
@@ -118 +120 @@
 #
 # $URL$
+#
+# - pinsard 20120329
+#
+#   * add tropflux_wind_stress (to be consolidated)
 #
 # - pinsard 20120326
@@ -452 +458 @@
    exit
 ENDIF
+result = tropflux_wind_stress(${yyyymmddb}, ${yyyymmdde})
+IF result < 0 THEN BEGIN
+   msg = 'eee : pb after tropflux_wind_stress' + string(result)
+   err = report(msg)
+   exit
+ENDIF
 end
 EOF

trunk/src/tropflux_wind_stress.pro

@@ -1 +1 @@
 ;+
 ;
-; .. _TropFlux_wind_stress_19890101_20101231.pro:
+; .. _tropflux_wind_stress.pro:
 ;
-; ==========================================
-; TropFlux_wind_stress_19890101_20101231.pro
-; ==========================================
+; ========================
+; tropflux_wind_stress.pro
+; ========================
 ;
 ; DESCRIPTION
 ; ===========
-
+;
+; SEE ALSO
+; ========
+;
 ; TODO
 ; ====
 ;
 ; integration to the whole process
+;
+; check existence protection
+;
+; complete header, complete data_contents.rst
+;
+; graphviz
 ;
 ; EVOLUTIONS
@@ -21 +30 @@
 ;
 ; $URL$
+;
+; - fplod 20120329
+;
+;   * pro -> func
+;   * rename with lower case TropFlux_wind_stress_19890101_20101231.pro become
+;     tropflux_wind_stress.pro
+;   * hard coded st and en replaced by yyyymmddb and yyyymmdde parameters
+;   * add compile_opt 
+;   * get rid of hard coded path
 ;
 ; - fplod 20110830T153220Z cratos (Linux)
@@ -31 +49 @@
 ;
 ;-
-pro TropFlux_wind_stress_19890101_20101231
-@common
-;------------------------------------------------------------
-st=19880101
-en=20101231
-st=19880101
-en=20101231
+function tropflux_wind_stress $
+         , yyyymmddb $
+         , yyyymmdde
 ;
-file="/Volumes/PAYASAM/TropFlux/ERA_C_1989_2010/TropFlux_19890101_20101231.nc"
+compile_opt idl2, strictarrsubs, logical_predicate
+;
+@cm_4cal
+@cm_4data
+@cm_4mesh
+@cm_4data
+@cm_project
+;
+;
+; Return to caller if errors
+ON_ERROR, 2
+;
+result = -1
+;
+usage = 'result = tropflux_swr_dt(yyyymmddb, yyyymmdde)'
+nparam = N_PARAMS()
+IF (nparam NE 2) THEN BEGIN
+    ras = report(['Incorrect number of arguments.' $
+          + '!C' $
+          + 'Usage : ' + usage])
+    return, result
+ENDIF
+
+dir=project_od_env
+file=dir + 'TropFlux_' +  string(yyyymmddb,format='(I8.8)') + '_' + string(yyyymmdde,format='(I8.8)') + '.nc'
 initncdf, file
-tau=read_ncdf("tau", st, en, file=file,/nostr)
+tau=read_ncdf("tau", yyyymmddb-.5d,yyyymmdde, file=file,/nostr)
 tau=reform(tau)
 help, tau
 ;
-stop
-dir='/Volumes/PAYASAM/TropFlux/ERA_C_1989_2010/'
-file_wind=dir+'TropFlux_ws_19890101_20101231.nc'
-file_wg=dir+'gustiness_19890101_20101231.nc'
+file_wind=dir+'TropFlux_ws_' +  string(yyyymmddb,format='(I8.8)') + '_' + string(yyyymmdde,format='(I8.8)') + '.nc'
+file_wg=dir+'gustiness_' +  string(yyyymmddb,format='(I8.8)') + '_' + string(yyyymmdde,format='(I8.8)') + '.nc'
 initncdf, file_wind
 ;
-ws=read_ncdf('ws',st,en,file=file_wind,/nostr)
-wg=read_ncdf('wg',st,en,file=file_wg,/nostr)
+ws=read_ncdf('ws',yyyymmddb-.5d,yyyymmdde,file=file_wind,/nostr)
+wg=read_ncdf('wg',yyyymmddb-.5d,yyyymmdde,file=file_wg,/nostr)
 s=sqrt((ws*ws)+(wg*wg))
 s=reform(s)
 help, s
 ;
-file="/Volumes/Iomega_HDD/TropFlux/input_uncor/erai_ws_19890101_20101231.nc"
+file=dir+'erai_ws_+  string(yyyymmddb,format='(I8.8)') + '_' + string(yyyymmdde,format='(I8.8)') + '.nc'
 initncdf, file
-u=read_ncdf('u10',st,en,file=file,/nostr)
-v=read_ncdf('v10',st,en,file=file,/nostr)
+u=read_ncdf('u10',yyyymmddb-.5d,yyyymmdde,file=file,/nostr)
+v=read_ncdf('v10',yyyymmddb-.5d,yyyymmdde,file=file,/nostr)
 ;
 u=reform(u)
@@ -101 +137 @@
 @ncdf_quickwrite
 ;
+result = 0
+return, result
+;
 end