Changeset 10093

Timestamp:

2018-09-06T12:35:27+02:00 (6 years ago)

Author:

clem

Message:

just cosmetics for a better understanding of the namelist parameters

Location:

utils/tools/NESTING

Files:

• namelist_nordic1 (modified) (1 diff)
• namelist_nordic1_update (modified) (1 diff)
• namelist_nordic2 (modified) (1 diff)
• src/agrif_create_bathy.f90 (modified) (4 diffs)
• src/agrif_create_restart.f90 (modified) (2 diffs)
• src/agrif_create_restart_trc.f90 (modified) (2 diffs)
• src/agrif_interpolation.f90 (modified) (2 diffs)
• src/agrif_readwrite.f90 (modified) (2 diffs)
• src/agrif_types.f90 (modified) (2 diffs)

utils/tools/NESTING/namelist_nordic1

@@ -5 +5 @@
 &coarse_grid_files    
     parent_coordinate_file = 'coordinates.nc'
-    parent_meshmask_file   = 'meshmask.nc'  
+    parent_bathy_file      = 'meshmask.nc'  
     parent_domcfg_output   = 'domain_cfg.nc'
 /    

utils/tools/NESTING/namelist_nordic1_update

@@ -5 +5 @@
 &coarse_grid_files    
     parent_coordinate_file = 'coordinates.nc'
-    parent_meshmask_file   = 'meshmask.nc'  
+    parent_bathy_file      = 'meshmask.nc'  
     parent_domcfg_output   = 'domain_cfg.nc'
 /    

utils/tools/NESTING/namelist_nordic2

@@ -5 +5 @@
 &coarse_grid_files    
     parent_coordinate_file = '1_coordinates.nc'
-    parent_meshmask_file   = '1_meshmask.nc'
+    parent_bathy_file      = '1_meshmask.nc'
     parent_domcfg_output   = '1_domain_cfg.nc'
 /    

utils/tools/NESTING/src/agrif_create_bathy.f90

@@ -72 +72 @@
   ! define names of child grid files
   CALL set_child_name(parent_coordinate_file,Child_coordinates) 
-  IF( TRIM(parent_meshmask_file) .NE. '/NULL' )    CALL set_child_name(parent_meshmask_file,Childlevel_file)            
-  IF( TRIM(parent_meshmask_file) .NE. '/NULL' )    CALL set_child_name(parent_domcfg_output,Child_domcfg) 
+  IF( TRIM(parent_bathy_file) .NE. '/NULL' )    CALL set_child_name(parent_bathy_file,Childlevel_file)            
+  IF( TRIM(parent_bathy_file) .NE. '/NULL' )    CALL set_child_name(parent_domcfg_output,Child_domcfg) 
   !
   !                                                   ! ------------------------------------------------------------------
@@ -83 +83 @@
      ! read coarse grid bathymetry and coordinates
      status = Read_Coordinates(TRIM(parent_coordinate_file),G0)    
-     status = Read_bathy_level(TRIM(parent_meshmask_file),G0)
+     status = Read_bathy_level(TRIM(parent_bathy_file),G0)
      !           
      ! read fine grid coordinates
@@ -411 +411 @@
         status = Read_Bathymeter(TRIM(parent_bathy_meter),G0)
      ELSE
-        status = Read_Bathymeter(TRIM(parent_meshmask_file),G0)
+        status = Read_Bathymeter(TRIM(parent_bathy_file),G0)
      ENDIF
      
@@ -605 +605 @@
         ! store interpolation result in output file
         CALL levels_to_meter(G1)   ! From levels to meters
-        IF( TRIM(parent_meshmask_file) .NE. '/NULL' )    status = Write_Bathy_level(TRIM(Childlevel_file),G1)
-        IF( TRIM(parent_meshmask_file) .NE. '/NULL' )    status = write_domcfg(TRIM(Child_domcfg),G1)
+        IF( TRIM(parent_bathy_file) .NE. '/NULL' )    status = Write_Bathy_level(TRIM(Childlevel_file),G1)
+        IF( TRIM(parent_bathy_file) .NE. '/NULL' )    status = write_domcfg(TRIM(Child_domcfg),G1)
         !
         WRITE(*,*) '****** Bathymetry successfully created for partial cells ******'

utils/tools/NESTING/src/agrif_create_restart.f90

