Changeset 3899 for dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/physiq.F90

Timestamp:

Feb 2, 2016, 10:18:06 AM (9 years ago)

Author:

ymipsl

Message:

• fix some bug for albedo : sub-surface componant used is not coherent with the declared falb array (use 2nd dimension instead of third).
• finalize LMDZ xios context at the end of simulation (lafin==.true.)

YM

File:

• dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/physiq.F90 (modified) (4 diffs)

dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/physiq.F90

@@ -1127 +1127 @@
      CALL create_etat0_limit_unstruct
      
-    
      CALL phyetat0 ("startphy.nc",clesphy0,tabcntr0)
      IF (klon_glo==1) THEN
@@ -1970 +1969 @@
  albsol1=albsol_dir(:,1)
  albsol2=albsol_dir(:,2)
- falb1=falb_dir(:,1,:)
- falb2=falb_dir(:,2,:)
+!ym falb1=falb_dir(:,1,:)
+!ym falb2=falb_dir(:,2,:)
+ falb1=falb_dir(:,:,1)
+ falb2=falb_dir(:,:,1)
 case(4)
  albsol1=albsol_dir(:,1)
  albsol2=albsol_dir(:,2)*SFRWL(2)+albsol_dir(:,3)*SFRWL(3)+albsol_dir(:,4)*SFRWL(4)
  albsol2=albsol2/(SFRWL(2)+SFRWL(3)+SFRWL(4))
- falb1=falb_dir(:,1,:)
- falb2=falb_dir(:,2,:)*SFRWL(2)+falb_dir(:,3,:)*SFRWL(3)+falb_dir(:,4,:)*SFRWL(4)
+!ym falb1=falb_dir(:,1,:)
+!ym falb2=falb_dir(:,2,:)*SFRWL(2)+falb_dir(:,3,:)*SFRWL(3)+falb_dir(:,4,:)*SFRWL(4)
+ falb1=falb_dir(:,:,1)
+ falb2=falb_dir(:,:,2)*SFRWL(2)+falb_dir(:,:,3)*SFRWL(3)+falb_dir(:,:,4)*SFRWL(4)
  falb2=falb2/(SFRWL(2)+SFRWL(3)+SFRWL(4))
 case(6)
@@ -1984 +1987 @@
  albsol2=albsol_dir(:,4)*SFRWL(4)+albsol_dir(:,5)*SFRWL(5)+albsol_dir(:,6)*SFRWL(6)
  albsol2=albsol2/(SFRWL(4)+SFRWL(5)+SFRWL(6))
- falb1=falb_dir(:,1,:)*SFRWL(1)+falb_dir(:,2,:)*SFRWL(2)+falb_dir(:,3,:)*SFRWL(3)
+!ym falb1=falb_dir(:,1,:)*SFRWL(1)+falb_dir(:,2,:)*SFRWL(2)+falb_dir(:,3,:)*SFRWL(3)
+ falb1=falb_dir(:,:,1)*SFRWL(1)+falb_dir(:,:,2)*SFRWL(2)+falb_dir(:,:,3)*SFRWL(3)
  falb1=falb1/(SFRWL(1)+SFRWL(2)+SFRWL(3))
- falb2=falb_dir(:,4,:)*SFRWL(4)+falb_dir(:,5,:)*SFRWL(5)+falb_dir(:,6,:)*SFRWL(6)
+!ym falb2=falb_dir(:,4,:)*SFRWL(4)+falb_dir(:,5,:)*SFRWL(5)+falb_dir(:,6,:)*SFRWL(6)
+ falb2=falb_dir(:,:,4)*SFRWL(4)+falb_dir(:,:,5)*SFRWL(5)+falb_dir(:,:,6)*SFRWL(6)
  falb2=falb2/(SFRWL(4)+SFRWL(5)+SFRWL(6))
 end select
@@ -4280 +4285 @@
         deallocate(press_climoz) ! pointer
      end if
+     
+     IF (is_omp_master) CALL xios_context_finalize
   ENDIF