Changeset 1572 for trunk/LMDZ.COMMON/libf/dynphy_lonlat/calfis_p.F

Timestamp:

Jul 11, 2016, 9:35:35 AM (8 years ago)

Author:

emillour

Message:

All GCMs:
Further adaptations to keep up with changes in LMDZ5 concerning
physics/dynamics separation (up to rev r2500 of LMDZ5)

• arch:
• remove ifort debug option '-check all', replace it with '-check bounds,format,output_conversion,pointers,uninit' (i.e. get it to stop complaining about copying into temporary arrays)

• dyn3d_common:
• comconst_mod.F90 : add ngroup

• dyn3d:
• gcm.F90 : minor bug fix (arguments to a call_abort())
• leapfrog.F90 : recompute geopotential for bilan_dyn outputs
• conf_gcm.F90 : read "ngroup" from run.def
• groupe.F , groupeun.F : ngroup no longer a local parameter

• dyn3d_par:
• conf_gcm.F90 : read "ngroup" from run.def
• groupe_p.F , groupeun_p.F : ngroup no longer a local parameter

• misc:
• regr1_step_av_m.F90 : removed (not used)

• phy_common:
• mod_phys_lmdz_mpi_transfert.F90 , mod_phys_lmdz_mpi_data.F90 : change is_north_pole and is_south_pole to is_north_pole_dyn and is_south_pole_dyn
• mod_phys_lmdz_omp_data.F90 : introduce is_nort_pole_phy and is_south_pole_phy

• dynphy_lonlat:
• mod_interface_dyn_phys.F90 : use is_north_pole_dyn and is_south_pole_dyn
• calfis_p.F : use is_north_pole_dyn and is_south_pole_dyn

• phyvenus:
• physiq_mod , write_hist*.h : use is_north_pole_phy and is_south_pole_phy to correctly compute mesh area at poles to send to hist*nc files.

• phytitan:
• physiq_mod , write_hist*.h : use is_north_pole_phy and is_south_pole_phy to correctly compute mesh area at poles to send to hist*nc files.

EM

File:

• trunk/LMDZ.COMMON/libf/dynphy_lonlat/calfis_p.F (modified) (18 diffs)

trunk/LMDZ.COMMON/libf/dynphy_lonlat/calfis_p.F

@@ -597 +597 @@
       kend=klon
       
-      if (is_north_pole) kstart=2
-      if (is_south_pole) kend=klon-1
+      if (is_north_pole_dyn) kstart=2
+      if (is_south_pole_dyn) kend=klon-1
       
 c$OMP DO SCHEDULE(STATIC,OMP_CHUNK)      
@@ -626 +626 @@
       jjb=jj_begin_dyn-1
       jje=jj_end_dyn+1
-      if (is_north_pole) jjb=1
-      if (is_south_pole) jje=jjm
+      if (is_north_pole_dyn) jjb=1
+      if (is_south_pole_dyn) jje=jjm
 
 c$OMP DO SCHEDULE(STATIC,OMP_CHUNK)
@@ -678 +678 @@
 c        V = 1 / pi  *  integrale [ v * sin(long) * d long ]
 
-      if (is_north_pole) then
+      if (is_north_pole_dyn) then
 c$OMP DO SCHEDULE(STATIC,OMP_CHUNK)      
         DO l=1,llm
@@ -706 +706 @@
 c        V = 1 / pi  *  integrale [ v * sin(long) * d long ]
 
-      if (is_south_pole) then
+      if (is_south_pole_dyn) then
 c$OMP DO SCHEDULE(STATIC,OMP_CHUNK)      
         DO l=1,llm
@@ -1248 +1248 @@
          pdvfi(:,jj_begin,l)=0
          
-         if (.not. is_south_pole) then
+         if (.not. is_south_pole_dyn) then
            pdhfi(:,jj_end,l)=0
            pdqfi(:,jj_end,l,:)=0
@@ -1260 +1260 @@
 c$OMP MASTER
        pdpsfi(:,jj_begin)=0    
-       if (.not. is_south_pole) then
+       if (.not. is_south_pole_dyn) then
          pdpsfi(:,jj_end)=0
        endif
@@ -1278 +1278 @@
       kend=klon
 
-      if (is_north_pole) kstart=2
-      if (is_south_pole)  kend=klon-1
+      if (is_north_pole_dyn) kstart=2
+      if (is_south_pole_dyn)  kend=klon-1
       
 ! ADAPTATION GCM POUR CP(T)
@@ -1301 +1301 @@
          enddo          
 
-        if (is_north_pole) then
+        if (is_north_pole_dyn) then
             DO i=1,iip1
 !              pdhfi(i,1,l)    = cpp *  zdtfi(1,l)      / ppk(i, 1  ,l)
@@ -1308 +1308 @@
         endif
         
-        if (is_south_pole) then
+        if (is_south_pole_dyn) then
             DO i=1,iip1
 !              pdhfi(i,jjp1,l) = cpp *  zdtfi(klon,l)/ ppk(i,jjp1,l)
@@ -1331 +1331 @@
 !           enddo
 !           
-!           if (is_north_pole) then
+!           if (is_north_pole_dyn) then
 !             do i=1,iip1
 !               pdqfi(i,1,l,iq)    = zdqfi(1,l,iq)             
@@ -1337 +1337 @@
 !           endif
 !           
-!           if (is_south_pole) then
+!           if (is_south_pole_dyn) then
 !             do i=1,iip1
 !               pdqfi(i,jjp1,l,iq) = zdqfi(klon,l,iq) 
@@ -1371 +1371 @@
             ENDDO
             
-            IF (is_north_pole) then
+            IF (is_north_pole_dyn) then
               DO i=1,iip1
                 pdqfi(i,1,l,iq)    = zdqfi(1,l,iq)
@@ -1377 +1377 @@
             ENDIF
             
-            IF (is_south_pole) then
+            IF (is_south_pole_dyn) then
               DO i=1,iip1
                 pdqfi(i,jjp1,l,iq) = zdqfi(klon,l,iq)
@@ -1410 +1410 @@
          enddo
          
-         if (is_north_pole) then
+         if (is_north_pole_dyn) then
            DO i=1,iip1
             pdufi(i,1,l)    = 0.
@@ -1416 +1416 @@
          endif
          
-         if (is_south_pole) then
+         if (is_south_pole_dyn) then
            DO i=1,iip1
             pdufi(i,jjp1,l) = 0.
@@ -1431 +1431 @@
       kend=klon
 
-      if (is_north_pole) kstart=2
-      if (is_south_pole)  kend=klon-1-iim
+      if (is_north_pole_dyn) kstart=2
+      if (is_south_pole_dyn)  kend=klon-1-iim
       
 c$OMP DO SCHEDULE(STATIC,OMP_CHUNK)      
@@ -1456 +1456 @@
 c      v = U * cos(long) + V * SIN(long)
 
-      if (is_north_pole) then
+      if (is_north_pole_dyn) then
 
 c$OMP DO SCHEDULE(STATIC,OMP_CHUNK)      
@@ -1476 +1476 @@
       endif    
       
-      if (is_south_pole) then
+      if (is_south_pole_dyn) then
 
 c$OMP DO SCHEDULE(STATIC,OMP_CHUNK)