Changeset 10381 for utils/tools/NESTING/src/agrif_types.f90

Timestamp:

2018-12-11T21:00:08+01:00 (5 years ago)

Author:

clem

Message:

attempt to correct several bugs in the NESTING tools. With this version, domcfg.nc file should be written correctly and the partial steps should be taken into account.

File:

• utils/tools/NESTING/src/agrif_types.f90 (modified) (3 diffs)

utils/tools/NESTING/src/agrif_types.f90

@@ -59 +59 @@
   LOGICAL ::   ln_agrif_domain
   !       
-  CHARACTER*100 ::   parent_bathy_file, elevation_database, parent_bathy_meter, parent_domcfg_output
-  CHARACTER*100 ::   elevation_name, parent_batmet_name
-  CHARACTER*100 ::   parent_coordinate_file, restart_file, updated_parent_file, updated_parent_domcfg, restart_trc_file
+  CHARACTER*100 ::   parent_bathy_level, parent_level_name, parent_bathy_meter, parent_meter_name, parent_domcfg_out
+  CHARACTER*100 ::   elevation_name, elevation_database
+  CHARACTER*100 ::   parent_coordinate_file, restart_file, parent_bathy_meter_updated, parent_domcfg_updated, restart_trc_file
   CHARACTER*100 ::   dimg_output_file, interp_type
   !      
@@ -69 +69 @@
   NAMELIST /input_output/iom_activated
   !
-  NAMELIST /coarse_grid_files/parent_coordinate_file, parent_bathy_file, parent_domcfg_output
+  NAMELIST /coarse_grid_files/parent_coordinate_file, parent_bathy_level, parent_level_name, &
+     &                                                parent_bathy_meter, parent_meter_name, parent_domcfg_out
   !      
   NAMELIST /bathymetry/new_topo, elevation_database, elevation_name, smoothing, smoothing_factor,  &
                        ln_agrif_domain, npt_connect, npt_copy, removeclosedseas, type_bathy_interp, rn_hmin      
   !      
-  NAMELIST /nesting/nbghostcellsfine, imin, imax, jmin, jmax, rho, rhot, bathy_update, updated_parent_file, updated_parent_domcfg      
+  NAMELIST /nesting/nbghostcellsfine, imin, imax, jmin, jmax, rho, rhot, &
+     &              bathy_update, parent_bathy_meter_updated, parent_domcfg_updated      
   !
   NAMELIST /vertical_grid/ppkth, ppacr, ppdzmin, pphmax, psur, pa0, pa1, N, ldbletanh, ln_e3_dep, pa2, ppkth2, ppacr2
   ! 
-  NAMELIST /partial_cells/partial_steps, parent_bathy_meter, parent_batmet_name, e3zps_min, e3zps_rat      
+  NAMELIST /partial_cells/partial_steps, e3zps_min, e3zps_rat      
   !
   NAMELIST /nemo_coarse_grid/ jpizoom, jpjzoom 
@@ -136 +138 @@
     INTEGER unit_nml
     !      
-    FLX_FILES = '/NULL'
-    U_FILES = '/NULL'
-    V_FILES = '/NULL'
-    VAR_INTERP = 'NULL'
+    FLX_FILES  = ''
+    U_FILES    = ''
+    V_FILES    = ''
+    VAR_INTERP = ''
     unit_nml = Agrif_Get_Unit()
     !