Changeset 163 for trunk/src

Timestamp:

03/19/12 09:00:25 (12 years ago)

Author:

pinsard

Message:

implement overwrite mechanism

Location:

trunk/src

Files:

• cm_project.pro (modified) (2 diffs)
• interp_erai_t2m.pro (modified) (3 diffs)
• oaflux_mask_30n30s.pro (modified) (4 diffs)
• project_init.pro (modified) (4 diffs, 1 prop)
• tropflux.sh (modified) (3 diffs)

trunk/src/cm_project.pro

@@ -24 +24 @@
 ; $URL$
 ;
+; - fplod 20120319
+;
+;   * add project_overwrite
+;
 ; - fplod 20110411T082258Z cratos.locean-ipsl.upmc.fr (Linux)
 ;
@@ -29 +33 @@
 ;
 ;-
-COMMON project, project_env, project_id_env, project_od_env
+COMMON project, project_env, project_id_env, project_od_env, project_overwrite

trunk/src/interp_erai_t2m.pro

@@ -138 +138 @@
 ; see :func:`file_interp <saxo:file_interp>`
 ;
-; use as input a file produced by compute_erai_daily_region_2d.sh or 
+; use as input a file produced by compute_erai_daily_region_2d.sh or
 ; get_erai.py + grib to netcdf conversion
 ;
@@ -165 +165 @@
 ;
 ; $URL: svn+ssh://pinsard@forge.ipsl.jussieu.fr/ipsl/forge/projets/tropflux/svn/trunk/src/interp_erai_t2m.pro $
+;
+; - fplod 20120319
+;
+;   * taking project_overwite into account
 ;
 ; - fplod 20120306
@@ -335 +339 @@
 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)

trunk/src/oaflux_mask_30n30s.pro

@@ -36 +36 @@
 ;      }
 ;
-; :returns: 0 if ok,  -1 if error
+; :returns: 0 if ok, -1 if error
 ; :rtype: integer
 ;
@@ -87 +87 @@
 ;
 ; global attributes corrections :
+;
 ;  - written now : OAFLUX mask over the Indian Ocean: 40E-120E, 30S-30N
 ;  - while data latitude=[-29.5,+29.5] longitude=[30.5,379.5]
@@ -104 +105 @@
 ;
 ; $URL$
+;
+; - fplod 20120319
+;
+;   * taking project_overwite into account
 ;
 ; - fplod 20120306
@@ -173 +178 @@
 fullfilename_out=project_od_env+'mask_oaflux_30N30S.nc'
 ; in order to avoid unexpected overwritten
-IF (FILE_TEST(fullfilename_out) EQ 1) THEN BEGIN
+PRINT, 'project_overwrite : ',project_overwrite
+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)

trunk/src/project_init.pro

@@ -10 +10 @@
 ; ===========
 ;
-; This is the SAXO initialisation file.
+; This is the IDL/:ref:<saxo:saxo> initialisation file.
+;
+; .. note::
+;
+;    **project_overwrite** is here set to ``0`` : Existing files won't be 
+;    overwritten. It might be set 
+;    to ``1`` when you want to overwrite existing files in IDL process.
 ;
 ; It ++::
@@ -17 +23 @@
 ;
 ; or::
+;
 ;   $ idl -IDL_STARTUP project_init.pro
 ;
@@ -42 +49 @@
 ;
 ; $URL$
+;
+; - fplod 20120319 
+;
+;   * define a overwrite status
 ;
 ; - fplod 20110429T081938Z aedon.locean-ipsl.upmc.fr (Darwin)
@@ -85 +96 @@
 project_od_env=project_od_env_temp
 ;
-; compatibility with the old version
+; define overwrite status
+project_overwrite = 0
+;
+; compatibility with the old version of SAXO
 ;
 keep_compatibility, 0

trunk/src/tropflux.sh

@@ -110 +110 @@
 #
 # $URL$
+#
+# - pinsard 20120319
+#
+#   * add project_overwrite usage
 #
 # - pinsard 20120306
@@ -278 +282 @@
 pro tropflux_${$}
 compile_opt idl2, strictarrsubs, logical_predicate
+@cm_project
+;
+; define overwrite status
+; set to 1 to overwrite existing files
+project_overwrite = 0
+;
 result = oaflux_mask_30n30s()
 IF result < 0 THEN BEGIN
@@ -321 +331 @@
 ${IDL_CMD} << EOF >> ${log} 2>&1
 .compile file_interp
+;
 tropflux_${$}
 EOF