Changeset 100 for trunk/procs/meshes

Timestamp:

05/08/08 22:10:27 (16 years ago)

Author:

ericg

Message:

Update of mesh_from_file and mesh_orca following merge with r86 (new nc_read)

Location:

trunk/procs/meshes

Files:

• mesh_from_file.pro (modified) (5 diffs)
• mesh_orca.pro (modified) (1 diff)

trunk/procs/meshes/mesh_from_file.pro

@@ -1 @@
-PRO mesh_from_file, model, file_name, ncdf_db, var_name
+PRO mesh_from_file, model, file_name, ncdf_db, var_name, ALL_DATA = all_data
 @common
 @com_eg
@@ -7 +7 @@
 ;
    IF debug_w THEN print, '  ENTER mesh_from_file...'
+   IF debug_w AND keyword_set(all_data)  THEN print, '        All_data = ', all_data 
 
    IF strpos(ncdf_db, ':') GE 1 THEN directory = (strsplit(ncdf_db, ':', /EXTRACT))[1] $
@@ -15 +16 @@
    print,'    Model inits for ', model, ' from file: ', s_file
 
-;   sm_file = hom_idl+'grids/grids_'+model+'.nc' 
-;   res = find(sm_file)
+   sm_file = hom_idl+'grids/grids_'+model+'.nc' 
+   res = find(sm_file)
    varexpp = varexp
-;   IF res NE 'NOT FOUND' THEN BEGIN 
-;
-;      initncdf, s_file, GLAMBOUNDARY = glamboundary_box
-;
-;      print, '    Found mask from ',sm_file 
-;
-;      tmask = byte(read_ncdf('sftlf', 0, 0, /timestep, file = sm_file, /nostruct))
-;      
-;      idx = where(tmask EQ valmask)
-;
-;      IF idx(0) NE -1 THEN tmask(idx) = 0.
-;      idx =  where(tmask LE 50.)
-;      tmask(idx) = 0.
-;      tmask =  tmask < 1
-;      tmask =  1-tmask
-;      triangles=triangule()
-;
-;   ENDIF ELSE BEGIN 
+   IF res NE 'NOT FOUND' THEN BEGIN 
+
+      IF keyword_set(ALL_DATA) THEN BEGIN 
+         initncdf, s_file, GLAMBOUNDARY = glamboundary_box, PLAIN = 1
+      ENDIF ELSE initncdf, s_file, GLAMBOUNDARY = glamboundary_box
+
+      print, '    Found mask from ',sm_file 
+
+      tmask = byte(read_ncdf('sftlf', 0, 0, /timestep, file = sm_file, /nostruct))
+      
+      idx = where(tmask EQ valmask)
+
+      IF idx(0) NE -1 THEN tmask(idx) = 0.
+      idx =  where(tmask LE 50.)
+      tmask(idx) = 0.
+      tmask =  tmask < 1
+      tmask =  1-tmask
+      triangles=triangule()
+
+   ENDIF ELSE BEGIN 
       CASE var_name OF
-         '@@voenergy': var_local = 'so'
+         '@@voenergy': BEGIN 
+            CASE cmd1_back.grid OF
+               'T': var_local = 'votemper'
+               'T05': var_local = 'votemper'
+               'T05#': var_local = 'votemper'
+               ELSE: var_local = 'so'
+            ENDCASE 
+            END 
          ELSE: var_local = var_read_grd_file
       ENDCASE 
@@ -63 +73 @@
       ; build grid
       CASE mesh_type of
-         'atm': BEGIN
-            ;;initncdf, s_file, USEASMASK = var_local, missing_value = valmask, GLAMBOUNDARY = glamboundary_box, ZAXISNAME = name_level
-            initncdf, s_file, GLAMBOUNDARY = glamboundary_box, ZAXISNAME = name_level
-         END
-         ELSE: initncdf, s_file, USEASMASK = var_local, missing_value = valmask, GLAMBOUNDARY = glamboundary_box, ZAXISNAME = 'depth'
+         'atm':  BEGIN 
+            IF keyword_set(ALL_DATA) THEN BEGIN 
+               initncdf, s_file, GLAMBOUNDARY = glamboundary_box, ZAXISNAME = name_level, PLAIN = 1
+            ENDIF ELSE initncdf, s_file, GLAMBOUNDARY = glamboundary_box, ZAXISNAME = name_level 
+         END 
+         ELSE: BEGIN 
+            IF keyword_set(ALL_DATA) THEN BEGIN 
+               initncdf, s_file, USEASMASK = var_local, missing_value = valmask, GLAMBOUNDARY = glamboundary_box, ZAXISNAME = 'depth', PLAIN = 1
+            ENDIF ELSE initncdf, s_file, USEASMASK = var_local, missing_value = valmask, GLAMBOUNDARY = glamboundary_box, ZAXISNAME = 'depth'
+         END 
       ENDCASE 
       IF debug_w THEN print,  '     Grid info after initncdf :'
@@ -74 +89 @@
       IF debug_w THEN print,  '     gdept :', size(gdept)
       
-;   ENDELSE 
+   ENDELSE 
 
    varexp = varexpp

trunk/procs/meshes/mesh_orca.pro

@@ -4 +4 @@
 @com_eg
 ;
+
+   ; temporary
+
+   IF h_config EQ 'ORCA05' THEN v_config = 'L46'
+   IF h_config EQ 'ORCA_R2' THEN v_config = 'L30'
 
    IF NOT keyword_set(H_CONFIG) THEN h_config = 'ORCA_R2'