Changeset 1014

Timestamp:

02/28/20 10:07:19 (4 years ago)

Author:

ymipsl

Message:

1j+1j=2j : when restart from a file, in order to do not modify metric, it must

• do not optimize the metric even if the optim_it getin parameter is set to a value > 0
• do not call the schimtt tranform, even if the zoom procedure return identity, due to rounding error (probably due to finite decimal of pi)

YM

File:

• codes/icosagcm/trunk/src/sphere/geometry.f90 (modified) (6 diffs)

codes/icosagcm/trunk/src/sphere/geometry.f90

@@ -227 +227 @@
     INTEGER :: ind,i,j,n
     REAL(rstd) :: schmidt_factor, schmidt_lon, schmidt_lat
+    LOGICAL :: read_metric=.FALSE.
+    
+    CALL getin('read_metric', read_metric) 
 
     ! Schmidt transform parameters
@@ -241 +244 @@
     schmidt_lat = schmidt_lat * pi/180.
 
-    DO ind=1,ndomain
-      IF (.NOT. assigned_domain(ind) .OR. .NOT. is_omp_level_master) CYCLE
-      CALL swap_dimensions(ind)
-      CALL swap_geometry(ind)
-      DO j=jj_begin,jj_end
-        DO i=ii_begin,ii_end
-          n=(j-1)*iim+i
-          CALL schmidt_transform(xyz_i(n,:), schmidt_factor, schmidt_lon, schmidt_lat)
+    IF (.NOT. read_metric) THEN
+      DO ind=1,ndomain
+        IF (.NOT. assigned_domain(ind) .OR. .NOT. is_omp_level_master) CYCLE
+        CALL swap_dimensions(ind)
+        CALL swap_geometry(ind)
+        DO j=jj_begin,jj_end
+          DO i=ii_begin,ii_end
+            n=(j-1)*iim+i
+            CALL schmidt_transform(xyz_i(n,:), schmidt_factor, schmidt_lon, schmidt_lat)
+          ENDDO
         ENDDO
       ENDDO
-    ENDDO
+    ENDIF
+    
   END SUBROUTINE remap_schmidt_loc
 
@@ -263 +269 @@
   USE getin_mod
   USE omp_para
+  USE checksum_mod
   IMPLICIT NONE
     INTEGER :: nb_it=0
@@ -271 +278 @@
     REAL(rstd) :: sum
     LOGICAL    :: check
-    
+    LOGICAL :: read_metric=.FALSE.
     
     CALL getin('optim_it',nb_it)
+    CALL getin('read_metric', read_metric) 
+    IF (read_metric) nb_it=0
     
     DO ind=1,ndomain
@@ -425 +434 @@
   USE getin_mod
   USE omp_para
+  USE checksum_mod
   IMPLICIT NONE
 
@@ -446 +456 @@
     ! so that XIOS gets the right values
     CALL update_domain
-
+    
     DO ind=1,ndomain
       IF (.NOT. assigned_domain(ind)  .OR. .NOT. is_omp_level_master ) CYCLE