Changeset 4146

Timestamp:

11/22/18 11:21:17 (5 years ago)

Author:

omamce

Message:

O.M. : small corrections on diagnostics only

Location:

TOOLS/MOSAIX

Files:

• CalvingWeights.py (modified) (2 diffs)
• CreateWeightsMask.bash (modified) (8 diffs)

TOOLS/MOSAIX/CalvingWeights.py

@@ -271 +271 @@
 
 src_grid_size    = f_calving.createDimension ('src_grid_size'   , src_grid_size )
-src_grid_corners = f_calving.createDimension ('src_grid_corners',        6  )
+src_grid_corners = f_calving.createDimension ('src_grid_corners', src_clo.shape[0]  )
 src_grid_rank    = f_calving.createDimension ('src_grid_rank'   ,        2  )
 
 dst_grid_size    = f_calving.createDimension ('dst_grid_size'   , dst_grid_size )
-dst_grid_corners = f_calving.createDimension ('dst_grid_corners',        4  )
+dst_grid_corners = f_calving.createDimension ('dst_grid_corners', dst_clo.shape[0] )
 dst_grid_rank    = f_calving.createDimension ('dst_grid_rank'   ,        2  )
 
@@ -336 +336 @@
 v_dst_lat_addressed = f_calving.createVariable ( 'dst_lat_addressed', 'f8', ('num_links',) )
 v_dst_lon_addressed.long_name="Longitude" ; v_dst_lon_addressed.standard_name="longitude" ; v_dst_lon_addressed.units="degrees_east"
-v_dst_lat_addressed.long_name="Latitude"  ; v_dst_lat_addressed.standard_name="latitude"  ; v_dst_lat_addressed.units="degrees_east"
+v_dst_lat_addressed.long_name="Latitude"  ; v_dst_lat_addressed.standard_name="latitude"  ; v_dst_lat_addressed.units="degrees_north"
 v_dst_lon_addressed [:] = dst_lon.ravel()[dst_address-1].ravel()
 v_dst_lat_addressed [:] = dst_lat.ravel()[dst_address-1].ravel()

TOOLS/MOSAIX/CreateWeightsMask.bash

@@ -57 +57 @@
 #OCE=ORCA025
 
-ATM=ICO30
+#ATM=ICO30
 #ATM=ICO40
 #ATM=ICO450
-#ATM=LMD9695
+ATM=LMD9695
 #ATM=LMD144X142
 
@@ -68 +68 @@
 ListOCEGRID="T" # U V
 ListOrder="1st" # 2nd
-ListNormalize="false" # true
-ListQuantity="false" # true
+ListNormalize="false true"
+ListQuantity="false true"
 
 ## ===========================================================================
@@ -114 +114 @@
 mkdir -p ${TMPDIR}/${OCE}x${ATM} || exit 1
 cd       ${TMPDIR}/${OCE}x${ATM} || exit 1
-rm -f *
+rm -fr *
 
 #
@@ -632 +632 @@
 EOF
 
-    [[ ${o_to_a} = true ]] && ncap2 --history --append --script-file add_varoce.nco ${OCE}_coordinates_mask_${FMT_OASIS}.nc ${rmpFile}
+    cp add_varoce.nco add_varoce_$(basename ${rmpFile} .nc)_o_to_a.nco
+    [[ ${o_to_a} = true ]] && ncap2 --history --append --script-file add_varoce_$(basename ${rmpFile} .nc)_o_to_a.nco ${OCE}_coordinates_mask_${FMT_OASIS}.nc ${rmpFile}
     sed --in-place "s/src_/dst_/g" add_varoce.nco
-    [[ ${a_to_o} = true ]] && ncap2 --history --append --script-file add_varoce.nco ${OCE}_coordinates_mask_${FMT_OASIS}.nc ${rmpFile}
+    cp add_varoce.nco add_varoce_$(basename ${rmpFile} .nc)_a_to_o.nco
+    [[ ${a_to_o} = true ]] && ncap2 --history --append --script-file add_varoce_$(basename ${rmpFile} .nc)_a_to_o.nco ${OCE}_coordinates_mask_${FMT_OASIS}.nc ${rmpFile}
                 
     if [[ ${atm} = ico ]] ; then
@@ -662 +664 @@
 dst_grid_frac  (:) = OceFrac(0,:) ;
 EOF
+        cp add_varatm.nco add_varatm_$(basename ${rmpFile} .nc)_o_to_a.nco
         if [[ ${o_to_a} = true ]] ; then
