Changeset 88 for trunk/src

Timestamp:

08/19/11 17:40:14 (13 years ago)

Author:

pinsard

Message:

progress on coare correction

Location:

trunk/src

Files:

• TropFlux_19890101_20091231.pro (modified) (7 diffs, 1 prop)
• TropFlux_NRT_ncdf.pro (modified) (5 diffs, 1 prop)
• TropFlux_swr_BLND_19890101_20091231.pro (modified) (9 diffs, 1 prop)
• TropFlux_swr_DT_19890101_20071231.pro (modified) (1 prop)
• TropFlux_swr_NRT_19890101_20091231.pro (modified) (1 prop)
• add_19890101.sh (added)
• calc_cloud_vlat.pro (modified) (1 diff)
• compute_erai_daily_region_2d.sh (modified) (6 diffs)
• cronin_gustiness_ncdf.pro (modified) (2 diffs)
• interp_erai_dewt_1989_2009.pro (modified) (1 diff, 1 prop)
• interp_erai_lwr_1989_2009.pro (modified) (6 diffs, 1 prop)
• interp_erai_msl_1989_2009.pro (modified) (1 prop)
• interp_erai_sst_1989_2009.pro (modified) (1 diff, 1 prop)
• interp_erai_t2m_1989_2009.pro (modified) (1 diff, 1 prop)
• interp_erai_ws_1989_2009.pro (modified) (1 diff, 1 prop)
• interp_olr_30n30s_1989_2009.pro (modified) (1 prop)
• lwr_correction_ncdf.pro (modified) (6 diffs, 1 prop)
• paper01/fig7/air_validation_scatter_2000_2009_basin.pro (modified) (1 diff)
• q2m_correction_ncdf.pro (modified) (1 prop)
• qsee.pro (modified) (3 diffs)
• sst_correction_ncdf.pro (modified) (1 prop)
• t2m_correction_ncdf.pro (modified) (1 prop)
• ws_correction_ncdf.pro (modified) (1 prop)

trunk/src/TropFlux_19890101_20091231.pro

@@ -63 +63 @@
 ;
 ; net heat flux components are written
-; in :file:`${PROJECT_OD}/TropFlux_19890101_20091231.nc`
+; in :file:`${PROJECT_OD}/TropFlux_19890101_20091231_coarev3.nc`
 ; if this file not already exists.
 ;
