Changeset 3345
- Timestamp:
- May 23, 2024, 4:21:32 PM (7 months ago)
- Location:
- trunk/LMDZ.COMMON/libf/evolution
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LMDZ.COMMON/libf/evolution/changelog.txt
r3339 r3345 321 321 == 22/05/2024 == JBC 322 322 Correction of the way sublimating ice is identified at the beginning of the PEM + some updates for the default variables and the display of information. 323 324 == 23/05/2024 == JBC 325 Making "writediagsoilpem.F90" work in 3D with the correct PEM soil depth dimension. -
trunk/LMDZ.COMMON/libf/evolution/glaciers_mod.F90
r3308 r3345 55 55 56 56 !----------------------------- 57 write(*,*) "Flow of CO2 glacier "57 write(*,*) "Flow of CO2 glaciers" 58 58 59 59 call computeTcondCO2(timelen,ngrid,nslope,vmr_co2_PEM,ps_PCM,global_avg_ps_PCM,global_avg_ps_PEM,Tcond) -
trunk/LMDZ.COMMON/libf/evolution/writediagpem.F90
r3339 r3345 294 294 !--------------------- 295 295 if (dim == 3) then 296 IF (klon_glo>1) THEN ! General case 296 297 #ifdef CPP_PARA 297 298 ! Gather field on a "global" (without redundant longitude) array … … 309 310 ! Passage variable physique --> variable dynamique 310 311 ! recast (copy) variable from physics grid to dynamics grid 311 IF (klon_glo>1) THEN ! General case312 312 DO l=1,nbp_lev 313 313 DO i=1,nbp_lon+1 … … 323 323 ENDDO 324 324 ENDDO 325 #endif 325 326 ELSE ! 1D model case 326 327 dx3_1d(1,1:nbp_lev)=px(1,1:nbp_lev) 327 328 ENDIF 328 #endif329 329 ! Ecriture du champs 330 330 if (is_master) then … … 392 392 else if (dim == 2) then 393 393 394 IF (klon_glo>1) THEN ! General case 394 395 #ifdef CPP_PARA 395 396 ! Gather field on a "global" (without redundant longitude) array … … 408 409 ! Passage variable physique --> physique dynamique 409 410 ! recast (copy) variable from physics grid to dynamics grid 410 IF (klon_glo>1) THEN ! General case411 411 DO i=1,nbp_lon+1 412 412 dx2(i,1)=px(1,1) … … 420 420 dx2(nbp_lon+1,j)=dx2(1,j) 421 421 ENDDO 422 #endif 422 423 ELSE ! 1D model case 423 424 dx2_1d=px(1,1) 424 425 ENDIF 425 #endif426 426 427 427 if (is_master) then … … 595 595 ! Modifs: Aug.2010 Ehouarn: enforce outputs to be real*4 596 596 597 use comsoil_h_PEM, only: nsoilmx_PEM, inertiedat_PEM597 use comsoil_h_PEM, only: mlayer_PEM, nsoilmx_PEM, inertiedat_PEM 598 598 use geometry_mod, only: cell_area 599 599 use mod_phys_lmdz_para, only: is_mpi_root, is_master, gather … … 601 601 use mod_grid_phy_lmdz, only: grid_type, unstructured 602 602 use time_evol_mod, only: ecritpem, dt_pem 603 use iniwritesoil_mod, only: iniwritesoil 603 604 604 605 implicit none … … 693 694 694 695 #ifdef CPP_PARA 695 ! Gather inertiedat () soil thermal inertia on physics grid696 ! Gather inertiedat_PEM() soil thermal inertia on physics grid 696 697 call Gather(inertiedat_PEM,inertiafi_glo) 697 698 ! Gather cell_area() mesh area on physics grid … … 726 727 ! write "header" of file (longitudes, latitudes, geopotential, ...) 727 728 if (klon_glo>1) then ! general 3D case 728 call iniwritesoil(nid,ngrid,inertia,area,nbp_lon+1,nbp_lat )729 call iniwritesoil(nid,ngrid,inertia,area,nbp_lon+1,nbp_lat,nsoilmx_PEM,mlayer_PEM) 729 730 else ! 1D model 730 call iniwritesoil(nid,ngrid,inertiafi_glo(1,:),areafi_glo(1),1,1 )731 call iniwritesoil(nid,ngrid,inertiafi_glo(1,:),areafi_glo(1),1,1,nsoilmx_PEM,mlayer_PEM) 731 732 endif 732 733 … … 776 777 if (dimpx.eq.3) then ! Case of a 3D variable 777 778 ! A. Recast data along 'dynamics' grid 779 if (klon_glo>1) then ! General case 778 780 #ifdef CPP_PARA 779 781 ! gather field on a "global" (without redundant longitude) array … … 789 791 !$OMP BARRIER 790 792 #else 791 if (klon_glo>1) then ! General case792 793 do l=1,nsoilmx_PEM 793 794 ! handle the poles … … 805 806 enddo 806 807 enddo 808 #endif 807 809 else ! 1D model case 808 810 data3_1d(1,1:nsoilmx_PEM)=px(1,1:nsoilmx_PEM) 809 811 endif 810 #endif811 812 812 813 ! B. Write (append) the variable to the NetCDF file … … 862 863 863 864 ! A. Recast data along 'dynamics' grid 865 if (klon_glo>1) then ! General case 864 866 #ifdef CPP_PARA 865 867 ! gather field on a "global" (without redundant longitude) array … … 876 878 !$OMP BARRIER 877 879 #else 878 if (klon_glo>1) then ! general case879 880 ! handle the poles 880 881 do i=1,nbp_lon+1 … … 890 891 data2(nbp_lon+1,j)=data2(1,j) ! extra (modulo) longitude 891 892 enddo 893 #endif 892 894 else ! 1D model case 893 895 data2_1d=px(1,1) 894 896 endif 895 #endif896 897 897 898 ! B. Write (append) the variable to the NetCDF file … … 989 990 END SUBROUTINE writediagsoilpem 990 991 991 992 992 END MODULE writediagpem_mod 993
Note: See TracChangeset
for help on using the changeset viewer.