Changeset 499

Timestamp:

11/27/16 00:24:42 (7 years ago)

Author:

dubos

Message:

Bugfix : NH - now passes DCMIP2012 (flat terrain), Bubble, DCMIP2016

Location:

codes/icosagcm/trunk/src

Files:

• caldyn_kernels_hevi.f90 (modified) (2 diffs)
• etat0.f90 (modified) (2 diffs)
• timeloop_gcm.f90 (modified) (1 diff)

codes/icosagcm/trunk/src/caldyn_kernels_hevi.f90

@@ -363 +363 @@
        DO ij=ij_begin_ext,ij_end_ext
           pk(ij,l) = cpp*((pk(ij,l)/preff)**kappa) ! other formulae possible if exponentiation is slow
-          berni(ij) = (-.5*g*g)*(              &
+          berni(ij) = (-.25*g*g)*(              &
                  (W(ij,l)/m_il(ij,l))**2       &
                + (W(ij,l+1)/m_il(ij,l+1))**2 )
@@ -816 +816 @@
                     le_de(ij+u_ldown)*u(ij+u_ldown,l)**2 +    &
                     le_de(ij+u_rdown)*u(ij+u_rdown,l)**2 ) &
-               - .5*( gradPhi2(ij,l)  *w_il(ij,l)**2 +   &
+               - .25*( gradPhi2(ij,l)  *w_il(ij,l)**2 +   &
                       gradPhi2(ij,l+1)*w_il(ij,l+1)**2 )
        END DO

codes/icosagcm/trunk/src/etat0.f90

@@ -40 +40 @@
       CASE ('dcmip2016_cyclone')
       CASE ('dcmip2016_supercell')
+      CASE ('bubble')
       CASE DEFAULT
          PRINT*, 'Bad selector for variable etat0 <',TRIM(etat0_type),'>'// &
@@ -45 +46 @@
                          //' <start_file>, <database>, <academic>, <held_suarez>, <venus>, <dcmip1>,'         &
                          //' <dcmip2_mountain,dcmip2_schaer_noshear,dcmip2_schaer_shear>, <dcmip3>, <dcmip4>,'&
-                         //' <dcmip2016_baroclinic_wave>, <dcmip2016_cyclone>, <dcmip2016_supercell>'
+                         //' <dcmip2016_baroclinic_wave>, <dcmip2016_cyclone>, <dcmip2016_supercell>', 'bubble'
          STOP
     END SELECT

codes/icosagcm/trunk/src/timeloop_gcm.f90

@@ -247 +247 @@
           CALL wait_message(req_q0)
           IF(.NOT. hydrostatic) THEN
-!             CALL send_message(f_geopot,req_geopot0)
-!             CALL wait_message(req_geopot0)
-!             CALL send_message(f_W,req_W0)
-!             CALL wait_message(req_W0)
+             CALL send_message(f_geopot,req_geopot0)
+             CALL wait_message(req_geopot0)
+             CALL send_message(f_W,req_W0)
+             CALL wait_message(req_W0)
           END IF
        ENDIF