+; This output file :file:`${PROJECT_OD}/TropFlux_19890101_20091231_coarev3.nc`
+; will be used by :ref:`TropFlux_NRT_ncdf.pro`.
+;
 ;     .. graphviz::
 ;
 ;        digraph tropflux_19890101_20091231 {
-;           graph [
-;           rankdir="LR",
-;           ]
 ;
 ;           mask [shape=ellipse,fontname=Courier,label="${PROJECT_ID}/mask_oaflux_30N30S.nc"];
@@ -82 +82 @@
 ;           file_q2m [shape=ellipse,fontname=Courier,label="${PROJECT_OD}/TropFlux_q2m_19890101_20091231.nc"];
 ;
-;           file_out[shape=ellipse,fontname=Courier,label="${PROJECT_OD}/TropFlux_19890101_20091231.nc"];
+;           file_out[shape=ellipse,fontname=Courier,label="${PROJECT_OD}/TropFlux_19890101_20091231_coarev3.nc"];
 ;
 ;           tropflux_19890101_20091231 [shape=box,
@@ -109 +109 @@
 ; :func:`ncdf_quickwrite <saxo:ncdf_quickwrite>`
 ;
+; :func:`qsee`
+; :func:`calc_claud_vlat` 
 ; :func:`cor30a`
 ;
@@ -122 +124 @@
 ; ====
 ;
-; no ${PROJECT_OD}/TropFlux_swr_19890101_20091231_BLND.nc yet because of pb in
-; TropFlux_swr_BLND_19890101_20091231.pro
+; missing lwnet_clark::
+;
+;    % Variable is undefined: LWNET_CLARK.
+;    % Execution halted at: TROPFLUX_19890101_20091231  434 /.autofs/home/fplod/incas/tropflux/tropflux_ws/src/TropFlux_19890101_20091231.pr
+;      o
+;    %                      $MAIN$          
+;    % Program caused arithmetic error: Floating overflow
+;    % Program caused arithmetic error: Floating illegal operand
+;
+; check if K or °C in input 
+;
+; get rid of::
+;
+;   % date 1: 19880101 is not found in the time axis.
+;
+; why ::
+;
+;   da1=19880101
+;
+; 1st date 19890101 no ? 
+;
+; why da1-1 (with da1=19880101) when reading gustiness file ::
+;
+;   wg=read_ncdf('wg',da1-1,da2,file=fullfilename_wg,/nostr)
 ;
 ; avoid mix lower/uppercase in pro name to avoid compile
@@ -141 +165 @@
 ;
 ; $URL$
+;
+; - fplod 20110819T144332Z aedon.locean-ipsl.upmc.fr (Darwin)
+;
+;   * add _coarev3 to filename output
+;   * check if filename output exists
 ;
 ; - fplod 20110809T110911Z aedon.locean-ipsl.upmc.fr (Darwin)
@@ -330 +359 @@
 IF fullfilename_wg[0] EQ '' THEN BEGIN
    msg = 'eee : the file ' + fullfilename_wg + ' was not found.'
+   ras = report(msg)
+   STOP
+ENDIF
+;
+; build output filename
+filename_out = 'TropFlux_19890101_20091231_coarev3.nc'
+fullfilename_out = iodirout + filename_out
+; in order to avoid unexpected overwritten
+IF (FILE_TEST(fullfilename_out) EQ 1) THEN BEGIN
+   msg = 'eee : the file ' + fullfilename_out  + ' already exists.'
    ras = report(msg)
    STOP
@@ -426 +465 @@
 xlon=reform(glamt(*,0) ) & ylat=reform(gphit(0,*))
 
-ncfile='!${PROJECT_OD}/TropFlux_19890101_20091231.nc'
+ncfile='!' + fullfilename_out
 lon_attr={units:'degrees_east',long_name:'Longitude'}
 lat_attr={units:'degrees_north',long_name:'Latitude'}

trunk/src/TropFlux_NRT_ncdf.pro

@@ -7 +7 @@
 ; =====================
 ;
+; :file:`${PROJECT_OD}/TropFlux_swr_19890101_20091231_BLND.nc`
+; containing
+; ws corrected on OAFLUX grid
+; has been produced by
+; :ref:`TropFlux_swr_BLND_19890101_20091231.pro`.
+;
+; :file:`${PROJECT_OD}/TropFlux_lwr_19890101_20091231.nc`
+; containing
+; lwr corrected on OAFLUX grid
+; has been produced by
+; :ref:`lwr_correction_ncdf.pro`.
+;
+; :file:`${PROJECT_OD}/TropFlux_19890101_20091231_coare3.nc`
+; containing
+; ++
+; has been produced by
+; :ref:`TropFlux_19890101_20091231.pro`.
+;
+; ++ are written
+; in :file:`${PROJECT_OD}/TropFlux_19890101_20091231.nc`
+; if this file not already exists.
+;
 ;     .. graphviz::
 ;
 ;        digraph tropflux_nrt_ncdf {
-;           graph [
-;           rankdir="LR",
-;           ]
-;           file1 [shape=ellipse,fontname=Courier,label="/Users/pkb/data/TropFlux/TropFlux_swr_19890101_20091231_BLND.nc"];
-;           file2 [shape=ellipse,fontname=Courier,label="/Users/pkb/data/TropFlux/TropFlux_lwr_19890101_20091231_v50.nc"];
-;           file3 [shape=ellipse,fontname=Courier,label="/Users/pkb/data/TropFlux/TropFlux_19890101_20091231_v51.nc"];
-;           ncfile [shape=ellipse,fontname=Courier,label="/Users/pkb/data/TropFlux/TropFlux_19890101_20091231.nc"];
+;
+;           file_swr [shape=ellipse,fontname=Courier,label="${PROJECT_OD}/TropFlux_swr_19890101_20091231_BLND.nc"];
+;           file_lwr [shape=ellipse,fontname=Courier,label="${PROJECT_OD}/TropFlux_lwr_19890101_200912310.nc"];
+;           file_coare [shape=ellipse,fontname=Courier,label="${PROJECT_OD}/TropFlux_19890101_20091231_coarev3.nc"];
+;           file_out [shape=ellipse,fontname=Courier,label="${PROJECT_OD}/TropFlux_19890101_20091231.nc"];
 ;
 ;           tropflux_nrt_ncdf [shape=box,
@@ -24 +44 @@
 ;           label="${PROJECT}/src/TropFlux_NRT_ncdf.pro" ];
 ;
-;           {file1 file2 file3} -> {tropflux_nrt_ncdf} -> {ncfile}
-;          }
+;           {file_swr file_lwr file_coare} -> {tropflux_nrt_ncdf} -> {file_out}
+;
+;        }
 ;
 ; SEE ALSO
@@ -46 +67 @@
 ; ====
 ;
-; hard coded directory - usage of ${PROJECT_ID}
+; no yet tested because pb in TropFlux_19890101_20091231.pro
 ;
 ; coding rules
@@ -62 +83 @@
 ;
 ;   * remove v50 from pro name and in the graph
+;   * add coarev3 to the file coming from TropFlux_19890101_20091231.pro
+;   * use $PROJECT_OD
 ;
 ; - fplod 20101214T112526Z aedon.locean-ipsl.upmc.fr (Darwin)
@@ -77 +100 @@
 ;-
 pro TropFlux_NRT_ncdf
-@common
-
-dir="/Users/pkb/data/TropFlux/"
-file=dir+"TropFlux_swr_19890101_20091231_BLND.nc"
-initncdf, file
+;
+@cm_4cal
+@cm_4data
+@cm_4mesh
+@cm_4data
+@cm_project
+;
+;
+; test if ${PROJECT_OD} defined
+CASE project_od_env OF
+  '' : BEGIN
+         msg = 'eee : ${PROJECT_OD} is not defined'
+         ras = report(msg)
+       STOP
+       END
+  ELSE: BEGIN
+          msg = 'iii : ${PROJECT_OD} is ' + project_od_env
+          ras = report(msg)
+        END
+ ENDCASE
+;
+; check if output data will be possible
+iodirout = isadirectory(project_od_env)
+;
+; existence and protection for reading
+IF (FILE_TEST(iodirout, /DIRECTORY, /EXECUTABLE, /READ) EQ 0) THEN BEGIN
+   msg = 'eee : the directory' + iodirout  + ' is not accessible.'
+   ras = report(msg)
+   STOP
+ENDIF
+;
+; existence and protection for writing
+IF (FILE_TEST(iodirout, /DIRECTORY, /WRITE) EQ 0) THEN BEGIN
+    msg = 'eee : the directory' + iodirout  + ' was not found.'
+    ras = report(msg)
+    STOP
+ENDIF
+;
+; build SWR blnd data filename
+filename_swr_blnd="TropFlux_swr_19890101_20091231_BLND.nc"
+;
+; check if this file exists
+msg='iii : looking for ' + filename_swr_blnd
+ras = report(msg)
+fullfilename_swr_blnd = isafile(iodirout + filename_swr_blnd, NEW=0, /MUST_EXIST)
+IF fullfilename_swr_blnd[0] EQ '' THEN BEGIN
+   msg = 'eee : the file ' + fullfilename_swr_blnd + ' was not found.'
+   ras = report(msg)
+   STOP
+ENDIF
+;
+; build LWR data filename
+filename_lwr="TropFlux_lwr_19890101_20091231.nc"
+;
+; check if this file exists
+msg='iii : looking for ' + filename_lwr
+ras = report(msg)
+fullfilename_lwr = isafile(iodirout + filename_lwr, NEW=0, /MUST_EXIST)
+IF fullfilename_lwr[0] EQ '' THEN BEGIN
+   msg = 'eee : the file ' + fullfilename_lwr + ' was not found.'
+   ras = report(msg)
+   STOP
+ENDIF
+;
+;  build COARE data filename
+filename_coare="TropFlux_19890101_20091231_coarev3.nc"
+;
+; check if this file exists
+msg='iii : looking for ' + filename_lwr
+ras = report(msg)
+fullfilename_coare = isafile(iodirout + filename_coare, NEW=0, /MUST_EXIST)
+IF fullfilename_coare[0] EQ '' THEN BEGIN
+   msg = 'eee : the file ' + fullfilename_coare + ' was not found.'
+   ras = report(msg)
+   STOP
+ENDIF
+;
+filename_out='TropFlux_19890101_20091231.nc'
+fullfilename_out = iodirout + filename_out
+; in order to avoid unexpected overwritten
+IF (FILE_TEST(fullfilename_out) EQ 1) THEN BEGIN
+   msg = 'eee : the file ' + fullfilename_out  + ' already exists.'
+   ras = report(msg)
+   STOP
+ENDIF
+;
 st=19800101 & en=20101231
 
-swr=read_ncdf("swr", st, en, file=file,/nostr)
-
-file=dir+"TropFlux_lwr_19890101_20091231_v50.nc"
-initncdf, file
-lwr=read_ncdf("lwr", st, en, file=file,/nostr)
-
-file=dir+"TropFlux_19890101_20091231_v51.nc"
-initncdf, file
-lhf=read_ncdf("lhf", st, en, file=file,/nostr)
-shf=read_ncdf("shf", st, en, file=file,/nostr)
+initncdf, fullfilename_swr_blnd
+
+swr=read_ncdf("swr", st, en, file=fullfilename_swr_blnd,/nostr)
+
+initncdf, fullfilename_lwr
+lwr=read_ncdf("lwr", st, en, file=fullfilename_lwr,/nostr)
+
+initncdf, fullfilename_coare
+lhf=read_ncdf("lhf", st, en, file=fullfilename_coare,/nostr)
+shf=read_ncdf("shf", st, en, file=fullfilename_coare,/nostr)
 
 help, swr, lwr, lhf, shf

trunk/src/TropFlux_swr_BLND_19890101_20091231.pro

@@ -28 +28 @@
 ; if this file not already exists.
 ;
-; This file will be used by :ref:`TropFlux_NRT_cfd.pro`.
+; This file will be used by :ref:`TropFlux_NRT_ncdf.pro`.
 ;
 ;     .. graphviz::
@@ -63 +63 @@
 ; :func:`ncdf_quickwrite <saxo:ncdf_quickwrite>`
 ;
-; :ref:`Tropflux_NRT_cdf.pro`
+; :ref:`Tropflux_NRT_ncdf.pro`
 ;
 ; EXAMPLES
@@ -76 +76 @@
 ; ====
 ;
-; resolve crash on cratos idl7::
-;
-;   % Attempt to subscript SWR_DT with JT is out of range.
-;
-; line::
-;
-;    for jt=0,jpt-1 do swr_merged(*,*,jt)=swr_dt(*,*,jt)*a(jt)+(1-a(jt))*swr_nrt(*,*,jt)
+; submit read_ncdf with 19890101 pb to saxo-dev
 ;
 ; avoid mix lower/uppercase in pro name to avoid compile
@@ -90 +84 @@
 ; complete description
 ;
-; why different date1 and date2 when readind dt and nrt
-;
-; why two read_ncdf for nrt
-;
-; according to pk 20110811 we can include this process in TropFlux_swr_NRT_19890101_20091231.pro
+; why 20080100, 20100112 as  date1 and date2 when readind nrt
+;
+; why two read_ncdf for nrt 
+;
+; according to pk 20110811 we can include this process in 
+; TropFlux_swr_NRT_19890101_20091231.pro ... later
 ;
 ; KNOWN ISSUES
@@ -109 +104 @@
 ; $URL$
 ;
+; - fplod 20110819T120412Z aedon.locean-ipsl.upmc.fr (Darwin)
+;
+;   * change 19890101 to 19890100 to read 6939 timesteps in DT file
+;     even if uggly and understanted SAXO strange behaviour
+;
+;     this resolve crash on cratos idl7::
+;
+;       % Attempt to subscript SWR_DT with JT is out of range.
+;
+;     line::
+;
+;        for jt=0,jpt-1 do swr_merged(*,*,jt)=swr_dt(*,*,jt)*a(jt)+(1-a(jt))*swr_nrt(*,*,jt)
+;
+;     problably because  6938+731=7669 and not 7670 when
+;     :samp:`dt=read_ncdf("swr", 19890101, 20071231, file=fullfilename_dt,/nostr)`
+;     was used ::
+;
+;        DT              FLOAT     = Array[350, 60, 6938]
+;        NRT             FLOAT     = Array[350, 60, 731]
+;        SWR_DT          FLOAT     = Array[350, 60, 7669]
+;        SWR_NRT         FLOAT     = Array[350, 60, 7670]
+;
+;     nb jours 19890101-20071231::
+;
+;        IDL>  print, julday(12,31,2007) - julday(01, 01, 1989) +1
+;        6939
+;
+;     et ncdump -h $PROJECT_OD/TropFlux_swr_19890101_20071231_DT.nc time = UNLIMITED ; // (6939 currently)
+;
+;     nb jours 19890101-20091231::
+;
+;        IDL>  print, julday(12,31,2009) - julday(01, 01, 1989) +1
+;        7670
+;
+;     strange behaviour of read_ncdf ... see::
+;
+;        IDL> fullfilename_dt='TropFlux_swr_19890101_20071231_DT.nc'
+;        IDL> dt=read_ncdf("swr", 19890100, 20071231, file=fullfilename_dt,/nostr)
+;        IDL> print, 'first time step (should crash with invalid date)', jul2date(time[0])   
+;        first time step (should be 19890101)       19890101.
+;        IDL> dt=read_ncdf("swr", 19890101, 20071231, file=fullfilename_dt,/nostr)
+;        IDL> print, 'first time step (should be 19890101)', jul2date(time[0])   
+;        first time step (should be 19890101)       19890102.
+;
+;   * correction for reading gustiness file
+; 
 ; - fplod 20110809T115747Z aedon.locean-ipsl.upmc.fr (Darwin)
 ;
@@ -135 +176 @@
 @cm_4data
 @cm_project
-;
 ;
 ; test if ${PROJECT_OD} defined
@@ -217 +257 @@
 ;
 initncdf, fullfilename_dt
-dt=read_ncdf("swr", 19890101, 20071231, file=fullfilename_dt,/nostr)
+dt=read_ncdf("swr", 19890100, 20071231, file=fullfilename_dt,/nostr)
+print, 'www : should crash with invalide date 19890100'
 help, dt
+print, 'first time step (should be 19890101)', jul2date(time[0])
+print, 'last time step (should be 20071231)', jul2date(time[jpt-1])
 
 initncdf, fullfilename_nrt
@@ -227 +270 @@
 
 swr_dt=[[[dt]],[[nrt]]]
-help, swr_dt, swr_nrt
+help, nrt, swr_dt, swr_nrt
 
 swr_merged=swr_dt*0.
@@ -235 +278 @@
 a=interpol([1.,0.],[julday(10,01,2007),julday(12,31,2007)],time)
 a=((a > 0.) < 1.)
-for jt=0,jpt-1 do swr_merged(*,*,jt)=swr_dt(*,*,jt)*a(jt)+(1-a(jt))*swr_nrt(*,*,jt)
-
-initncdf, file_wg
+for jt=0,jpt-1 do begin
+    swr_merged(*,*,jt)=swr_dt(*,*,jt)*a(jt)+(1-a(jt))*swr_nrt(*,*,jt)
+endfor
+
+initncdf, fullfilename_wg
 time=timegen(7670, units='days', start=julday(1,1,1989,0)) & jpt=n_elements(time)
 lat=reform(gphit(0,0:jpj-1))

trunk/src/calc_cloud_vlat.pro

@@ -1 @@
-
+;+
+;-
  function calc_cloud_vlat, jday,SWR,XLAT
 

trunk/src/compute_erai_daily_region_2d.sh

@@ -7 +7 @@
 # .. _compute_erai_daily_region_2d.sh:
 #
-# ==========================================================================
-# compute_erai_daily_region_2d.sh - get ERA-I uninterpolated reference files
-# ==========================================================================
+# ===============================
+# compute_erai_daily_region_2d.sh 
+# ===============================
 #
 # SYNOPSIS
@@ -23 +23 @@
 # .. option:: --diff_cmd <arg>
 #
-#    By default :samp:`ncflint` command is used to compute difference between NetCDF files
+#    By default :samp:`ncflint` command is used to compute difference 
+#    between NetCDF files
 #
 #    If :samp:`cdo` is specified here, this command will be used instead.
@@ -34 +35 @@
 # .. option:: -e end date <yyyymmdd>
 #
-# Put in ${PROJECT_ID} ERA-Intermin reference files.
+# Put in ${PROJECT_ID} ERA-Intermin uninterpolated reference files.
 #
 # Log file is written on :file:`${PROJECT_LOG}/compute_erai_daily_region_2d.log.{YYYYMMDDTHHMMSSZ}`
@@ -41 +42 @@
 #
 #        digraph compute_erai_daily_region_2d {
-#           graph [
-#           rankdir="LR",
-#           ]
+#
 #           filein_str [shape=ellipse,fontname=Courier,label="/bdd/ERAI/NETCDF/GLOBAL_075/4xdaily/FC_SF/yyyy/mm/str.yyyymmdd.fshei.GLOBAL_075.nc"];
 #           filein_msl [shape=ellipse,fontname=Courier,label="/bdd/ERAI/NETCDF/GLOBAL_075/4xdaily/AN_SF/yyyy/msl.yyyymm.ashei.GLOBAL_075.nc"];
@@ -91 +90 @@
 # ========
 #
-# :ref:`guide data ERA-I <data_in_erai>`
+# :ref:`data_in_erai`
 #
 # http://climserv.ipsl.polytechnique.fr/fr/les-donnees/era-interim-4.html
@@ -160 +159 @@
 # EVOLUTIONS
 # ==========
+#
+# $Id$
 #
 # $URL$

trunk/src/cronin_gustiness_ncdf.pro

@@ -61 +61 @@
 ; coding rules
 ;
-; why writing more than 1 timestep ?
+; why da1=19880101 & da2=20101231 ? should be 19890101 and 20091231 or better
+; deduce from reading sst
 ;
 ; KNOWN ISSUES
@@ -135 +136 @@
 ;
 da1=19880101 & da2=20101231
-date1=19890101 & date2=20081231
 ;
 ; build data filename

trunk/src/interp_erai_dewt_1989_2009.pro

@@ -102 +102 @@
 ; $Id$
 ;
-; $URL$
+; $URL: svn+ssh://pinsard@forge.ipsl.jussieu.fr/ipsl/forge/projets/tropflux/svn/trunk/src/interp_erai_dewt_1989_2009.pro $
 ;
 ; - fplod 20110808T094156Z cratos (Linux)

trunk/src/interp_erai_lwr_1989_2009.pro

@@ -12 +12 @@
 ; Interpolation of str from ERA-I grid to OAFLUX grid
 ;
-; :file:`${PROJECT_ID}/20c3m_erai_str_TROP_1989_2009.nc` containing str from ERA-I have been produced
+; :file:`${PROJECT_ID}/20c3m_erai_str_TROP_1989_2009.nc` 
+; containing str from ERA-I 
+; have been produced
 ; by :ref:`compute_erai_daily_region_2d.sh`.
 ;
-; :file:`${PROJECT_ID}/mask_oaflux_30N30S.nc` containing OAFLUX grid have been produced by :ref:`oaflux_mask_30N30S.pro`.
+; :file:`${PROJECT_ID}/mask_oaflux_30N30S.nc` 
+; containing OAFLUX mask
+; have been produced by 
+; :ref:`oaflux_mask_30N30S.pro`.
 ;
 ; Interpolated str is written in
-; :file:`${PROJECT_OD}/erai_lwr_19890101_20091231_oafluxgrid.nc` if this file not already exists.
-;
-; This output file :file:`${PROJECT_OD}/erai_lwr_19890101_20091231_oafluxgrid.nc` must be processed after by :ref:`lwr_correction_ncdf.pro`.
+; :file:`${PROJECT_OD}/erai_lwr_19890102_20091231_oafluxgrid.nc` 
+; if this file not already exists.
+;
+; This output file 
+; :file:`${PROJECT_OD}/erai_lwr_19890102_20091231_oafluxgrid.nc` 
+; must be processed after by :ref:`add_198900101.sh`.
 ;
 ;     .. graphviz::
@@ -57 +65 @@
 ; :func:`ncdf_quickwrite <saxo:ncdf_quickwrite>`
 ;
-; :ref:`lwr_correction_ncdf.pro`
+; :ref:`add_198900101.sh`
 ;
 ; EXAMPLES
@@ -94 +102 @@
 ; use real output of :ref:`compute_erai_daily_region_2d.sh`.
 ;
+; remove hard coded time
+;
 ; 19890101 is not provided in ERA-Intermim file str : a possible workaround is to copy 19890102
 ; dataset to 19890101 using nco after this processing. see :ref:`compute_erai_daily_region_2d.sh`
@@ -110 +120 @@
 ; $Id$
 ;
-; $URL$
+; $URL: svn+ssh://pinsard@forge.ipsl.jussieu.fr/ipsl/forge/projets/tropflux/svn/trunk/src/interp_erai_lwr_1989_2009.pro $
+;
+; - fplod 20110819T084310Z aedon.locean-ipsl.upmc.fr (Darwin)
+;
+;   * replace next step :ref:`lwr_correction_ncdf.pro` by :ref:`add_19890101.sh`
+;   * fix output file name to erai_lwr_19890102_20091231_oafluxgrid.nc
 ;
 ; - pinsard 2011-08-08T16:03:48Z loholt1.ipsl.polytechnique.fr (Linux)
@@ -227 +242 @@
 ;
 ; build output filename
-filename_out = 'erai_lwr_19890101_20091231_oafluxgrid.nc'
+filename_out = 'erai_lwr_19890102_20091231_oafluxgrid.nc'
 fullfilename_out = iodirout + filename_out
 ; in order to avoid unexpected overwritten
@@ -267 +282 @@
       , lonout,latout,method='bilinear' $
       , OUTMASK_IND=mskout, SET_OUTMSKVAL=mskout)
