Changeset 1530 for trunk/LMDZ.VENUS/libf/phyvenus/grid_noro.F

Timestamp:

Apr 6, 2016, 8:51:34 AM (9 years ago)

Author:

emillour

Message:

Venus and Titan GCMs:
Updates in the physics to keep up with updates in LMDZ5 (up to
LMDZ5 trunk, rev 2350) concerning dynamics/physics separation:

• Adapted makelmdz and makelmdz_fcm script to stop if trying to compile 1d model or newstart or start2archive in parallel.
• got rid of references to "dimensions.h" in physics. Within physics packages, use nbp_lon (=iim), nbp_lat (=jjmp1) and nbp_lev (=llm) from module mod_grid_phy_lmdz (in phy_common) instead. Only partially done for Titan, because of many hard-coded commons; a necessary first step will be to clean these up (using modules).

EM

File:

• trunk/LMDZ.VENUS/libf/phyvenus/grid_noro.F (modified) (5 diffs)

trunk/LMDZ.VENUS/libf/phyvenus/grid_noro.F

@@ -52 +52 @@
 C=======================================================================
 
+      use mod_grid_phy_lmdz, only: nbp_lon, nbp_lat
       IMPLICIT none 
       
-#include "dimensions.h"
 #include "YOMCST.h"
 
@@ -79 +79 @@
 C INTERMEDIATE FIELDS  (CORRELATIONS OF OROGRAPHY GRADIENT)
 
-      REAL ztz(iim+1,jjm+1),zxtzx(iim+1,jjm+1)
-      REAL zytzy(iim+1,jjm+1),zxtzy(iim+1,jjm+1)
-      REAL weight(iim+1,jjm+1)
+      REAL ztz(nbp_lon+1,nbp_lat),zxtzx(nbp_lon+1,nbp_lat)
+      REAL zytzy(nbp_lon+1,nbp_lat),zxtzy(nbp_lon+1,nbp_lat)
+      REAL weight(nbp_lon+1,nbp_lat)
 
 C CORRELATIONS OF USN OROGRAPHY GRADIENTS
@@ -107 +107 @@
 c    
 c
-      if(iim.ne.imar) STOP 'Problem dim. x'
-      if(jjm.ne.jmar-1) STOP 'Problem dim. y'
+      if(nbp_lon.ne.imar) STOP 'Problem dim. x'
+      if(nbp_lat-1.ne.jmar-1) STOP 'Problem dim. y'
       IF (imar.GT.2200 .OR. jmar.GT.1100) THEN
          PRINT*, 'imar or jmar too big', imar, jmar
@@ -114 +114 @@
       ENDIF
 
-      IF(imar+1.ne.iim+1.or.jmar.ne.jjm+1)THEN
+      IF(imar+1.ne.nbp_lon+1.or.jmar.ne.nbp_lat)THEN
         print *,' imar or jmar bad dimensions:',imar,jmar
         call abort
@@ -297 +297 @@
 C  FIRST FILTER, MOVING AVERAGE OVER 9 POINTS.
 
-       CALL MVA9(zmea,iim+1,jjm+1)
-       CALL MVA9(zstd,iim+1,jjm+1)
-       CALL MVA9(zpic,iim+1,jjm+1)
-       CALL MVA9(zval,iim+1,jjm+1)
-       CALL MVA9(zxtzx,iim+1,jjm+1)
-       CALL MVA9(zxtzy,iim+1,jjm+1) 
-       CALL MVA9(zytzy,iim+1,jjm+1)
+       CALL MVA9(zmea,nbp_lon+1,nbp_lat)
+       CALL MVA9(zstd,nbp_lon+1,nbp_lat)
+       CALL MVA9(zpic,nbp_lon+1,nbp_lat)
+       CALL MVA9(zval,nbp_lon+1,nbp_lat)
+       CALL MVA9(zxtzx,nbp_lon+1,nbp_lat)
+       CALL MVA9(zxtzy,nbp_lon+1,nbp_lat) 
+       CALL MVA9(zytzy,nbp_lon+1,nbp_lat)
 
        DO ii = 1, imar