Changeset 2144 for trunk/LMDZ.GENERIC/libf/phystd/thermcell_dq.F90

Timestamp:

Jun 20, 2019, 7:07:28 PM (5 years ago)

Author:

aboissinot

Message:

Thermal plume model parameters are now set in callphys.def and (re)add flag to choose between thermcell_dv2 or thermcell_dq to mix horizontal momentum.

File:

• trunk/LMDZ.GENERIC/libf/phystd/thermcell_dq.F90 (modified) (2 diffs)

trunk/LMDZ.GENERIC/libf/phystd/thermcell_dq.F90

@@ -136 +136 @@
 !-------------------------------------------------------------------------------
       
-      IF (dqimpl==0) THEN
-         DO l=1,nlay-1
-            q(:,l) = q(:,l) + (fqa(:,l) - fqa(:,l+1) - fm(:,l) * q(:,l)       &
-            &      + fm(:,l+1) * q(:,l+1)) * ptimestep / masse(:,l)
-         ENDDO
-      ELSEIF (dqimpl==1) THEN
+      IF (dqimpl) THEN
          DO l=nlay-1,1,-1
             q(:,l) = ( q(:,l) + ptimestep / masse(:,l)                        &
@@ -148 +143 @@
          ENDDO
       ELSE
-         print *, 'ERROR: No corresponding scheme for mixing computations!'
-         print *, '       dqimpl must be equal to 1, 0 or -1 but'
-         print *, 'dqimpl =', dqimpl
-         call abort
+         DO l=1,nlay-1
+            q(:,l) = q(:,l) + (fqa(:,l) - fqa(:,l+1) - fm(:,l) * q(:,l)       &
+            &      + fm(:,l+1) * q(:,l+1)) * ptimestep / masse(:,l)
+         ENDDO
       ENDIF