-            ncap2 --history --append --script-file add_varatm.nco ${ATM}_grid_maskFrom_${OCE}_${FMT_OASIS}.nc ${rmpFile}
+            ncap2 --history --append --script-file add_varatm_$(basename ${rmpFile} .nc)_o_to_a.nco ${ATM}_grid_maskFrom_${OCE}_${FMT_OASIS}.nc ${rmpFile}
             ncks --alphabetize --history --overwrite --variable src_address,dst_address,remap_matrix,src_grid_dims,src_grid_center_lat,src_grid_center_lon,src_grid_corner_lon,src_grid_corner_lat,src_grid_area,src_grid_imask,dst_grid_dims,dst_grid_center_lat,dst_grid_center_lon,dst_grid_corner_lon,dst_grid_corner_lat,dst_grid_area,dst_grid_imask ${rmpFile} rmp_tmp.nc
             mv rmp_tmp.nc ${rmpFile}
@@ -669 +672 @@
                     
         sed --in-place "s/dst_/src_/g" add_varatm.nco
+        cp add_varatm.nco add_varatm_$(basename ${rmpFile} .nc)_a_to_o.nco
         if [[ ${a_to_o} = true ]] ; then
-            ncap2 --history --append --script-file add_varatm.nco ${ATM}_grid_maskFrom_${OCE}_${FMT_OASIS}.nc ${rmpFile}
+            ncap2 --history --append --script-file add_varatm_$(basename ${rmpFile} .nc)_a_to_o.nco ${ATM}_grid_maskFrom_${OCE}_${FMT_OASIS}.nc ${rmpFile}
             ncks --alphabetize --history --overwrite --variable src_address,dst_address,remap_matrix,src_grid_dims,src_grid_center_lat,src_grid_center_lon,src_grid_corner_lon,src_grid_corner_lat,src_grid_area,src_grid_imask,dst_grid_dims,dst_grid_center_lat,dst_grid_center_lon,dst_grid_corner_lon,dst_grid_corner_lat,dst_grid_area,dst_grid_imask ${rmpFile} rmp_tmp.nc
             mv rmp_tmp.nc ${rmpFile}
@@ -704 +708 @@
 dst_grid_frac (:)  = OceFrac(0,:,:) ;
 EOF
+        cp add_varatm.nco add_varatm_$(basename ${rmpFile} .nc)_o_to_a.nco
         if [[ ${o_to_a} = true ]] ; then
-            ncap2 --history --append --script-file add_varatm.nco ${ATM}_grid_maskFrom_${OCE}_${FMT_OASIS}.nc ${rmpFile}
+            ncap2 --history --append --script-file add_varatm_$(basename ${rmpFile} .nc)_o_to_a.nco ${ATM}_grid_maskFrom_${OCE}_${FMT_OASIS}.nc ${rmpFile}
             ncks --alphabetize --history --overwrite --variable src_address,dst_address,remap_matrix,src_grid_dims,src_grid_center_lat,src_grid_center_lon,src_grid_corner_lon,src_grid_corner_lat,src_grid_area,src_grid_imask,dst_grid_dims,dst_grid_center_lat,dst_grid_center_lon,dst_grid_area,dst_grid_imask ${rmpFile} rmp_tmp.nc
             mv rmp_tmp.nc ${rmpFile}
@@ -711 +716 @@
         
         sed --in-place "s/dst/src/g" add_varatm.nco
+        cp add_varatm.nco add_varatm_$(basename ${rmpFile} .nc)_a_to_o.nco
         if [[ ${a_to_o} = true ]] ; then
-            ncap2 --history --append --script-file add_varatm.nco ${ATM}_grid_maskFrom_${OCE}_${FMT_OASIS}.nc ${rmpFile}
+            ncap2 --history --append --script-file add_varatm_$(basename ${rmpFile} .nc)_a_to_o.nco ${ATM}_grid_maskFrom_${OCE}_${FMT_OASIS}.nc ${rmpFile}
             ncks --alphabetize --history --overwrite --variable src_address,dst_address,remap_matrix,src_grid_dims,src_grid_center_lat,src_grid_center_lon,src_grid_area,src_grid_imask,dst_grid_dims,dst_grid_center_lat,dst_grid_center_lon,dst_grid_corner_lon,dst_grid_corner_lat,dst_grid_area,dst_grid_imask ${rmpFile} rmp_tmp.nc
             mv rmp_tmp.nc ${rmpFile}