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

Timestamp:

03/08/18 13:05:02 (6 years ago)

Author:

dubos

Message:

devel/unstructured : piecewise-constant vertical remapping

File:

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

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

@@ -234 +234 @@
         rhodz_cum(CELL)=0.
         cur_lev(HIDX(CELL))=1
-        eta(CELL)=0.
+        eta(CELL)=1.
         new_rhodz_cum(HIDX(CELL))=0.
       END_BLOCK
@@ -252 +252 @@
            IF(rhodz_cum_target<=rhodz_cum_levp1) EXIT
         END DO
+        IF(level>llm) level=llm
         rhodz_cum_lev = rhodz_cum(AT_LEVEL(CELL,level))
         ! now rhodz_cum_lev <= rhodz_cum_target <= rhodz_cum_levp1  
@@ -275 +276 @@
       BODY('1,llm+1')
         X = eta(CELL)
-        level = FLOOR(X)
+        level = MIN(llm,FLOOR(X)) ! eta=llm+1 => level=llm, X=1
         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)
+        thetarhodz(CELL) = new_thetarhodz_cum(UP(CELL)) - new_thetarhodz_cum(CELL)
       END_BLOCK
     END_BLOCK
@@ -300 +301 @@
       BODY('1,llm+1')
         X = .5*(eta(CELL1)+eta(CELL2))
-        level = FLOOR(X)
+        level = MIN(llm,FLOOR(X))
         X = X-level
         new_urhodz_cum(EDGE) = urhodz_cum(AT_LEVEL(EDGE,level))+X*urhodz(AT_LEVEL(EDGE,level))