Changeset 776 for LMDZ4/trunk/libf/phylmd/oasis.psmile

Timestamp:

Jun 7, 2007, 12:01:52 PM (17 years ago)

Author:

Laurent Fairhead

Message:

Suite du merge entre la version et la HEAD: quelques modifications
de Yann sur le
LF

File:

• LMDZ4/trunk/libf/phylmd/oasis.psmile (modified) (8 diffs)

LMDZ4/trunk/libf/phylmd/oasis.psmile

@@ -94 +94 @@
 ! Here we go: psmile initialisation
 !
-    IF (monocpu) THEN
+    IF (is_sequential) THEN
       call prism_init_comp_proto (comp_id, clmodnam, ierror)
 
@@ -116 +116 @@
 !ym   ig_paral(3) = im * jm
    ig_paral(1) = 1    ! apple partition for //
-   ig_paral(2) = (jjphy_begin-1)*im+iiphy_begin-1
-   ig_paral(3) = (jjphy_end*im+iiphy_end)-(jjphy_begin*im+iiphy_begin)+1
-   if (phy_rank==phy_size-1) ig_paral(3)=ig_paral(3)+im-1
-   print *,phy_rank,'ig_paral--->',ig_paral(2),ig_paral(3)
+   ig_paral(2) = (jj_begin-1)*im+ii_begin-1
+   ig_paral(3) = (jj_end*im+ii_end)-(jj_begin*im+ii_begin)+1
+   if (mpi_rank==mpi_size-1) ig_paral(3)=ig_paral(3)+im-1
+   print *,mpi_rank,'ig_paral--->',ig_paral(2),ig_paral(3)
    
    ierror=PRISM_Ok
@@ -222 +222 @@
    use mod_prism_proto
    use mod_prism_get_proto
-   use dimphy
+   USE dimphy
+   USE mod_phys_lmdz_para
    IMPLICIT none
 
@@ -250 +251 @@
    CALL flush (nuout)
 
-   istart=iiphy_begin
-   if (phy_rank==phy_size-1) then
-    iend=(jjphy_end-jjphy_begin)*im+im
+   istart=ii_begin
+   if (is_south_pole) then
+    iend=(jj_end-jj_begin)*im+im
    else
-    iend=(jjphy_end-jjphy_begin)*im+iiphy_end
+    iend=(jj_end-jj_begin)*im+ii_end
    endif
    
@@ -313 +314 @@
    use mod_prism_proto
    use mod_prism_put_proto
-   use dimphy
+   USE dimphy
+   USE mod_phys_lmdz_para
    use write_field_phy
    IMPLICIT NONE
@@ -345 +347 @@
       WRITE(nuout,*)
 
-   istart=iiphy_begin
-   if (phy_rank==phy_size-1) then
-    iend=(jjphy_end-jjphy_begin)*im+im
+   istart=ii_begin
+   if (is_south_pole) then
+    iend=(jj_end-jj_begin)*im+im
    else
-    iend=(jjphy_end-jjphy_begin)*im+iiphy_end
+    iend=(jj_end-jj_begin)*im+ii_end
    endif
 
@@ -355 +357 @@
      wstart=istart
      wend=iend
-     IF (phy_rank==0) wstart=istart+im-1
-     IF (phy_rank==phy_size-1) wend=iend-im+1
+     IF (is_north_pole) wstart=istart+im-1
+     IF (is_south_pole) wend=iend-im+1
    
      CALL writeField_phy("fsolice",fsolice(wstart:wend),1)
@@ -533 +535 @@
 
    if (last) then
-     IF (monocpu) THEN 
+     IF (is_sequential) THEN 
        call prism_terminate_proto(ierror)
          IF (ierror .ne. PRISM_Ok) THEN