Changeset 2435 for LMDZ5/branches/testing/libf/phylmd/cpl_mod.F90

Timestamp:

Jan 28, 2016, 5:02:13 PM (9 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r2396:2434 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/phylmd/cpl_mod.F90 (modified) (7 diffs)

LMDZ5/branches/testing/libf/phylmd/cpl_mod.F90

@@ -292 +292 @@
 ! are stored in this module.
     USE surface_data
-    USE phys_state_var_mod, ONLY : rlon, rlat
+    USE geometry_mod, ONLY : longitude_deg, latitude_deg
     USE carbon_cycle_mod, ONLY : carbon_cycle_cpl
     USE indice_sol_mod
@@ -363 +363 @@
 
 ! Transform the longitudes and latitudes on 2D arrays
-          CALL gather_omp(rlon,rlon_mpi)
-          CALL gather_omp(rlat,rlat_mpi)
+          CALL gather_omp(longitude_deg,rlon_mpi)
+          CALL gather_omp(latitude_deg,rlat_mpi)
 !$OMP MASTER
           CALL Grid1DTo2D_mpi(rlon_mpi,tmp_lon)
@@ -1115 +1115 @@
     
       IF (is_parallel) THEN
-         IF (.NOT. is_north_pole) THEN
+         IF (.NOT. is_north_pole_dyn) THEN
 #ifdef CPP_MPI
             CALL MPI_RECV(Up,1,MPI_REAL_LMDZ,mpi_rank-1,1234,COMM_LMDZ_PHY,status,error)
@@ -1122 +1122 @@
          ENDIF
        
-         IF (.NOT. is_south_pole) THEN
+         IF (.NOT. is_south_pole_dyn) THEN
 #ifdef CPP_MPI
             CALL MPI_SEND(tmp_calv(1,jj_nb),1,MPI_REAL_LMDZ,mpi_rank+1,1234,COMM_LMDZ_PHY,error)
@@ -1129 +1129 @@
          ENDIF
          
-         IF (.NOT. is_north_pole .AND. ii_begin /=1) THEN
+         IF (.NOT. is_north_pole_dyn .AND. ii_begin /=1) THEN
             Up=Up+tmp_calv(nbp_lon,1)
             tmp_calv(:,1)=Up
          ENDIF
          
-         IF (.NOT. is_south_pole .AND. ii_end /= nbp_lon) THEN
+         IF (.NOT. is_south_pole_dyn .AND. ii_end /= nbp_lon) THEN
             Down=Down+tmp_calv(1,jj_nb)
             tmp_calv(:,jj_nb)=Down       
@@ -1222 +1222 @@
 
     IF (is_sequential) THEN
-       IF (is_north_pole) tmp_lon(:,1)     = tmp_lon(:,2)
-       IF (is_south_pole) tmp_lon(:,nbp_lat) = tmp_lon(:,nbp_lat-1)
+       IF (is_north_pole_dyn) tmp_lon(:,1)     = tmp_lon(:,2)
+       IF (is_south_pole_dyn) tmp_lon(:,nbp_lat) = tmp_lon(:,nbp_lat-1)
     ENDIF
       
@@ -1389 +1389 @@
     CALL Grid1Dto2D_mpi(temp_mpi,champ_out)
     
-    IF (is_north_pole) champ_out(:,1)=temp_mpi(1)
-    IF (is_south_pole) champ_out(:,jj_nb)=temp_mpi(klon)
+    IF (is_north_pole_dyn) champ_out(:,1)=temp_mpi(1)
+    IF (is_south_pole_dyn) champ_out(:,jj_nb)=temp_mpi(klon)
 !$OMP END MASTER