Changeset 10383 for utils/tools/NESTING/src/agrif_extrapolation.f90

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

File:

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

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
     !