Changeset 683 for codes/icosagcm/devel/src/kernels_unst/coriolis.k90

Timestamp:

03/07/18 11:18:39 (6 years ago)

Author:

dubos

Message:

devel/unstructured : cleanup

File:

• codes/icosagcm/devel/src/kernels_unst/coriolis.k90 (modified) (3 diffs)

codes/icosagcm/devel/src/kernels_unst/coriolis.k90

@@ -180 +180 @@
       ! this VLOOP iterates over the TRISK stencil
       SELECT CASE(trisk_deg(edge))
-      CASE(10)
+      CASE(4)
          !DIR$ SIMD
          DO l = 1, llm
@@ -196 +196 @@
             edge_trisk = trisk(4,edge)
             du_trisk = du_trisk + wee(itrisk,edge)*hflux(l,edge_trisk)*(qu(l,edge)+qu(l,edge_trisk))
-            itrisk = 5
-            edge_trisk = trisk(5,edge)
-            du_trisk = du_trisk + wee(itrisk,edge)*hflux(l,edge_trisk)*(qu(l,edge)+qu(l,edge_trisk))
-            itrisk = 6
-            edge_trisk = trisk(6,edge)
-            du_trisk = du_trisk + wee(itrisk,edge)*hflux(l,edge_trisk)*(qu(l,edge)+qu(l,edge_trisk))
-            itrisk = 7
-            edge_trisk = trisk(7,edge)
-            du_trisk = du_trisk + wee(itrisk,edge)*hflux(l,edge_trisk)*(qu(l,edge)+qu(l,edge_trisk))
-            itrisk = 8
-            edge_trisk = trisk(8,edge)
-            du_trisk = du_trisk + wee(itrisk,edge)*hflux(l,edge_trisk)*(qu(l,edge)+qu(l,edge_trisk))
-            itrisk = 9
-            edge_trisk = trisk(9,edge)
-            du_trisk = du_trisk + wee(itrisk,edge)*hflux(l,edge_trisk)*(qu(l,edge)+qu(l,edge_trisk))
-            itrisk = 10
-            edge_trisk = trisk(10,edge)
-            du_trisk = du_trisk + wee(itrisk,edge)*hflux(l,edge_trisk)*(qu(l,edge)+qu(l,edge_trisk))
             du(l,edge) = du(l,edge) + .5*du_trisk
          END DO
-      CASE(4)
+      CASE(10)
          !DIR$ SIMD
          DO l = 1, llm
@@ -231 +213 @@
             itrisk = 4
             edge_trisk = trisk(4,edge)
+            du_trisk = du_trisk + wee(itrisk,edge)*hflux(l,edge_trisk)*(qu(l,edge)+qu(l,edge_trisk))
+            itrisk = 5
+            edge_trisk = trisk(5,edge)
+            du_trisk = du_trisk + wee(itrisk,edge)*hflux(l,edge_trisk)*(qu(l,edge)+qu(l,edge_trisk))
+            itrisk = 6
+            edge_trisk = trisk(6,edge)
+            du_trisk = du_trisk + wee(itrisk,edge)*hflux(l,edge_trisk)*(qu(l,edge)+qu(l,edge_trisk))
+            itrisk = 7
+            edge_trisk = trisk(7,edge)
+            du_trisk = du_trisk + wee(itrisk,edge)*hflux(l,edge_trisk)*(qu(l,edge)+qu(l,edge_trisk))
+            itrisk = 8
+            edge_trisk = trisk(8,edge)
+            du_trisk = du_trisk + wee(itrisk,edge)*hflux(l,edge_trisk)*(qu(l,edge)+qu(l,edge_trisk))
+            itrisk = 9
+            edge_trisk = trisk(9,edge)
+            du_trisk = du_trisk + wee(itrisk,edge)*hflux(l,edge_trisk)*(qu(l,edge)+qu(l,edge_trisk))
+            itrisk = 10
+            edge_trisk = trisk(10,edge)
             du_trisk = du_trisk + wee(itrisk,edge)*hflux(l,edge_trisk)*(qu(l,edge)+qu(l,edge_trisk))
             du(l,edge) = du(l,edge) + .5*du_trisk