Changeset 6327 for TOOLS

Timestamp:

02/22/23 10:02:51 (14 months ago)

Author:

snguyen

Message:

Fix broken code in CreateRestartAtm4Oasis.bash and create_flxat.py for regular lon lat grids. Now works for files in both lonlat regular grid and ICO unstructured grid.

Location:

TOOLS/CPLRESTART

Files:

• CreateRestartAtm4Oasis.bash (modified) (2 diffs)
• create_flxat.py (modified) (4 diffs)

TOOLS/CPLRESTART/CreateRestartAtm4Oasis.bash

@@ -63 +63 @@
     module load hdf5
     module load netcdf-c
-    module load nco
-    module load cdo
-    module load python3
+    module load nco/4.9.1
+    module load cdo/1.9.5
+    module load python3/3.7.2
     module load datadir/igcmg
     module list
@@ -182 +182 @@
 python3 create_flxat.py --IsUnstructured=${IsUnstructured} --input flxat_fields_notime.nc --output tmp_flxat.nc
 
-[[ ${IsUnstructured} = yes ]] && ncks --fl_fmt=${FL_FMT} --history --append --variable bounds_lon,bounds_lat flxat.nc  tmp_flxat.nc 
+#this is not needed anymore since bounds are included in flxat.py if they exist
+#[[ ${IsUnstructured} = yes ]] && ncks --fl_fmt=${FL_FMT} --history --append --variable bounds_lon,bounds_lat tmp_flxat.nc
 ncks --fl_fmt=${FL_FMT} --append --history --variable COTAUXXU,COTAUYYU,COTAUZZU,COTAUXXV,COTAUYYV,COTAUZZV,COTOTRAI,COTOTSNO,COTOTEVA,COICEVAP,COQSRMIX,COQNSMIX,COSHFICE,CONSFICE,CODFLXDT,COCALVIN,COLIQRUN,COWINDSP,COTAUMOD tmp_flxat.nc flxat.nc
 

TOOLS/CPLRESTART/create_flxat.py

@@ -179 +179 @@
 COTAUXXV = COTAUXXU ; COTAUYYV = COTAUYYU ; COTAUZZV = COTAUZZU
 
+## check if bounds for lon lat are present and add them to dataset or drop them
+ifbnds=True if ('bounds_lon' in d_In.data_vars) and ('bounds_lat' in d_In.data_vars) else False
 
 ## Creates final Dataset
@@ -185 +187 @@
 lon.attrs['long_name'] = 'Longitude'
 lon.attrs['units']     = 'degrees_east'
-lon.attrs['bounds']    = 'bounds_lon'
+if ifbnds: lon.attrs['bounds']    = 'bounds_lon'
 
 lat = xr.DataArray (lat, dims=('y', 'x'))
@@ -191 +193 @@
 lat.attrs['long_name'] = 'Latitude'
 lat.attrs['units']     = 'degrees_north'
-lat.attrs['bounds']    = 'bounds_lat'
-
-bounds_lon = d_In.bounds_lon.values.astype (np.float64)
-bounds_lat = d_In.bounds_lat.values.astype (np.float64)
-nvertex = bounds_lon.shape[-1]
-
-bounds_lon = xr.DataArray ( np.reshape (bounds_lon, (ny,nx,nvertex)), dims=('y', 'x', 'nvertex'))
-bounds_lat = xr.DataArray ( np.reshape (bounds_lat, (ny,nx,nvertex)), dims=('y', 'x', 'nvertex'))
-
-bounds_lon.attrs['units'] = 'degrees_east'
-bounds_lat.attrs['units'] = 'degrees_north'
-
-d_Out = xr.Dataset ( {'lat':lat, 'lon':lon, 'bounds_lon':bounds_lon, 'bounds_lat':bounds_lat, 
-    'COTOTRAI':COTOTRAI,
+if ifbnds: lat.attrs['bounds']    = 'bounds_lat'
+
+if ifbnds: 
+    bounds_lon = d_In.bounds_lon.values.astype (np.float64)
+    bounds_lat = d_In.bounds_lat.values.astype (np.float64)
+    nvertex = bounds_lon.shape[-1]
+
+    bounds_lon = xr.DataArray ( np.reshape (bounds_lon, (ny,nx,nvertex)), dims=('y', 'x', 'nvertex'))
+    bounds_lat = xr.DataArray ( np.reshape (bounds_lat, (ny,nx,nvertex)), dims=('y', 'x', 'nvertex'))
+
+    bounds_lon.attrs['units'] = 'degrees_east'
+    bounds_lat.attrs['units'] = 'degrees_north'
+
+# prepare dictionnary to export dataset to netcdf file with or without bounds
+dictdataset = {'lat':lat, 'lon':lon }
+if ifbnds: dictdataset.update({'bounds_lon':bounds_lon, 'bounds_lat':bounds_lat})
+dictdataset.update({'COTOTRAI':COTOTRAI,
     'COTOTSNO':COTOTSNO,
     'COTOTEVA':COTOTEVA,
@@ -224 +229 @@
     'COTAUZZV':COTAUZZV } )
 
+d_Out = xr.Dataset (dictdataset)
+
 d_Out.attrs['Associated files'] = myargs.input
 d_Out.attrs['Conventions']     = "CF-1.6"