Changeset 1130 for trunk/LMDZ.MARS/libf/phymars/vdifc.F

Timestamp:

Dec 20, 2013, 4:04:56 PM (11 years ago)

Author:

emillour

Message:

Mars GCM:
Series of changes to enable running in parallel (using LMDZ.COMMON dynamics);
Current LMDZ.MARS can still notheless be compiled and run in serial mode
"as previously".
Summary of main changes:

• Main programs (newstart, start2archive, xvik) that used to be in dyn3d have been moved to phymars.
• dyn3d/control.h is now module control_mod.F90
• rearanged input/outputs routines everywhere to handle serial/MPI cases. physdem.F => phyredem.F90 , phyetat0.F => phyetat0.F90 ; all read/write routines for startfi files are gathered in module iostart.F90
• added parallelism related routines init_phys_lmdz.F90, comgeomphy.F90, dimphy.F90, iniphysiq.F90, mod_grid_phy_lmdz.F90, mod_phys_lmdz_mpi_data.F90, mod_phys_lmdz_mpi_transfert.F90, mod_phys_lmdz_omp_data.F90, mod_phys_lmdz_omp_transfert.F90, mod_phys_lmdz_para.F90, mod_phys_lmdz_transfert_para.F90 in phymars and mod_const_mpi.F90 in dyn3d (for compliance with parallel case)
• created generic routines 'planetwide_maxval' and 'planetwide_minval', in module "planetwide_mod", that enable obtaining the min and max of a field over the whole planet.

EM

File:

• trunk/LMDZ.MARS/libf/phymars/vdifc.F (modified) (5 diffs)

trunk/LMDZ.MARS/libf/phymars/vdifc.F

@@ -56 +56 @@
       REAL,INTENT(IN) :: pu(ngrid,nlay),pv(ngrid,nlay)
       REAL,INTENT(IN) :: ph(ngrid,nlay)
-      REAL :: pt(ngrid,nlay)
       REAL,INTENT(IN) :: ptsrf(ngrid),pemis(ngrid)
       REAL,INTENT(IN) :: pdufi(ngrid,nlay),pdvfi(ngrid,nlay)
@@ -63 +62 @@
       REAL,INTENT(OUT) :: pdudif(ngrid,nlay),pdvdif(ngrid,nlay)
       REAL,INTENT(OUT) :: pdtsrf(ngrid),pdhdif(ngrid,nlay)
-      REAL,INTENT(IN) ::pcapcal(ngrid)
-      REAL pq2(ngrid,nlay+1)
+      REAL,INTENT(IN) :: pcapcal(ngrid)
+      REAL,INTENT(INOUT) :: pq2(ngrid,nlay+1)
 
 c    Argument added for condensation:
@@ -86 +85 @@
 c   ------
 
+      REAL :: pt(ngrid,nlay)
       REAL ust(ngrid),tst(ngrid)
  
@@ -363 +363 @@
 ! Some usefull diagnostics for the new surface layer parametrization :
 
-!        call WRITEDIAGFI(ngrid,'pcdv',
+!        call WRITEDIAGFI(ngrid,'vdifc_zcdv_true',
 !     &              'momentum drag','no units',
 !     &                         2,zcdv_true)
-!        call WRITEDIAGFI(ngrid,'pcdh',
+!        call WRITEDIAGFI(ngrid,'vdifc_zcdh_true',
 !     &              'heat drag','no units',
 !     &                         2,zcdh_true)
-!        call WRITEDIAGFI(ngrid,'ust',
+!        call WRITEDIAGFI(ngrid,'vdifc_ust',
 !     &              'friction velocity','m/s',2,ust)
-!       call WRITEDIAGFI(ngrid,'tst',
+!       call WRITEDIAGFI(ngrid,'vdifc_tst',
 !     &              'friction temperature','K',2,tst)
-!        call WRITEDIAGFI(ngrid,'rm-1',
+!        call WRITEDIAGFI(ngrid,'vdifc_zcdv',
 !     &              'aerodyn momentum conductance','m/s',
 !     &                         2,zcdv)
-!        call WRITEDIAGFI(ngrid,'rh-1',
+!        call WRITEDIAGFI(ngrid,'vdifc_zcdh',
 !     &              'aerodyn heat conductance','m/s',
 !     &                         2,zcdh)
@@ -384 +384 @@
        IF (.not. calltherm) THEN
 
-       CALL vdif_kc(ptimestep,g,pzlev,pzlay
+       CALL vdif_kc(ngrid,nlay,nq,ptimestep,g,pzlev,pzlay
      &              ,pu,pv,ph,zcdv_true
      &              ,pq2,zkv,zkh,zq)