@@ -113 +113 @@
   !       
   CALL set_child_name(parent_coordinate_file,Childcoordinates)   
-  CALL set_child_name(parent_meshmask_file,Childbathy) 
+  CALL set_child_name(parent_bathy_file,Childbathy) 
   CALL set_child_name(parent_bathy_meter,Childbathymeter)   
   !
@@ -165 +165 @@
   ENDIF
   !
-  CALL Init_mask(parent_meshmask_file,G0,x,y)
+  CALL Init_mask(parent_bathy_file,G0,x,y)
   CALL Init_mask(childbathy,G1,1,1)
 

utils/tools/NESTING/src/agrif_create_restart_trc.f90

@@ -100 +100 @@
   !       
   CALL set_child_name(parent_coordinate_file,Childcoordinates)   
-  CALL set_child_name(parent_meshmask_file,Childbathy) 
+  CALL set_child_name(parent_bathy_file,Childbathy) 
   CALL set_child_name(parent_bathy_meter,Childbathymeter)   
   !
@@ -142 +142 @@
   ENDIF
   !
-  CALL Init_tmask(parent_meshmask_file,G0,x,y)
+  CALL Init_tmask(parent_bathy_file,G0,x,y)
   CALL Init_tmask(childbathy,G1,nxfin,nyfin)
   

utils/tools/NESTING/src/agrif_interpolation.f90

@@ -560 +560 @@
     CALL set_child_name(filename,Child_file) 
     CALL set_child_name(parent_coordinate_file,Childcoordinates)
-    CALL set_child_name(parent_meshmask_file,childbathy)
+    CALL set_child_name(parent_bathy_file,childbathy)
     WRITE(*,*) 'Child grid file name = ',TRIM(Child_file)
     !
@@ -602 +602 @@
        ALLOCATE(mask(numlon,numlat,N))
        CALL Init_mask(childbathy,G1,1,1)
-       CALL Init_mask(parent_meshmask_file,G0,1,1)
+       CALL Init_mask(parent_bathy_file,G0,1,1)
        !
     ENDIF

utils/tools/NESTING/src/agrif_readwrite.f90

@@ -243 +243 @@
     CALL write_ncdf_var('mbathy' ,dimnames,name,Grid%bathy_level,'float')
     !
-    CALL copy_ncdf_att('nav_lon',TRIM(parent_meshmask_file),name,MINVAL(Grid%nav_lon),MAXVAL(Grid%nav_lon))
-    CALL copy_ncdf_att('nav_lat',TRIM(parent_meshmask_file),name,MINVAL(Grid%nav_lat),MAXVAL(Grid%nav_lat))
-    CALL copy_ncdf_att('mbathy' ,TRIM(parent_meshmask_file),name)       
+    CALL copy_ncdf_att('nav_lon',TRIM(parent_bathy_file),name,MINVAL(Grid%nav_lon),MAXVAL(Grid%nav_lon))
+    CALL copy_ncdf_att('nav_lat',TRIM(parent_bathy_file),name,MINVAL(Grid%nav_lat),MAXVAL(Grid%nav_lat))
+    CALL copy_ncdf_att('mbathy' ,TRIM(parent_bathy_file),name)       
     !
     WRITE(*,*) ' '
-    WRITE(*,*) 'Writing bathymetry file: ',name
+    WRITE(*,*) 'Writing bathymetry (levels) in: ',name
     WRITE(*,*) ' '
     !
@@ -473 +473 @@
     !
     WRITE(*,*) ' '
-    WRITE(*,*) 'Writing bathymetry file: ',name
+    WRITE(*,*) 'Writing bathymetry (meters) in: ',name
     WRITE(*,*) ' '
     !

utils/tools/NESTING/src/agrif_types.f90

@@ -59 +59 @@
   LOGICAL ::   ln_agrif_domain
   !       
-  CHARACTER*100 ::   parent_meshmask_file, elevation_database, parent_bathy_meter, parent_domcfg_output
+  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
@@ -69 +69 @@
   NAMELIST /input_output/iom_activated
   !
-  NAMELIST /coarse_grid_files/parent_coordinate_file, parent_meshmask_file, parent_domcfg_output
+  NAMELIST /coarse_grid_files/parent_coordinate_file, parent_bathy_file, parent_domcfg_output
   !      
   NAMELIST /bathymetry/new_topo, elevation_database, elevation_name, smoothing, smoothing_factor,  &