Changeset 3851 for LMDZ6/branches/LMDZ-tracers/libf/dynphy_lonlat

Timestamp:

Feb 22, 2021, 12:44:07 PM (4 years ago)

Author:

dcugnet

Message:

Update the branch to the current trunk.

Location:

LMDZ6/branches/LMDZ-tracers

Files:

• . (modified) (1 prop)
• libf/dynphy_lonlat/phylmd/ce0l.F90 (modified) (5 diffs)
• libf/dynphy_lonlat/phylmd/etat0phys_netcdf.F90 (modified) (5 diffs)
• libf/dynphy_lonlat/phylmd/limit_netcdf.F90 (modified) (2 diffs)

LMDZ6/branches/LMDZ-tracers/libf/dynphy_lonlat/phylmd/ce0l.F90

@@ -29 +29 @@
   USE iniphysiq_mod,  ONLY: iniphysiq
   USE mod_const_mpi,  ONLY: comm_lmdz
+
 #ifdef CPP_PARA
   USE mod_const_mpi,  ONLY: init_const_mpi
-  USE parallel_lmdz,  ONLY: init_parallel, mpi_rank, omp_rank
+  USE parallel_lmdz,  ONLY: init_parallel, mpi_rank, omp_rank, using_mpi
   USE bands,          ONLY: read_distrib, distrib_phys
   USE mod_hallo,      ONLY: init_mod_hallo
   USE mod_interface_dyn_phys, ONLY: init_interface_dyn_phys
-#endif
+#ifdef CPP_XIOS
+  USE xios, only: xios_finalize
+#endif
+#endif
+
   USE comconst_mod, ONLY: cpp, daysec, dtphys, dtvr, g, kappa, omeg, r, rad, &
                           pi, jmp1
@@ -50 +55 @@
   include "comgeom2.h"
   include "iniprint.h"
+#ifdef CPP_MPI
+  include 'mpif.h'
+#endif
+  
   REAL               :: masque(iip1,jjp1)             !--- CONTINENTAL MASK
   REAL               :: phis  (iip1,jjp1)             !--- GROUND GEOPOTENTIAL
@@ -67 +76 @@
   REAL, ALLOCATABLE  :: masktmp(:)
 
-#ifndef CPP_PARA
+#ifdef CPP_PARA
+  integer ierr
+#else
 ! for iniphysiq in serial mode
   INTEGER,PARAMETER :: mpi_rank=0
@@ -168 +179 @@
     ocemask = ocetmp
     IF(dlat_omask(1)<dlat_omask(jml_omask)) THEN
-      DO j=1,jjp1; ocemask(:,j) = ocetmp(:,jjp1-j+1); END DO
+       DO j=1,jjp1
+          ocemask(:,j) = ocetmp(:,jjp1-j+1)
+       END DO
     END IF
     DEALLOCATE(ocetmp,lon_omask,lat_omask,dlon_omask,dlat_omask)
@@ -239 +252 @@
 #ifdef CPP_PARA
   END IF
+#ifdef CPP_XIOS
+  CALL xios_finalize
+#endif
+#ifdef CPP_MPI
+  IF (using_mpi) call MPI_FINALIZE(ierr)
+#endif
 #endif
 

LMDZ6/branches/LMDZ-tracers/libf/dynphy_lonlat/phylmd/etat0phys_netcdf.F90

@@ -42 +42 @@
   USE conf_dat_m,         ONLY: conf_dat2d
   USE phys_state_var_mod, ONLY: zmea, zstd, zsig, zgam, zthe, zpic, zval, z0m, &
-          solsw, radsol, t_ancien, wake_deltat, wake_s,  rain_fall, qsol, z0h, &
+          solsw, solswfdiff, radsol, t_ancien, wake_deltat, wake_s,  rain_fall, qsol, z0h, &
           sollw,sollwdown, rugoro, q_ancien, wake_deltaq, wake_pe, snow_fall, ratqs,w01, &
     sig1, ftsol, clwcon, fm_therm, wake_Cstar,  pctsrf,  entr_therm,radpas, f0,&
@@ -107 +107 @@
   REAL, DIMENSION(SIZE(masque,1),SIZE(masque,2)) :: masque_tmp,phiso
   REAL, DIMENSION(klon)               :: sn, rugmer, run_off_lic_0, fder
-  REAL, DIMENSION(klon,nbsrf)         :: qsolsrf, snsrf
+  REAL, DIMENSION(klon,nbsrf)         :: qsurf, snsrf
   REAL, DIMENSION(klon,nsoilmx,nbsrf) :: tsoil
 
@@ -192 +192 @@
   WRITE(lunout,*)'phystep =', phystep, radpas
 
-! Init: ftsol, snsrf, qsolsrf, tsoil, rain_fall, snow_fall, solsw, sollw, z0
+! Init: ftsol, snsrf, qsurf, tsoil, rain_fall, snow_fall, solsw, sollw, z0
 !*******************************************************************************
   DO i=1,nbsrf; ftsol(:,i) = tsol; END DO
@@ -209 +209 @@
 
   fevap(:,:) = 0.
-  DO i=1,nbsrf; qsolsrf(:,i)=150.; END DO
+  qsurf = 0.
   DO i=1,nbsrf; DO j=1,nsoilmx; tsoil(:,j,i) = tsol; END DO; END DO
   rain_fall  = 0.
   snow_fall  = 0.
   solsw      = 165.
+  solswfdiff = 1. 
   sollw      = -53.
 !ym warning missing init for sollwdown => set to 0
@@ -271 +272 @@
 
   CALL fonte_neige_init(run_off_lic_0)
-  CALL pbl_surface_init( fder, snsrf, qsolsrf, tsoil )
+  CALL pbl_surface_init( fder, snsrf, qsurf, tsoil )
   CALL phyredem( "startphy.nc" )
 

LMDZ6/branches/LMDZ-tracers/libf/dynphy_lonlat/phylmd/limit_netcdf.F90

@@ -74 +74 @@
                   NF90_DEF_DIM, NF90_DEF_VAR, NF90_PUT_VAR, NF90_PUT_ATT,      &
                   NF90_NOERR,   NF90_NOWRITE, NF90_DOUBLE,  NF90_GLOBAL,       &
-                  NF90_CLOBBER, NF90_ENDDEF,  NF90_UNLIMITED, NF90_FLOAT
+                  NF90_CLOBBER, NF90_ENDDEF,  NF90_UNLIMITED, NF90_FLOAT,      &
+                  NF90_64BIT_OFFSET
   USE inter_barxy_m,      ONLY: inter_barxy
   USE netcdf95,           ONLY: nf95_def_var, nf95_put_att, nf95_put_var
@@ -228 +229 @@
 
   !--- File creation
-  CALL ncerr(NF90_CREATE(fnam,NF90_CLOBBER,nid),fnam)
+  CALL ncerr(NF90_CREATE(fnam,IOR(NF90_CLOBBER,NF90_64BIT_OFFSET),nid),fnam)
   CALL ncerr(NF90_PUT_ATT(nid,NF90_GLOBAL,"title","Fichier conditions aux limites"),fnam)
   str='File produced using ce0l executable.'