Changeset 10383

Timestamp:

2018-12-12T19:52:17+01:00 (6 years ago)

Author:

clem

Message:

ice restart should work in the nesting tools now. However ocean restart has been broken for some time

Location:

utils/tools/NESTING

Files:

• namelist_nordic1 (modified) (1 diff)
• namelist_nordic1_update (modified) (1 diff)
• namelist_nordic2 (modified) (1 diff)
• src/agrif_create_restart_ice.f90 (added)
• src/agrif_extrapolation.f90 (modified) (3 diffs)
• src/agrif_readwrite.f90 (modified) (2 diffs)
• src/agrif_types.f90 (modified) (3 diffs)
• src/io_netcdf.f90 (modified) (1 diff)

utils/tools/NESTING/namelist_nordic1

@@ -99 +99 @@
     restart_trc_file = 'restart_trc.nc'   
 / 
+
+&restart_ice
+    restart_ice_file = 'restart_ice.nc'
+    interp_type = 'bilinear'
+/

utils/tools/NESTING/namelist_nordic1_update

@@ -100 +100 @@
     restart_trc_file = 'restart_trc.nc'   
 / 
+
+&restart_ice
+    restart_ice_file = 'restart_ice.nc'
+    interp_type = 'bilinear'
+/

utils/tools/NESTING/namelist_nordic2

@@ -100 +100 @@
     restart_trc_file = 'restart_trc.nc'   
 / 
+
+&restart_ice
+    restart_ice_file = 'restart_ice.nc'
+    interp_type = 'bilinear'
+/

utils/tools/NESTING/src/agrif_extrapolation.f90

@@ -43 +43 @@
        CALL get_detected_pts(G0%gphiu,G1%gphiu,G0%glamu,G1%glamu,   &
             G0%umask(:,:,n),G1%umask(:,:,n),detected(:,:))       
-    ELSE IF( PRESENT(posvar) .AND. posvar == 'V' ) THEN
-       !      
+    ELSEIF( PRESENT(posvar) .AND. posvar == 'V' ) THEN
        CALL get_detected_pts(G0%gphiv,G1%gphiv,G0%glamv,G1%glamv,   &
             G0%vmask(:,:,n),G1%vmask(:,:,n),detected(:,:))                                  
+    ELSEIF( PRESENT(posvar) .AND. posvar == 'F' ) THEN
+       CALL get_detected_pts(G0%gphif,G1%gphif,G0%glamf,G1%glamf,   &
+            G0%fmask(:,:,n),G1%fmask(:,:,n),detected(:,:))                                  
     ELSE
-       CALL get_detected_pts(G0%nav_lat,G1%nav_lat,G0%nav_lon,G1%nav_lon,   &
-            G0%tmask(:,:,n),G1%tmask(:,:,n),detected(:,:))        
+       CALL get_detected_pts(G0%gphit,G1%gphit,G0%glamt,G1%glamt,   &
+            G0%tmask(:,:,n),G1%tmask(:,:,n),detected(:,:))                                  
+!clem       CALL get_detected_pts(G0%nav_lat,G1%nav_lat,G0%nav_lon,G1%nav_lon,   &
+!clem            G0%tmask(:,:,n),G1%tmask(:,:,n),detected(:,:))        
     ENDIF
     !      
@@ -112 +116 @@
        lat = G0%gphiv 
        lon = G0%glamv
+    ELSE IF ( PRESENT(posvar) .AND. posvar == 'F' ) THEN
+       WHERE(G0%fmask(:,:,k) == 1. )
+          newmask(:,:) = .TRUE.
+       ELSEWHERE
+          newmask(:,:) = .FALSE.
+       END WHERE
+       ALLOCATE(mask(SIZE(G0%fmask,1),SIZE(G0%fmask,2),SIZE(G0%fmask,3)))
+       ALLOCATE(lat(SIZE(G0%fmask,1),SIZE(G0%fmask,2)))
+       ALLOCATE(lon(SIZE(G0%fmask,1),SIZE(G0%fmask,2)))
+       mask = G0%fmask        
+       lat = G0%gphif 
+       lon = G0%glamf
     ELSE      
        WHERE(G0%tmask(:,:,k) == 1. )
@@ -121 +137 @@
        ALLOCATE(lat(SIZE(G0%tmask,1),SIZE(G0%tmask,2)))
        ALLOCATE(lon(SIZE(G0%tmask,1),SIZE(G0%tmask,2)))
