Changeset 2471 for LMDZ5/branches/testing/libf/dynphy_lonlat

Timestamp:

Mar 18, 2016, 12:09:23 PM (9 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r2434:2457 into testing branch

Location:

LMDZ5/branches/testing

Files:

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

LMDZ5/branches/testing/libf/dynphy_lonlat/phylmd/ce0l.F90

@@ -27 +27 @@
   USE iniphysiq_mod,  ONLY: iniphysiq
   USE mod_const_mpi,  ONLY: comm_lmdz
-#ifdef inca
-  USE indice_sol_mod, ONLY: nbsrf, is_oce, is_sic, is_ter, is_lic
-#endif
 #ifdef CPP_PARA
   USE mod_const_mpi,  ONLY: init_const_mpi
-  USE parallel_lmdz,  ONLY: init_parallel, mpi_rank, omp_rank, mpi_size
+  USE parallel_lmdz,  ONLY: init_parallel, mpi_rank, omp_rank
   USE bands,          ONLY: read_distrib, distrib_phys
   USE mod_hallo,      ONLY: init_mod_hallo
@@ -116 +113 @@
 
 !--- Tracers initializations
-  IF (type_trac == 'inca') THEN
-#ifdef INCA
-    CALL init_const_lmdz(nbtr,anneeref,dayref,iphysiq,day_step,nday,&
-                         nbsrf,is_oce,is_sic,is_ter,is_lic,calend)
-    CALL init_inca_para(iim,jjp1,llm,klon_glo,mpi_size,distrib_phys,&
-                        COMM_LMDZ)
-    WRITE(lunout,*)'nbtr =' , nbtr 
-#endif
-  END IF
   CALL infotrac_init()
 

LMDZ5/branches/testing/libf/dynphy_lonlat/phylmd/etat0phys_netcdf.F90

@@ -86 +86 @@
   USE conf_phys_m, ONLY: conf_phys
   USE init_ssrf_m, ONLY: start_init_subsurf
+  !use ioipsl_getincom
   IMPLICIT NONE
 !-------------------------------------------------------------------------------
@@ -97 +98 @@
   LOGICAL            :: read_mask
   REAL               :: phystep, dummy
-  REAL, DIMENSION(SIZE(masque,1),SIZE(masque,2)) :: masque_tmp
+  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
@@ -115 +116 @@
   INTEGER :: read_climoz                        !--- Read ozone climatology
   REAL    :: alp_offset
+  LOGICAL :: filtre_oro=.false.
 
   deg2rad= pi/180.0
@@ -142 +144 @@
   read_mask=ANY(masque/=-99999.); masque_tmp=masque
   CALL start_init_orog(rlonv, rlatu, phis, masque_tmp)
+
+  CALL getin('filtre_oro',filtre_oro)
+  IF (filtre_oro) CALL filtreoro(size(phis,1),size(phis,2),phis,masque_tmp,rlatu)
+
   WRITE(fmt,"(i4,'i1)')")iml ; fmt='('//ADJUSTL(fmt)
   IF(.NOT.read_mask) THEN                       !--- Keep mask form orography
@@ -447 +453 @@
 !
 !-------------------------------------------------------------------------------
+!
+!*******************************************************************************
+
+SUBROUTINE filtreoro(imp1,jmp1,phis,masque,rlatu)
+
+IMPLICIT NONE
+
+  INTEGER imp1,jmp1
+  REAL, DIMENSION(imp1,jmp1) :: phis,masque
+  REAL, DIMENSION(jmp1) :: rlatu
+  REAL, DIMENSION(imp1) :: wwf
+  REAL, DIMENSION(imp1,jmp1) :: phiso
+  INTEGER :: ifiltre,ifi,ii,i,j
+  REAL :: coslat0,ssz
+
+  coslat0=0.5
+  phiso=phis
+  do j=2,jmp1-1
+     print*,'avant if ',cos(rlatu(j)),coslat0
+     if (cos(rlatu(j))<coslat0) then
+         ! nb de pts affectes par le filtrage de part et d'autre du pt
+         ifiltre=(coslat0/cos(rlatu(j))-1.)/2.
+         wwf=0.
+         do i=1,ifiltre
+            wwf(i)=1.
+         enddo
+         wwf(ifiltre+1)=(coslat0/cos(rlatu(j))-1.)/2.-ifiltre
+         do i=1,imp1-1
+            if (masque(i,j)>0.9) then
+               ssz=phis(i,j)
+               do ifi=1,ifiltre+1
+                  ii=i+ifi
+                  if (ii>imp1-1) ii=ii-imp1+1
+                  ssz=ssz+wwf(ifi)*phis(ii,j)
+                  ii=i-ifi
+                  if (ii<1) ii=ii+imp1-1
+                  ssz=ssz+wwf(ifi)*phis(ii,j)
+               enddo
+               phis(i,j)=ssz*cos(rlatu(j))/coslat0
+            endif
+         enddo
+         print*,'j=',j,coslat0/cos(rlatu(j)), (1.+2.*sum(wwf))*cos(rlatu(j))/coslat0
+     endif
+  enddo
+  call dump2d(imp1,jmp1,phis,'phis ')
+  call dump2d(imp1,jmp1,masque,'masque ')
+  call dump2d(imp1,jmp1,phis-phiso,'dphis ')
+
+END SUBROUTINE filtreoro
 
 
 END MODULE etat0phys
-!
-!*******************************************************************************
-

LMDZ5/branches/testing/libf/dynphy_lonlat/phylmd/iniphysiq_mod.F90

@@ -47 +47 @@
 #ifdef INCA
   USE indice_sol_mod, ONLY: nbsrf, is_oce, is_sic, is_ter, is_lic
-  USE parallel_lmdz, ONLY : mpi_size
-  USE mod_const_mpi, ONLY : COMM_LMDZ
+#ifdef CPP_PARA
+  USE parallel_lmdz, ONLY : mpi_size, mpi_rank
   USE bands, ONLY : distrib_phys
+#endif
   USE mod_phys_lmdz_omp_data, ONLY: klon_omp 
 #endif
@@ -115 +116 @@
   REAL,ALLOCATABLE,SAVE :: boundslatfi(:,:)
 !$OMP THREADPRIVATE (latfi,lonfi,cufi,cvfi,airefi,boundslonfi,boundslatfi)
+
+#ifndef CPP_PARA
+  INTEGER,PARAMETER :: mpi_rank=0
+  INTEGER, PARAMETER :: mpi_size = 1 
+  INTEGER :: distrib_phys(mpi_rank:mpi_rank)=(jjm-1)*iim+2
+#endif
 
   ! Initialize Physics distibution and parameters and interface with dynamics
@@ -295 +302 @@
 #ifdef INCA
      call init_const_lmdz( &
-          anneeref,dayref, &
-          iphysiq,day_step,nday,  &
-          nbsrf, is_oce,is_sic, &
-          is_ter,is_lic, calend)
+          anneeref,dayref, iphysiq,day_step,nday,  &
+          nbsrf, is_oce,is_sic, is_ter,is_lic, calend)
      call init_inca_para( &
           nbp_lon,nbp_lat,nbp_lev,klon_glo,mpi_size, &
-          distrib_phys,COMM_LMDZ)
+          distrib_phys,communicator)
 #endif
   END IF