Changeset 13 for trunk/src/join_dmean_asc.pro

Timestamp:

02/18/14 11:03:22 (10 years ago)

Author:

pinsard

Message:

fix thanks to coding rules

File:

• trunk/src/join_dmean_asc.pro (modified) (4 diffs)

trunk/src/join_dmean_asc.pro

@@ -9 +9 @@
 ;    Join information from mean (++details) and asc (++detail) structures
 ;
-;    If station is not found in data_asc structure, latitude and longitude are set
-;    to NaN.
+;    If station is not found in data_asc structure, latitude and longitude
+;    are set to NaN.
 ;
 ;    :param data_dmean: structure ++details
@@ -25 +25 @@
 ; :examples:
 ;
-; Realistic example with POMME files::
+; Realistic example with POMME files:
 ;
-;    IDL> data_asc=file_asc_to_mem()
-;    IDL> data_prn=file_prn_to_mem()
-;    IDL> data_dmean=dmean_mld(data_prn)
-;    IDL> data_insitu=join_dmean_asc(data_dmean,data_asc)
+; .. code-block:: idl
 ;
-; impression de controle ::
+;    data_asc = file_asc_to_mem()
+;    data_prn = file_prn_to_mem()
+;    data_dmean = dmean_mld(data_prn)
+;    data_insitu = join_dmean_asc(data_dmean,data_asc)
 ;
-;    IDL> help, data_insitu, /structure
-;    IDL> print, data_insitu[0]
-;    IDL> print, data_insitu.lat
-;    IDL> print, data_insitu.lon
+; impression de controle :
+;
+; .. code-block:: idl
+;
+;    help, data_insitu, /structure
+;    print, data_insitu[0]
+;    print, data_insitu.lat
+;    print, data_insitu.lon
 ;
 ; :uses:
@@ -63 +67 @@
 ;
 ; check doy in prn files vs computed julianday
-; now (20101124) differences due to either bad calculation here or bad doy calculion in .prn file or difference choice between begin, end, middle time.
+; now (20101124) differences due to either bad calculation here or bad
+; doy calculion in .prn file or difference choice between begin, end,
+; middle time.
 ;
 ; :history:
@@ -90 +96 @@
 ;-
 FUNCTION join_dmean_asc, data_dmean, data_asc
