Changeset 10 for trunk

Timestamp:

11/23/06 17:09:20 (17 years ago)

Author:

pinsard

Message:

passage sur rhodes et init adaptation ORCA025

Location:

trunk

Files:

• condmag_on_orca.pro (modified) (6 diffs)
• geomag_profile.sh (modified) (2 diffs)

trunk/condmag_on_orca.pro

@@ -10 +10 @@
 ; @param orcares {in}{required}{type=string}
 ; code of ORCA grid to use for output results
-; must be 'ORCA2'
+; must be 'ORCA2' or 'ORCA025'
 ;
 ; @param method {in}{required}{type=string}
@@ -20 +20 @@
 ; @param gridtype {in}{required}{type=string}
 ; to specify on which grid we do the interpolation T, U, V
-; must belong to T,U,V
+; must belong to T, U or V
 ;
 ; @restrictions
 ;  - Requires SAXO tools
 ;  - must have condmag.nc in ${GEOMAG_ID}/
-;  - must have meshmask in ${GEOMAG_ID}/
+;  - must have meshmask for ORCA2 or ORCA025 in ${GEOMAG_ID}/
 ;  - must not have cond_sed_*.nc in ${GEOMAG_OD}/
 ;  - must not have Br_*.nc in ${GEOMAG_OD}/
 ;
 ; @todo
-; add ORCA025
-; provide tools to plot output file
+; provide tools to plot output files
 ; produce a NetCDF GDT or CF compliant
 ;
@@ -37 +36 @@
 ; be sure to have datafile condmag.nc in the directory defined in
 ; ${GEOMAG_ID}/ see geomag_env.sh
-; be sure to have meshmask of ORCA grid you choos in the directory defined in
+; be sure to have meshmask of ORCA grid you choose in the directory defined in
 ; ${GEOMAG_ID}/
 ; for ORCA2 filename is meshmask_bab.nc
+; ++ au pif entre mesh_hgr, mesh_zgr et mask
+; for ORCA0252 filename is ORCA025-G42_mesh_hgr.nc 
 ;
 ; @post
@@ -51 +52 @@
 ;
 ; @history
+; reee522 2006-11-23T13:34:31Z rhodes (IRIX64)
+; add ORCA025 (beginning)
+; reee522 2006-11-23T13:28:07Z rhodes (IRIX64)
+; information about the opening of meshmask file was missing ... because
+; the open is hidden in the call of get_gridparam
 ; fplod 2006-11-23T08:57:10Z aedon.locean-ipsl.upmc.fr (Darwin)
 ; rename to condmag_on_orca.pro
@@ -92 +98 @@
                  filename_oce = 'meshmask_bab.nc'
               END
+     'ORCA025': BEGIN
+                 msg = 'iii : valid orcares parameter = ' +  orcares
+                 PRINT, msg
+                 filename_oce = orcares + '-G42_mesh_hgr.nc' 
+              END
       ELSE  : BEGIN
                  msg = 'eee : invalid orcares parameter = ' + orcares
                  PRINT, msg
-                 msg = 'eee : orcares must be ORCA2'
+                 msg = 'eee : orcares must be ORCA2 or ORCA025'
                  PRINT, msg
                  RETURN
@@ -271 +282 @@
      olonname, olatname, $
      olon, olat, jpio, jpjo, 2,/DOUBLE
+  msg = 'iii : ' + fullfilename_oce[0] + ' opened for read'
+  PRINT, msg
 ;
 ;---------------

trunk/geomag_profile.sh

@@ -18 +18 @@
 # ++ machine dependant
 # ++ besoin de posix
-# ++ doc
+# reee522 2006-11-23T11:41:41Z rhodes (IRIX64)
+# pas de set -o posix sur rhodes (IRIX64)
 # $Id$
 # fplod 2006-03-22T10:13:38Z aedon.lodyc.jussieu.fr (Darwin)
@@ -25 +26 @@
 #
 set -u
-set -o posix # ++ toutes les machines ne supportent pas forcément cette option
+system=$(uname)
+case ${system} in
+IRIX64)
+  echo " www : no specific posix checking"
+;;
+*)
+  set -o posix
+;;
+esac
 #
 command='geomag_profile.sh'
 #
-GEOMAG=/usr/home/fplod/incas/geomag/ # ++ machine dependant 
+GEOMAG=${HOME}/incas/geomag/ # ++  
 # test if $GEOMAG available
 if [ ! -d ${GEOMAG} ]