-  help, OUTMASK_IND
-  help, SET_OUTMSKVAL
   lwrout(*,*,jt)=lwrout(*,*,jt)*mskout+(1.-mskout)*1.e20
 

trunk/src/interp_erai_sst_1989_2009.pro

@@ -99 +99 @@
 ; $Id$
 ;
-; $URL$
+; $URL: svn+ssh://pinsard@forge.ipsl.jussieu.fr/ipsl/forge/projets/tropflux/svn/trunk/src/interp_erai_sst_1989_2009.pro $
 ;
 ; - fplod 20110808T094156Z cratos (Linux)

trunk/src/interp_erai_t2m_1989_2009.pro

@@ -121 +121 @@
 ; $Id$
 ;
-; $URL$
+; $URL: svn+ssh://pinsard@forge.ipsl.jussieu.fr/ipsl/forge/projets/tropflux/svn/trunk/src/interp_erai_t2m_1989_2009.pro $
 ;
 ; - pinsard 2011-08-08T16:11:48Z loholt1.ipsl.polytechnique.fr (Linux)

trunk/src/interp_erai_ws_1989_2009.pro

@@ -106 +106 @@
 ; $Id$
 ;
-; $URL$
+; $URL: svn+ssh://pinsard@forge.ipsl.jussieu.fr/ipsl/forge/projets/tropflux/svn/trunk/src/interp_erai_ws_1989_2009.pro $
 ;
 ; - fplod 20110808T094156Z cratos (Linux)

