Changeset 685 for codes/icosagcm/devel/Python/src/kernels_transport.jin

Timestamp:

03/07/18 18:43:51 (6 years ago)

Author:

dubos

Message:

devel/unstructured : towards vertical remapping

File:

• codes/icosagcm/devel/Python/src/kernels_transport.jin (modified) (2 diffs)

codes/icosagcm/devel/Python/src/kernels_transport.jin

@@ -158 +158 @@
   ! First diagnose geopotential and temperature, column-wise
   BARRIER
-  SEQUENCE_EXT
+  SEQUENCE_C1
     PROLOGUE(llm)
       pk(CELL) = ptop + .5*g*rhodz(CELL)
@@ -225 +225 @@
 
 END_BLOCK
+
+KERNEL(remap_eta)
+! IN  : rhodz, mass_dak, mass_dbk
+! TMP : mass_col, cur_lev, new_rhodz_cum
+! OUT : rhodz, old_rhodz, eta
+    SEQUENCE_C1
+      PROLOGUE('1')
+        rhodz_cum(CELL)=0.
+        cur_lev(HIDX(CELL))=1
+        eta(CELL)=0.
+        new_rhodz_cum(HIDX(CELL))=0.
+      END_BLOCK
+      BODY('1,llm')
+        rhodz_cum(UP(CELL)) = rhodz_cum(CELL) + rhodz(CELL)
+      END_BLOCK
+      EPILOGUE('llm+1')
+        mass_col(HIDX(CELL)) = rhodz_cum(CELL)
+      END_BLOCK
+
+      BODY('1,llm')
+        old_rhodz(CELL) = rhodz(CELL)
+        rhodz(CELL) = mass_dak(CELL) + mass_col(HIDX(CELL))*mass_dbk(CELL)
+        rhodz_cum_target = new_rhodz_cum(HIDX(CELL)) + rhodz(CELL)
+        DO level = cur_lev(HIDX(CELL)), llm
+           rhodz_cum_levp1 = rhodz_cum(AT_LEVEL(CELL,level+1))
+           IF(rhodz_cum_target<=rhodz_cum_levp1) EXIT
+        END DO
+        rhodz_cum_lev = rhodz_cum(AT_LEVEL(CELL,level))
+        ! now rhodz_cum_lev <= rhodz_cum_target <= rhodz_cum_levp1  
+        cur_lev(HIDX(CELL)) = level
+        new_rhodz_cum(HIDX(CELL)) = rhodz_cum_target
+        eta(UP(CELL)) = level + (rhodz_cum_target-rhodz_cum_lev)/(rhodz_cum_levp1-rhodz_cum_lev)
+      END_BLOCK
+    END_BLOCK
+END_BLOCK
+
+KERNEL(remap_theta)
+! IN  : thetarhodz, eta
+! TMP : thetarhodz_cum, new_thetarhodz_cum
+! OUT : thetarhodz
+    SEQUENCE_C1
+      PROLOGUE('1')
+        thetarhodz_cum(CELL)=0.
+      END_BLOCK
+      BODY('1,llm')
+        thetarhodz_cum(UP(CELL)) = thetarhodz_cum(CELL) + thetarhodz(CELL)
+      END_BLOCK
+        
+      BODY('1,llm+1')
+        X = eta(CELL)
+        level = FLOOR(X)
+        X = X-level
+        new_thetarhodz_cum(CELL) = thetarhodz_cum(AT_LEVEL(CELL,level))+X*thetarhodz(AT_LEVEL(CELL,level))
+      END_BLOCK
+      BODY('1,llm')
+        thetarhodz(CELL)) = new_thetarhodz_cum(UP(CELL)) - new_thetarhodz_cum(CELL)
+      END_BLOCK
+    END_BLOCK
+END_BLOCK
+
+KERNEL(remap_u)
+! IN  : u, old_rhodz, rhodz, eta
+! TMP : urhodz_cum, new_urhodz_cum
+! OUT : u
+    SEQUENCE_E0
+      PROLOGUE('1')
+        urhodz_cum(EDGE)=0.
+      END_BLOCK
+      BODY('1,llm')
+        urhodz(EDGE) = u(EDGE)*(old_rhodz(CELL1)+old_rhodz(CELL2))
+        urhodz_cum(UP(EDGE)) = urhodz_cum(EDGE) + urhodz(EDGE)
+      END_BLOCK
+        
+      BODY('1,llm+1')
+        X = .5*(eta(CELL1)+eta(CELL2))
+        level = FLOOR(X)
+        X = X-level
+        new_urhodz_cum(EDGE) = urhodz_cum(AT_LEVEL(EDGE,level))+X*urhodz(AT_LEVEL(EDGE,level))
+      END_BLOCK
+      BODY('1,llm')
+        u(EDGE) = (new_urhodz_cum(UP(EDGE)) - new_urhodz_cum(EDGE)) / (rhodz(CELL1)+rhodz(CELL2))
+      END_BLOCK
+    END_BLOCK
+END_BLOCK