Changeset 885

Timestamp:

06/12/19 00:45:02 (5 years ago)

Author:

dubos

Message:

devel/unstructured : caldyn_BC & legacy_to_DEC

Location:

codes/icosagcm/devel/src

Files:

• dynamics/caldyn_gcm.F90 (modified) (1 diff)
• time/euler_scheme.f90 (modified) (1 diff)

codes/icosagcm/devel/src/dynamics/caldyn_gcm.F90

@@ -204 +204 @@
           wwuu=f_wwuu(ind)
           
-          DO ij=ij_begin_ext,ij_end_ext
-              ! lower BCs : geopot=phis, wflux=0, wwuu=0
-              geopot(ij,1) = phis(ij)
-              wflux(ij,1) = 0.
-              wwuu(ij+u_right,1)=0   
-              wwuu(ij+u_lup,1)=0   
-              wwuu(ij+u_ldown,1)=0
-              ! top BCs : wflux=0, wwuu=0
-              wflux(ij,llm+1)  = 0.
-              wwuu(ij+u_right,llm+1)=0   
-              wwuu(ij+u_lup,llm+1)=0   
-              wwuu(ij+u_ldown,llm+1)=0
-          ENDDO
+          SELECT CASE(grid_type)
+          CASE(grid_unst)
+             ! FIXME OMP
+             DO ij=1, primal_num
+                geopot(1,ij) = phis(ij)
+                wflux(1,ij)=0.
+                wflux(llm+1,ij)=0.
+             END DO
+             DO ij=1, edge_num
+                wwuu(1,ij)=0.
+                wwuu(llm+1,ij)=0.
+             END DO
+          CASE(grid_ico)
+             DO ij=ij_begin_ext,ij_end_ext
+                ! lower BCs : geopot=phis, wflux=0, wwuu=0
+                geopot(ij,1) = phis(ij)
+                wflux(ij,1) = 0.
+                wwuu(ij+u_right,1)=0   
+                wwuu(ij+u_lup,1)=0   
+                wwuu(ij+u_ldown,1)=0
+                ! top BCs : wflux=0, wwuu=0
+                wflux(ij,llm+1)  = 0.
+                wwuu(ij+u_right,llm+1)=0   
+                wwuu(ij+u_lup,llm+1)=0   
+                wwuu(ij+u_ldown,llm+1)=0
+             END DO
+          END SELECT
        END DO
     ENDIF

codes/icosagcm/devel/src/time/euler_scheme.f90

@@ -160 +160 @@
        IF(caldyn_eta==eta_mass .AND. is_omp_first_level) THEN ! update ps
           ps=f_ps(ind)
-          !DIR$ SIMD
-          DO ij=ij_begin,ij_end
-             ps(ij)=(ps(ij)-ptop)/g ! convert ps to column-integrated mass
-          ENDDO
+          ps(:)=(ps(:)-ptop)/g
        END IF