trunk/src/lwr_correction_ncdf.pro

@@ -9 +9 @@
 ; Correction of lwr on OAFLUX grid
 ;
-; :file:`${PROJECT_OD}/erai_lwr_19890101_20091231_oafluxgrid.nc` have been
-; produced by :ref:`interp_erai_lwr_1989_2009.pro`.
-;
-; Corrected lwr on OAFLUX grid is written in
+; :file:`${PROJECT_OD}/erai_lwr_19890101_20091231_oafluxgrid.nc` 
+; containing
+; ++
+; have been produced by 
+; :ref:`add_19890101.sh`.
+;
+; Corrected lwr on OAFLUX grid 
+; is written in
 ; :file:`${PROJECT_OD}/TropFlux_lwr_19890101_20091231.nc`
 ; if this file not already exists.
@@ -21 +25 @@
 ;
 ;        digraph lwr_correction_ncdf {
-;           graph [
-;           rankdir="LR",
-;           ]
 ;
 ;           file_in [shape=ellipse,fontname=Courier,label="${PROJECT_OD}/erai_lwr_19890101_20091231_oafluxgrid.nc"];
@@ -45 +46 @@
 ; :ref:`mooring_corrections`
 ;
-; :ref:`interp_erai_lwr_1989_2009.pro`
+; :ref:`add_19890101.sh`
 ;
 ; :func:`initncdf <saxo:initncdf>`
@@ -68 +69 @@
 ; lwr long name 'Air Temperature at 2m" : ???
 ;
-; 19890101 is not provided in ERA-Intermim file str : a possible workaround is
-; to copy 19890102
-; dataset to 19890101 using nco before processing.
-;
-; here is the sequence used by pk wher erai_lwr_19890102_20091231_oafluxgrid.nc is the regridded (interpolated output)
-; 
-;   $ ncks -d time,0,0 erai_lwr_19890102_20091231_oafluxgrid.nc erai_lwr_step0.nc
-;
-; This will combine the two files ::
-;
-;   $ ncrcat erai_lwr_step0.nc erai_lwr_19890102_20091231_oafluxgrid.nc erai_lwr_19890101_20091231_oafluxgrid.nc.
-;
-; must be put in a shell script or find IDL equivalent
-;
-; here I (fp) replace hard coded date 19890102 by 19890101. must check
-; consistency with this module and interp_erai_lwr_1989_2009.pro.
+; remove hard doded time
+;
+; add_19890101.sh sould not be the previous step in a near future
 ;
 ; KNOWN ISSUES
@@ -97 +85 @@
 ;
 ; $URL$
+;
+; - fplod 20110819T105050Z aedon.locean-ipsl.upmc.fr (Darwin)
+;
+;   * replace previous step :ref:`interp_erai_lwr_1989_2009.pro`
+;     by :ref:`add_19890101.sh`
+;   * change 19890102 to 19890101
 ;
 ; - fplod 20110808T120234Z cratos (Linux)
@@ -215 +209 @@
 lat=reform(gphit(0,0:jpj-1))
 lon=reform(glamt(0:jpi-1,0))
-time=timegen(7669, units='days', start=julday(1,2,1989)) & jpt=n_elements(time)
+time=timegen(7670, units='days', start=julday(1,1,1989)) & jpt=n_elements(time)
 
 cda0=string(jul2date(time(0)),format='(i8.8)')

trunk/src/paper01/fig7/air_validation_scatter_2000_2009_basin.pro

@@ -12 +12 @@
 ;
 ;    digraph air_validation_scatter_2000_2009_basin {
-,
+;
 ;       air_erai [shape=ellipse,fontname=Courier,label="${PROJECT_ID}/air_2000_2009_erai_*.txt"];
 ;       air_tropflux [shape=ellipse,fontname=Courier,label="${PROJECT_OD}/air_2000_2009_trop_*.txt"];

trunk/src/qsee.pro

@@ -1 @@
-;--------------------------------------------------------
+;+
+;-
 function qsee, sst,Ps
 ;
@@ -5 +6 @@
 ; sst: SST (degC)
 ; Ps : surface pressure (mb)
-;--------------------------------------------------------
 x=sst
 p=Ps
@@ -14 +14 @@
 
 end
-;--------------------------------------------------------