Changeset 98

Timestamp:

06/09/06 17:55:26 (18 years ago)

Author:

smasson

Message:

bugfix ncdf_meshread + comments in compute_fromreg_bilinear_weigaddr

Location:

trunk/SRC

Files:

• Documentation/xmldoc/savesaxo.sh (modified) (5 diffs)
• Grid/ncdf_meshread.pro (modified) (2 diffs)
• Interpolation/compute_fromreg_bilinear_weigaddr.pro (modified) (1 diff)

trunk/SRC/Documentation/xmldoc/savesaxo.sh

@@ -25 +25 @@
 doSRClodyc=0
 doDTAlodyc=0
-doSRCidris=0
-doDTAidris=0
+doSRCidris=1
+doDTAidris=1
 #
 #
@@ -179 +179 @@
 filesrc=$(echo ${infosrc} | awk '{print $NF}')
 filesrc=$( basename $filesrc )
+[ $doSRClodyc -eq 1 ] && rshell=bash || rshell=ksh
 #
     cat <<EOF > job_src_$$
-#!/bin/bash
+#!/bin/${rshell}
 cd SAXO_DIR
 #
@@ -187 +188 @@
 wget http://forge.ipsl.jussieu.fr/saxo/download/$filesrc
 gunzip $filesrc
-tar xf $( basename $filesrc .gz )
+tar vxf $( basename $filesrc .gz )
 rm -f $( basename $filesrc .gz )
 #
@@ -201 +202 @@
 filedata=$(echo ${infodata} | awk '{print $NF}')
 filedata=$(basename $filedata)
+[ $doDTAlodyc -eq 1 ] && rshell=bash || rshell=ksh
     cat <<EOF > job_data_$$
-#!/bin/bash
+#!/bin/${rshell}
 cd SAXO_DIR
 #
@@ -208 +210 @@
 wget http://forge.ipsl.jussieu.fr/saxo/download/$filedata
 gunzip $filedata
-tar xf $( basename $filedata .gz )
+tar vxf $( basename $filedata .gz )
 rm -f $( basename $filedata .gz )
 #

trunk/SRC/Grid/ncdf_meshread.pro

@@ -440 +440 @@
     ny = lasty-firsty+1
 @read_ncdf_varget
+    IF jpk EQ 1 THEN res = reform(res, jpi, 1, jpk, /over)
     vmaskred = transpose(temporary(res), [1, 0, 2])
     vmaskred = reform(binary(vmaskred), 8*ny, nx, nz, /over)
@@ -453 +454 @@
   IF micromask NE -1 THEN BEGIN
 @read_ncdf_varget
+    IF jpk EQ 1 THEN res = reform(res, jpi, 1, jpk, /over)
     fmaskredx = transpose(temporary(res), [1, 0, 2])
     fmaskredx = reform(binary(fmaskredx), 8*ny, nx, nz, /over)

trunk/SRC/Interpolation/compute_fromreg_bilinear_weigaddr.pro

@@ -11 +11 @@
 ;
 ; INPUTS:
-;     lonin and latin: longitude/latitude of the input data 
-;     lonout and latout: longitude/latitude of the output data 
+;     lonin and latin: longitude/latitude of the input data. Must be 1D arrays
+;     lonout and latout: longitude/latitude of the output data. Must be 2D arrays
 ;
 ; KEYWORD PARAMETERS: