Changeset 549 for trunk/MESOSCALE/LMD_MM_MARS/SRC/WRFV2/main

Timestamp:

Mar 1, 2012, 12:57:47 AM (13 years ago)

Author:

aslmd

Message:

MESOSCALE: for improved watercycle runs: ccn_mass and ccn_number are now passed through boundaries.

File:

• trunk/MESOSCALE/LMD_MM_MARS/SRC/WRFV2/main/real_em.F (modified) (12 diffs)

trunk/MESOSCALE/LMD_MM_MARS/SRC/WRFV2/main/real_em.F

@@ -566 +566 @@
    REAL , DIMENSION(:,:,:) , ALLOCATABLE , SAVE :: q3bdy3dtemp1
    REAL , DIMENSION(:,:,:) , ALLOCATABLE , SAVE :: q4bdy3dtemp1
+   REAL , DIMENSION(:,:,:) , ALLOCATABLE , SAVE :: q5bdy3dtemp1
+   REAL , DIMENSION(:,:,:) , ALLOCATABLE , SAVE :: q6bdy3dtemp1
 !!!!***MARS <<
    REAL , DIMENSION(:,:,:) , ALLOCATABLE , SAVE :: mbdy2dtemp1
@@ -573 +575 @@
    REAL , DIMENSION(:,:,:) , ALLOCATABLE , SAVE :: q3bdy3dtemp2
    REAL , DIMENSION(:,:,:) , ALLOCATABLE , SAVE :: q4bdy3dtemp2
+   REAL , DIMENSION(:,:,:) , ALLOCATABLE , SAVE :: q5bdy3dtemp2
+   REAL , DIMENSION(:,:,:) , ALLOCATABLE , SAVE :: q6bdy3dtemp2
 !!!!***MARS <<
    REAL , DIMENSION(:,:,:) , ALLOCATABLE , SAVE :: mbdy2dtemp2
@@ -625 +629 @@
       IF ( ALLOCATED ( q3bdy3dtemp1 ) ) DEALLOCATE ( q3bdy3dtemp1 )
       IF ( ALLOCATED ( q4bdy3dtemp1 ) ) DEALLOCATE ( q4bdy3dtemp1 )
+      IF ( ALLOCATED ( q3bdy3dtemp1 ) ) DEALLOCATE ( q5bdy3dtemp1 )
+      IF ( ALLOCATED ( q4bdy3dtemp1 ) ) DEALLOCATE ( q6bdy3dtemp1 )
 !!!!***MARS <<
       IF ( ALLOCATED ( mbdy2dtemp1 ) ) DEALLOCATE ( mbdy2dtemp1 )
@@ -636 +642 @@
       IF ( ALLOCATED ( q3bdy3dtemp2 ) ) DEALLOCATE ( q3bdy3dtemp2 )
       IF ( ALLOCATED ( q4bdy3dtemp2 ) ) DEALLOCATE ( q4bdy3dtemp2 )
+      IF ( ALLOCATED ( q3bdy3dtemp2 ) ) DEALLOCATE ( q5bdy3dtemp2 )
+      IF ( ALLOCATED ( q4bdy3dtemp2 ) ) DEALLOCATE ( q6bdy3dtemp2 )
 !!!!***MARS <<
       IF ( ALLOCATED ( mbdy2dtemp2 ) ) DEALLOCATE ( mbdy2dtemp2 )
@@ -648 +656 @@
       ALLOCATE ( q3bdy3dtemp1(ims:ime,kms:kme,jms:jme) )
       ALLOCATE ( q4bdy3dtemp1(ims:ime,kms:kme,jms:jme) )
+      ALLOCATE ( q5bdy3dtemp1(ims:ime,kms:kme,jms:jme) )
+      ALLOCATE ( q6bdy3dtemp1(ims:ime,kms:kme,jms:jme) )
 !!!!***MARS <<
       ALLOCATE ( mbdy2dtemp1(ims:ime,1:1,    jms:jme) )
@@ -659 +669 @@
       ALLOCATE ( q3bdy3dtemp2(ims:ime,kms:kme,jms:jme) )
       ALLOCATE ( q4bdy3dtemp2(ims:ime,kms:kme,jms:jme) )
+      ALLOCATE ( q5bdy3dtemp2(ims:ime,kms:kme,jms:jme) )
+      ALLOCATE ( q6bdy3dtemp2(ims:ime,kms:kme,jms:jme) )
 !!!!***MARS <<
       ALLOCATE ( mbdy2dtemp2(ims:ime,1:1,    jms:jme) )
@@ -721 +733 @@
                     ids, ide, jds, jde, kds, kde, ims, ime, jms, jme, kms, kme, ips, ipe, jps, jpe, kps, kpe )
       CALL couple ( grid%em_mu_2 , grid%em_mub , q4bdy3dtemp1 , grid%scalar(:,:,:,5) , 't' , grid%msft , &
+                    ids, ide, jds, jde, kds, kde, ims, ime, jms, jme, kms, kme, ips, ipe, jps, jpe, kps, kpe )
+ENDIF
+IF ((config_flags%mars .eq. 12)) THEN
+      CALL couple ( grid%em_mu_2 , grid%em_mub , q5bdy3dtemp1 , grid%scalar(:,:,:,6) , 't' , grid%msft , &
+                    ids, ide, jds, jde, kds, kde, ims, ime, jms, jme, kms, kme, ips, ipe, jps, jpe, kps, kpe )
+      CALL couple ( grid%em_mu_2 , grid%em_mub , q6bdy3dtemp1 , grid%scalar(:,:,:,7) , 't' , grid%msft , &
                     ids, ide, jds, jde, kds, kde, ims, ime, jms, jme, kms, kme, ips, ipe, jps, jpe, kps, kpe )
 ENDIF
@@ -804 +822 @@
                                                                  ips , ipe , jps , jpe , kps , kpe )
 ENDIF
+IF ((config_flags%mars .eq. 12)) THEN
+      CALL stuff_bdy     ( q5bdy3dtemp1 , grid%scalar_b(:,:,:,:,6)   , 'T' , ijds , ijde , spec_bdy_width      , &
+                                                                 ids , ide , jds , jde , kds , kde , &
+                                                                 ims , ime , jms , jme , kms , kme , &
+                                                                 ips , ipe , jps , jpe , kps , kpe )
+      CALL stuff_bdy     ( q6bdy3dtemp1 , grid%scalar_b(:,:,:,:,7)   , 'T' , ijds , ijde , spec_bdy_width      , &
+                                                                 ids , ide , jds , jde , kds , kde , &
+                                                                 ims , ime , jms , jme , kms , kme , &
+                                                                 ips , ipe , jps , jpe , kps , kpe )
+ENDIF
 !!!!MARS <<
 
@@ -874 +902 @@
                     ids, ide, jds, jde, kds, kde, ims, ime, jms, jme, kms, kme, ips, ipe, jps, jpe, kps, kpe )
       CALL couple ( grid%em_mu_2 , grid%em_mub , q4bdy3dtemp2 , grid%scalar(:,:,:,5) , 't' , grid%msft , &
+                    ids, ide, jds, jde, kds, kde, ims, ime, jms, jme, kms, kme, ips, ipe, jps, jpe, kps, kpe )
+ENDIF
+IF ((config_flags%mars .eq. 12)) THEN
+      CALL couple ( grid%em_mu_2 , grid%em_mub , q5bdy3dtemp2 , grid%scalar(:,:,:,6) , 't' , grid%msft , &
+                    ids, ide, jds, jde, kds, kde, ims, ime, jms, jme, kms, kme, ips, ipe, jps, jpe, kps, kpe )
+      CALL couple ( grid%em_mu_2 , grid%em_mub , q6bdy3dtemp2 , grid%scalar(:,:,:,7) , 't' , grid%msft , &
                     ids, ide, jds, jde, kds, kde, ims, ime, jms, jme, kms, kme, ips, ipe, jps, jpe, kps, kpe )
 ENDIF
@@ -964 +998 @@
                                                             ips , ipe , jps , jpe , kps , kpe )
 ENDIF
+IF ((config_flags%mars .eq. 12)) THEN
+      CALL stuff_bdytend ( q5bdy3dtemp2 , q5bdy3dtemp1 , REAL(interval_seconds) , grid%scalar_bt(:,:,:,:,6) , 'T' , &
+                                                            ijds , ijde , spec_bdy_width      , &
+                                                            ids , ide , jds , jde , kds , kde , &
+                                                            ims , ime , jms , jme , kms , kme , &
+                                                            ips , ipe , jps , jpe , kps , kpe )
+      CALL stuff_bdytend ( q6bdy3dtemp2 , q6bdy3dtemp1 , REAL(interval_seconds) ,grid%scalar_bt(:,:,:,:,7) , 'T' , &
+                                                            ijds , ijde , spec_bdy_width      , &
+                                                            ids , ide , jds , jde , kds , kde , &
+                                                            ims , ime , jms , jme , kms , kme , &
+                                                            ips , ipe , jps , jpe , kps , kpe )
+ENDIF
 !!!!!MARS <<
 
@@ -1052 +1098 @@
                   q3bdy3dtemp1(i,k,j) = q3bdy3dtemp2(i,k,j)
                   q4bdy3dtemp1(i,k,j) = q4bdy3dtemp2(i,k,j)
+                  q5bdy3dtemp1(i,k,j) = q5bdy3dtemp2(i,k,j)
+                  q6bdy3dtemp1(i,k,j) = q6bdy3dtemp2(i,k,j)
 !!!!MARS <<
                END DO
@@ -1133 +1181 @@
                                                                     ips , ipe , jps , jpe , kps , kpe )
 ENDIF
+IF ((config_flags%mars .eq. 12)) THEN
+        CALL stuff_bdy     ( q5bdy3dtemp1 , grid%scalar_b(:,:,:,:,6)   , 'T', ijds , ijde , spec_bdy_width      , &
+                                                                    ids , ide , jds , jde , kds , kde , &
+                                                                    ims , ime , jms , jme , kms , kme , &
+                                                                    ips , ipe , jps , jpe , kps , kpe )
+        CALL stuff_bdy     ( q6bdy3dtemp1 , grid%scalar_b(:,:,:,:,7)   , 'T', ijds , ijde , spec_bdy_width      , &
+                                                                    ids , ide , jds , jde , kds , kde , &
+                                                                    ims , ime , jms , jme , kms , kme , &
+                                                                    ips , ipe , jps , jpe , kps , kpe )
+ENDIF
 !!!!MARS <<
          CALL stuff_bdy     ( mbdy2dtemp1 , grid%em_mu_b    , 'M' , ijds , ijde , spec_bdy_width      , &