-       mask = G0%tmask
-       lon = G0%nav_lon
-       lat = G0%nav_lat
+       mask = G0%tmask        
+       lat = G0%gphit 
+       lon = G0%glamt
+!clem       mask = G0%tmask
+!clem       lon = G0%nav_lon
+!clem       lat = G0%nav_lat
     ENDIF
     !

utils/tools/NESTING/src/agrif_readwrite.f90

@@ -1223 +1223 @@
     WRITE(*,*) 'Init masks in T points'    
     !     
-    ALLOCATE(Grid%tmask(nx,ny,N))
+    ALLOCATE( Grid%tmask(nx,ny,N) )
     !
     DO k = 1,N
@@ -1236 +1236 @@
     !      
   END SUBROUTINE Init_Tmask
+  !
+  !*****************************************************
+  !   subroutine Init_ssmask(name,Grid)
+  !*****************************************************
+  !
+!  SUBROUTINE Init_ssmask(varname,filename,Grid,jpiglo,jpjglo)
+!    !
+!    USE io_netcdf
+!    !      
+!    CHARACTER(*) varname,filename
+!    INTEGER :: nx,ny,k,i,j,jpiglo,jpjglo
+!    TYPE(Coordinates) :: Grid
+!    REAL*8, POINTER, DIMENSION(:,:) ::zwf => NULL()
+!    !
+!    IF(jpiglo == 1 .AND. jpjglo == 1) THEN
+!       CALL read_ncdf_var(varname,filename,Grid%bathy_level)
+!    ELSE
+!       CALL read_ncdf_var(varname,filename,Grid%bathy_level,(/jpizoom,jpjzoom/),(/jpiglo,jpjglo/) )
+!    ENDIF
+!    !
+!    nx = SIZE(Grid%bathy_level,1)
+!    ny = SIZE(Grid%bathy_level,2) 
+!    !
+!    WRITE(*,*) 'Init surface masks in T points'    
+!    !     
+!    ALLOCATE( Grid%ssmask(nx,ny), Grid%ssumask(nx,ny), Grid%ssvmask(nx,ny) )
+!    !
+!    WHERE(Grid%bathy_level(:,:) <= 0. )    
+!       Grid%ssmask(:,:) = 0.
+!    ELSEWHERE
+!       Grid%ssmask(:,:) = 1.
+!    END WHERE
+!    !
+!    Grid%ssumask(1:nx-1,:) = Grid%ssmask(1:nx-1,:)*Grid%ssmask(2:nx,:)
+!    Grid%ssvmask(:,1:ny-1) = Grid%ssmask(:,1:ny-1)*Grid%ssmask(:,2:ny)
+!    !
+!    Grid%ssumask(nx,:) = Grid%ssmask(nx,:)
+!    Grid%ssvmask(:,ny) = Grid%ssmask(:,ny)
+!    !      
+!  END SUBROUTINE Init_ssmask
   !
   !*****************************************************

utils/tools/NESTING/src/agrif_types.f90

@@ -61 +61 @@
   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 ::   parent_coordinate_file, parent_bathy_meter_updated, parent_domcfg_updated, &
+     &               restart_file, restart_trc_file, restart_ice_file
   CHARACTER*100 ::   dimg_output_file, interp_type
   !      
@@ -89 +90 @@
   !      
   NAMELIST /restart/ restart_file, shlat, dimg, dimg_output_file, adatrj, interp_type 
-
+  !
   NAMELIST /restart_trc/ restart_trc_file, interp_type 
+  !
+  NAMELIST /restart_ice/ restart_ice_file, interp_type 
   !
 CONTAINS
@@ -167 +170 @@
        READ (unit_nml , NML = restart )
        READ (unit_nml , NML = restart_trc )
+       READ (unit_nml , NML = restart_ice )
        CLOSE(unit_nml)
        ! 

utils/tools/NESTING/src/io_netcdf.f90

@@ -291 +291 @@
     status=nf90_inquire_dimension(ncid,dimIDS(2),len=dim2)  
     status=nf90_inquire_dimension(ncid,dimIDS(3),len=dim3)
-    !                
+    !    
     IF(.NOT. ASSOCIATED(tabvar)) THEN
        ALLOCATE(tabvar(dim1,dim2,dim3))