Changeset 1543 for trunk/LMDZ.GENERIC/libf/dyn3d/gcm.F

Timestamp:

Apr 22, 2016, 9:02:11 AM (9 years ago)

Author:

emillour

Message:

All models: Further adaptations to keep up with changes in LMDZ5 concerning
physics/dynamics separation:

• dyn3d:
• adapted gcm.F so that all physics initializations are now done in iniphysiq.

• dyn3dpar:
• adapted gcm.F so that all physics initializations are now done in iniphysiq.
• updated calfis_p.F to follow up with changes.
• copied over updated "bands.F90" from LMDZ5.

• dynphy_lonlat:
• calfis_p.F90, mod_interface_dyn_phys.F90, follow up of changes in phy_common/mod_* routines

• phy_common:
• added "geometry_mod.F90" to store information about the grid (replaces phy*/comgeomphy.F90) and give variables friendlier names: rlond => longitude , rlatd => latitude, airephy => cell_area, cuphy => dx , cvphy => dy
• added "physics_distribution_mod.F90"
• updated "mod_grid_phy_lmdz.F90", "mod_phys_lmdz_mpi_data.F90", "mod_phys_lmdz_para.F90", "mod_phys_lmdz_mpi_transfert.F90", "mod_grid_phy_lmdz.F90", "mod_phys_lmdz_omp_data.F90", "mod_phys_lmdz_omp_transfert.F90", "write_field_phy.F90" and "ioipsl_getin_p_mod.F90" to LMDZ5 versions.

• phy[venus/titan/mars/std]:
• removed "init_phys_lmdz.F90", "comgeomphy.F90"; adapted routines to use geometry_mod (longitude, latitude, cell_area, etc.)

EM

File:

• trunk/LMDZ.GENERIC/libf/dyn3d/gcm.F (modified) (4 diffs)

trunk/LMDZ.GENERIC/libf/dyn3d/gcm.F

@@ -6 +6 @@
      &                       iconser, ecritphy, idissip
 !      use comgeomphy, only: initcomgeomphy
+      USE mod_const_mpi, ONLY: COMM_LMDZ
       use filtreg_mod, only: inifilr
       USE comvert_mod, ONLY: ap,bp
@@ -155 +156 @@
       REAL dtetaecdt(ip1jmp1,llm)
       REAL vcont(ip1jm,llm),ucont(ip1jmp1,llm)
-      REAL vnat(ip1jm,llm),unat(ip1jmp1,llm)
 
 c-----------------------------------------------------------------------
@@ -177 +177 @@
 c-----------------------------------------------------------------------
       CALL defrun_new( 99, .TRUE. )
-
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-! FH 2008/05/02
-! A nettoyer. On ne veut qu'une ou deux routines d'interface 
-! dynamique -> physique pour l'initialisation
-!#ifdef CPP_PHYS
-      CALL init_phys_lmdz(iim,jjp1,llm,1,(/(jjm-1)*iim+2/))
-!      call initcomgeomphy ! now done in iniphysiq
-!#endif
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 ! Initialize tracers
@@ -260 +250 @@
 !#ifdef CPP_PHYS
 !         CALL iniphysiq(iim,jjm,llm,daysec,day_ini,dtphys/nsplit_phys,
-         CALL iniphysiq(iim,jjm,llm,daysec,day_ini,dtphys,
+         CALL iniphysiq(iim,jjm,llm,
+     &                  (jjm-1)*iim+2,comm_lmdz,
+     &                  daysec,day_ini,dtphys,
      &                  rlatu,rlatv,rlonu,rlonv,
      &                  aire,cu,cv,rad,g,r,cpp,