-;
-compile_opt idl2, strictarrsubs
-;
-; Return to caller if errors
-ON_ERROR, 2
-;
-usage = 'result=join_dmean_asc(data_asc,data_dmean)'
-;
-nparam = N_PARAMS()
-IF (nparam LT 2) THEN BEGIN
-   ras = report(['Incorrect number of arguments.' $
-         + '!C' $
-         + 'Usage : ' + usage])
-   return, -1
-ENDIF
-;
-; initialize returned structure
-resultstruct = { doy : 0L $
-             , lat: 0.0 $
-             , lon: 0.0 $
-             , mean_zhom001: 0.0 $
-             , mean_zhom002 : 0.0 $
-             , mean_zhom005 : 0.0 $
-             , mean_zhom010: 0.0 $
-             , mean_zhomelch : 0.0 $
-             , std_zhom001: 0.0 $
-             , std_zhom002 : 0.0 $
-             , std_zhom005 : 0.0 $
-             , std_zhom010: 0.0 $
-             , std_zhomelch : 0.0 $
-             }
-;
-ndays = n_elements(data_dmean)
-result = replicate(resultstruct, ndays)
-;
-; fill returned structure
-FOR iday=0L, ndays -1 DO BEGIN
-   result[iday].doy=data_dmean[iday].doy
-   result[iday].mean_zhom001=data_dmean[iday].mean_zhom001
-   result[iday].mean_zhom002=data_dmean[iday].mean_zhom002
-   result[iday].mean_zhom005=data_dmean[iday].mean_zhom005
-   result[iday].mean_zhom010=data_dmean[iday].mean_zhom010
-   result[iday].mean_zhomelch=data_dmean[iday].mean_zhomelch
-   result[iday].std_zhom001=data_dmean[iday].std_zhom001
-   result[iday].std_zhom002=data_dmean[iday].std_zhom002
-   result[iday].std_zhom005=data_dmean[iday].std_zhom005
-   result[iday].std_zhom010=data_dmean[iday].std_zhom010
-   result[iday].std_zhomelch=data_dmean[iday].std_zhomelch
-   indice_asc=WHERE(data_asc.station EQ data_dmean[iday].first_station,count)
-   IF (count EQ 0) THEN BEGIN
-      print, 'no station ',  data_dmean[iday].first_station,' in data_asc.station'
-      result[iday].lat = !VALUES.F_NAN
-      result[iday].lon = !VALUES.F_NAN
-   ENDIF ELSE BEGIN
-      ;print, 'indice de la first_station', data_dmean[iday].first_station,' dans data_asc = ',indice_asc
-      result[iday].lat = data_asc[indice_asc[0]].lat
-      result[iday].lon = data_asc[indice_asc[0]].lon
-   ENDELSE
-ENDFOR
-;
-return, result
-;
+    ;
+    compile_opt idl2, strictarrsubs
+    ;
+    ; Return to caller if errors
+    ON_ERROR, 2
+    ;
+    usage = 'result = join_dmean_asc(data_asc,data_dmean)'
+    ;
+    nparam = N_PARAMS()
+    IF (nparam LT 2) THEN BEGIN
+        ras = report(['Incorrect number of arguments.' $
+        + '!C' $
+        + 'Usage : ' + usage])
+        return, -1
+    ENDIF
+    ;
+    ; initialize returned structure
+    resultstruct = { doy : 0L $
+    , lat: 0.0 $
+    , lon: 0.0 $
+    , mean_zhom001: 0.0 $
+    , mean_zhom002 : 0.0 $
+    , mean_zhom005 : 0.0 $
+    , mean_zhom010: 0.0 $
+    , mean_zhomelch : 0.0 $
+    , std_zhom001: 0.0 $
+    , std_zhom002 : 0.0 $
+    , std_zhom005 : 0.0 $
+    , std_zhom010: 0.0 $
+    , std_zhomelch : 0.0 $
+    }
+    ;
+    ndays = n_elements(data_dmean)
+    result = replicate(resultstruct, ndays)
+    ;
+    ; fill returned structure
+    FOR iday = 0L, ndays - 1 DO BEGIN
+        result[iday].doy = data_dmean[iday].doy
+        result[iday].mean_zhom001 = data_dmean[iday].mean_zhom001
+        result[iday].mean_zhom002 = data_dmean[iday].mean_zhom002
+        result[iday].mean_zhom005 = data_dmean[iday].mean_zhom005
+        result[iday].mean_zhom010 = data_dmean[iday].mean_zhom010
+        result[iday].mean_zhomelch = data_dmean[iday].mean_zhomelch
+        result[iday].std_zhom001 = data_dmean[iday].std_zhom001
+        result[iday].std_zhom002 = data_dmean[iday].std_zhom002
+        result[iday].std_zhom005 = data_dmean[iday].std_zhom005
+        result[iday].std_zhom010 = data_dmean[iday].std_zhom010
+        result[iday].std_zhomelch = data_dmean[iday].std_zhomelch
+        indice_asc = WHERE(data_asc.station EQ data_dmean[iday].first_station,count)
+        IF (count EQ 0) THEN BEGIN
+            print, 'no station ',  data_dmean[iday].first_station,' in data_asc.station'
+            result[iday].lat = !VALUES.F_NAN
+            result[iday].lon = !VALUES.F_NAN
+        ENDIF ELSE BEGIN
+            ;print, 'indice de la first_station', data_dmean[iday].first_station,' dans data_asc = ',indice_asc
+            result[iday].lat = data_asc[indice_asc[0]].lat
+            result[iday].lon = data_asc[indice_asc[0]].lon
+        ENDELSE
+    ENDFOR
+    ;
+    return, result
+    ;
 END