Changeset 36 for trunk

Timestamp:

11/26/07 18:05:07 (16 years ago)

Author:

pinsard

Message:

add a KML file to see Argentine Bassin coordinates

Location:

trunk

Files:

• argentin_bassin.kml (added)
• condmag_output.pro (modified) (6 diffs)
• forcagequimarche.pro (modified) (9 diffs)
• initocemeshmask.pro (modified) (3 diffs)

trunk/condmag_output.pro

@@ -18 +18 @@
 ;
 ; @param title {in}{required}{type=string}
-; title must belong_name  'Conductance' or 'Magnetic_field' ++
+; title must belong_name 'Conductance' or 'Magnetic_field' ++
 ;
 ; @param long_name {in}{required}{type=string}
@@ -30 +30 @@
 ; must be greater than 1
 ;
-; @param jpjo  {in}{required}{type=integer}
+; @param jpjo {in}{required}{type=integer}
 ; y dimension of the 3d array to be written
 ; must be greater than 1
@@ -66 +66 @@
 ; @examples
 ; IDL> .run condmag_on_orca
-; IDL> condmag_output, 'ORCA2', 'cond_sed','Conductance','Conductance','siemens',jpio,jpjo,olon,olat, values
+; IDL> condmag_output, 'ORCA2', 'cond_sed', 'Conductance', 'Conductance', 'siemens', jpio, jpjo, olon, olat, values
 ;
 ; @history
@@ -78 +78 @@
 ;
 ;-
-PRO condmag_output, orcares, variable, title, long_name, units, jpio, jpjo, olon,olat,values
+PRO condmag_output, orcares, variable, title, long_name, units, jpio, jpjo, olon, olat, values
 ;
   compile_opt idl2, strictarrsubs
@@ -205 +205 @@
 ;
 ; check jpio
-  IF jpio LT 1 THEN BEGIN
+  IF (jpio LT 1) THEN BEGIN
      msg = ' eee : invalid jpio parameter = ' + STRING(jpio)
      ras = report(msg)
@@ -217 +217 @@
 ;
 ; check jpjo
-  IF jpjo LT 1 THEN BEGIN
+  IF (jpjo LT 1) THEN BEGIN
      msg = ' eee : invalid jpjo parameter = ' + STRING(jpjo)
      ras = report(msg)

trunk/forcagequimarche.pro

@@ -27 +27 @@
 ;
 ; @todo
-; validation of ORCA2 processing (now some nan in output files !)
+; validation of ORCA2 processing (now some NaN in output files !)
 ; add ORCA025
 ; provide tools to plot output files
@@ -47 +47 @@
 ;
 ; @history
+; fplod 2007-09-19T15:41:28Z aedon.locean-ipsl.upmc.fr (Darwin)
+; externalisation of outputs see <progeomag>forcage_output</progeomag> ++
 ; fplod 2007-07-30T10:12:38Z aedon.locean-ipsl.upmc.fr (Darwin)
 ; restore divfred call instead of div ("official" saxo divergence module)
@@ -64 +66 @@
 ;-
 ;
-PRO forcagequimarche,orcares,iyear,ian,DRAKKAR_EXP = drakkar_exp
+PRO forcagequimarche, orcares, iyear, ian, DRAKKAR_EXP = drakkar_exp
 ;
 ;----
@@ -159 +161 @@
   file_V=e_exp+'_5d_'+ian+'0101_'+ian+'1231_grid_V.nc'
   file_T=e_exp+'_5d_'+ian+'0101_'+ian+'1231_grid_T.nc'
-  file_Sed= geomag_id_env+'cond_sed_ORCA2.nc'
-  file_Br= geomag_id_env+'Br_ORCA2.nc'
+jpt = 73 ;time counter des fichiers ci-dessus
      END
   ENDCASE
+  file_Sed= geomag_id_env+'cond_sed_'+orcares+'.nc'
+  file_Br= geomag_id_env+'Br_'+orcares + '.nc'
 ;
 ; title
@@ -169 +172 @@
 ioORLN2 = geomag_id_env
 ;
-;facteur d'echelle vertical  for partial steps
+;facteur d'echelle vertical for partial steps
 e3v3d=read_ncdf('e3v_ps',0,/timestep,iodir=ioORLN2,/nostruct,/tout,filename='meshmask_bab.nc')
 e3u3d=read_ncdf('e3u_ps',0,/timestep,iodir=ioORLN2,/nostruct,/tout,filename='meshmask_bab.nc')
@@ -185 +188 @@
           endfor                      &$
         endfor
-jpt = 73
 ;
 ;vud = make_array(jpi,jpj,jpt)
 ;vvd = make_array(jpi, jpj, jpt)
 divBustar = make_array(jpi, jpj, jpt)
-diver3=replicate(0.,182,149,1,73)
-sigma3=replicate(0.,182,149,1,73)
+diver3=replicate(0.,182,149,1,jpt)
+sigma3=replicate(0.,182,149,1,jpt)
 ;
 FOR jt = 0, jpt-1 DO BEGIN &$
@@ -233 +235 @@
   Bu_star= BR_u*u_cond_u/SIGMA_u
   Bv_star= BR_v*v_cond_v/SIGMA_v
+
+; Transport horizontal
+  T_u=total( vu*e3u3d*umask(),3)
+  T_v=total( vv*e3v3d*vmask(),3)
+
 ;
 ; Divergence du champ
@@ -314 +321 @@
 
 ; Creation de la longitude
+
+print,glamt[0:20,0]    ; ++ debug pb nav_lon
+print,glamt[30:50,0]
+print,glamt[50:70,0]
+
    NCDF_VARPUT, idout, id0, glamt
 ; Creation de la latitude
@@ -330 +342 @@
 
    NCDF_CLOSE, idout
+; ++ l'équivalent avec forcage_output
+forcage_output, orcares, variable, 'Divergence', long_name, jpiglo, jpjglo, gphit, glamt,diver3
+
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;;;meme topo pour SIGMA

trunk/initocemeshmask.pro

@@ -1 @@
-; +
+;+
 ;
 ; @file_comments
@@ -30 +30 @@
 ; IDL> myfile=getenv('GEOMAG_OD') + 'cond_sed_ORCA025.nc'
 ; IDL> xxx, myfile, 'initocemeshmask', '''ORCA025''',DRAKKAR_EXP='G42',format='(i5)'
-
 ; @history
 ; reee522 2007-06-08T15:35:17Z rhodes (IRIX64)
@@ -212 +211 @@
 ;
 key_stride = [1, 1, 1]
-ncdf_meshlec, fullfilename_oce[0], glamboundary = [20, 380], _extra = ex
+;++ncdf_meshlec, fullfilename_oce[0], glamboundary = [20, 380], _EXTRA = ex
+ncdf_meshlec, fullfilename_oce[0], GLAMBOUNDARY = [80, 380], _EXTRa = ex
 ;-------------------------------------------------------------
 domdef