Changeset 1936 for XIOS/dev/dev_ym/XIOS_COUPLING/src/test

Timestamp:

09/17/20 18:30:19 (4 years ago)

Author:

ymipsl

Message:

XIOS coupling branch :
Blitz array resizeAndPreserve crash when size=0 => use resize instead

YM

File:

• XIOS/dev/dev_ym/XIOS_COUPLING/src/test/generic_testcase.f90 (modified) (3 diffs)

XIOS/dev/dev_ym/XIOS_COUPLING/src/test/generic_testcase.f90

@@ -34 +34 @@
     DOUBLE PRECISION    :: pressure_factor
     LOGICAL :: domain_mask
+    CHARACTER(len_str) :: domain_mask_type="cross"
     LOGICAL :: axis_mask
     LOGICAL :: mask3d
@@ -755 +756 @@
     IF (.NOT. xios_getvar(prefix//"domain", params%domain) )             params%domain="lmdz"
     IF (.NOT. xios_getvar(prefix//"domain_mask", params%domain_mask) )   params%domain_mask=.FALSE.
+    IF (.NOT. xios_getvar(prefix//"domain_mask_type", params%domain_mask_type) )   params%domain_mask_type="cross"
     IF (.NOT. xios_getvar(prefix//"axis", params%axis) )                 params%axis="pressure"
     IF (.NOT. xios_getvar(prefix//"axis_mask", params%axis_mask) )       params%axis_mask=.FALSE.
@@ -1939 +1941 @@
      mask(:)=.TRUE.
      IF (params%domain_mask) THEN
-       WHERE (lon(:)-2*lat(:)>-10 .AND. lon(:)-2*lat(:) <10) mask(:)=.FALSE. 
-       WHERE (2*lat(:)+lon(:)>-10 .AND. 2*lat(:)+lon(:)<10) mask(:)=.FALSE. 
+       IF (params%domain_mask_type=="cross") THEN
+         WHERE (lon(:)-2*lat(:)>-10 .AND. lon(:)-2*lat(:) <10) mask(:)=.FALSE. 
+         WHERE (2*lat(:)+lon(:)>-10 .AND. 2*lat(:)+lon(:)<10) mask(:)=.FALSE.
+       ELSE IF (params%domain_mask_type=="latitude_band") THEN
+         WHERE (lat(:)>-30 .AND. lat(:)<30) mask(:)=.FALSE.
+      ENDIF 
      ENDIF