Changeset 1543 for trunk/LMDZ.COMMON/libf/dyn3d

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.COMMON/libf/dyn3d/gcm.F90 (modified) (5 diffs)

trunk/LMDZ.COMMON/libf/dyn3d/gcm.F90

@@ -25 +25 @@
                              ok_dyn_ins,ok_dyn_ave,iecri,periodav,  &
                              less1day,fractday,ndynstep,nsplit_phys
+  USE mod_const_mpi, ONLY: COMM_LMDZ
   use cpdet_mod, only: ini_cpdet
   USE temps_mod, ONLY: calend,start_time,annee_ref,day_ref, &
                 itau_dyn,itau_phy,day_ini,jD_ref,jH_ref,day_end
 
-#ifdef INCA
-! Only INCA needs these informations (from the Earth's physics)
-  USE indice_sol_mod
-  USE mod_phys_lmdz_para, ONLY : klon_mpi_para_nb
-#endif
 
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -184 +180 @@
 ! 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
+!#ifdef CPP_PHYS
+!  CALL init_phys_lmdz(iim,jjp1,llm,1,(/(jjm-1)*iim+2/))
+!!      call initcomgeomphy ! now done in iniphysiq
+!#endif
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
@@ -225 +221 @@
 #endif
 !-----------------------------------------------------------------------
-
-  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)
-    call init_inca_para(iim,jjm+1,klon,1,klon_mpi_para_nb,0)
-#endif
-  END IF
   !
   !
@@ -281 +269 @@
 
   endif ! of if (read_start)
-
-  IF (type_trac == 'inca') THEN
-#ifdef INCA
-     call init_inca_dim(klon,llm,iim,jjm, &
-          rlonu,rlatu,rlonv,rlatv)
-#endif
-  END IF
 
 
@@ -445 +426 @@
      ! Physics:
 #ifdef CPP_PHYS
-         CALL iniphysiq(iim,jjm,llm,daysec,day_ini,dtphys/nsplit_phys, &
-                      rlatu,rlatv,rlonu,rlonv,aire,cu,cv,rad,g,r,cpp, &
-                      iflag_phys)
+     CALL iniphysiq(iim,jjm,llm, &
+          (jjm-1)*iim+2,comm_lmdz, &
+          daysec,day_ini,dtphys/nsplit_phys, &
+          rlatu,rlatv,rlonu,rlonv,aire,cu,cv,rad,g,r,cpp, &
+          iflag_phys)
 #endif
   ENDIF ! of IF ((iflag_phys==1).or.(iflag_phys>=100))