Changeset 1572 for trunk/LMDZ.TITAN/libf

Timestamp:

Jul 11, 2016, 9:35:35 AM (8 years ago)

Author:

emillour

Message:

All GCMs:
Further adaptations to keep up with changes in LMDZ5 concerning
physics/dynamics separation (up to rev r2500 of LMDZ5)

• arch:
• remove ifort debug option '-check all', replace it with '-check bounds,format,output_conversion,pointers,uninit' (i.e. get it to stop complaining about copying into temporary arrays)

• dyn3d_common:
• comconst_mod.F90 : add ngroup

• dyn3d:
• gcm.F90 : minor bug fix (arguments to a call_abort())
• leapfrog.F90 : recompute geopotential for bilan_dyn outputs
• conf_gcm.F90 : read "ngroup" from run.def
• groupe.F , groupeun.F : ngroup no longer a local parameter

• dyn3d_par:
• conf_gcm.F90 : read "ngroup" from run.def
• groupe_p.F , groupeun_p.F : ngroup no longer a local parameter

• misc:
• regr1_step_av_m.F90 : removed (not used)

• phy_common:
• mod_phys_lmdz_mpi_transfert.F90 , mod_phys_lmdz_mpi_data.F90 : change is_north_pole and is_south_pole to is_north_pole_dyn and is_south_pole_dyn
• mod_phys_lmdz_omp_data.F90 : introduce is_nort_pole_phy and is_south_pole_phy

• dynphy_lonlat:
• mod_interface_dyn_phys.F90 : use is_north_pole_dyn and is_south_pole_dyn
• calfis_p.F : use is_north_pole_dyn and is_south_pole_dyn

• phyvenus:
• physiq_mod , write_hist*.h : use is_north_pole_phy and is_south_pole_phy to correctly compute mesh area at poles to send to hist*nc files.

• phytitan:
• physiq_mod , write_hist*.h : use is_north_pole_phy and is_south_pole_phy to correctly compute mesh area at poles to send to hist*nc files.

EM

Location:

trunk/LMDZ.TITAN/libf/phytitan

Files:

• physiq_mod.F (modified) (2 diffs)
• write_histday.h (modified) (1 diff)
• write_histins.h (modified) (1 diff)
• write_histmth.h (modified) (1 diff)

trunk/LMDZ.TITAN/libf/phytitan/physiq_mod.F

@@ -67 +67 @@
      &                        cell_area, dx, dy
       use cpdet_mod, only: cpdet, t2tpot
-      USE mod_phys_lmdz_para, only : is_parallel,jj_nb
+      USE mod_phys_lmdz_para, only : is_parallel,jj_nb,
+     &                               is_north_pole_phy,
+     &                               is_south_pole_phy
       USE phys_state_var_mod ! Variables sauvegardees de la physique
       USE iophy
@@ -372 +374 @@
 c     reservoir de surface
       REAL,save,allocatable :: reservoir(:)
+
+c cell_area for outputs in hist*
+      REAL cell_area_out(klon)
 
 c Declaration des constantes et des fonctions thermodynamiques

trunk/LMDZ.TITAN/libf/phytitan/write_histday.h

@@ -14 +14 @@
 
       call histwrite_phy(nid_day,.false.,"phis",itau_w,pphis)
-      call histwrite_phy(nid_day,.false.,"aire",itau_w,cell_area)
+c      call histwrite_phy(nid_day,.false.,"aire",itau_w,cell_area)
+      cell_area_out(:)=cell_area(:)
+      if (is_north_pole_phy) cell_area_out(1)=cell_area(1)/nbp_lon
+      if (is_south_pole_phy) cell_area_out(klon)=cell_area(klon)/nbp_lon
+      call histwrite_phy(nid_day,.false.,"aire",itau_w,cell_area_out)
 
 ccccccc axe Ls ... Faudrait le reduire a axe temporel seulement...

trunk/LMDZ.TITAN/libf/phytitan/write_histins.h

@@ -14 +14 @@
 
       call histwrite_phy(nid_ins,.false.,"phis",itau_w,pphis)
-      call histwrite_phy(nid_ins,.false.,"aire",itau_w,cell_area)
+c      call histwrite_phy(nid_ins,.false.,"aire",itau_w,cell_area)
+      cell_area_out(:)=cell_area(:)
+      if (is_north_pole_phy) cell_area_out(1)=cell_area(1)/nbp_lon
+      if (is_south_pole_phy) cell_area_out(klon)=cell_area(klon)/nbp_lon
+      call histwrite_phy(nid_ins,.false.,"aire",itau_w,cell_area_out)
 
 ccccccc axe Ls ... Faudrait le reduire a axe temporel seulement...

trunk/LMDZ.TITAN/libf/phytitan/write_histmth.h

@@ -11 +11 @@
 
       call histwrite_phy(nid_mth,.false.,"phis",itau_w,pphis)
-      call histwrite_phy(nid_mth,.false.,"aire",itau_w,cell_area)
+c      call histwrite_phy(nid_mth,.false.,"aire",itau_w,cell_area)
+      cell_area_out(:)=cell_area(:)
+      if (is_north_pole_phy) cell_area_out(1)=cell_area(1)/nbp_lon
+      if (is_south_pole_phy) cell_area_out(klon)=cell_area(klon)/nbp_lon
+      call histwrite_phy(nid_mth,.false.,"aire",itau_w,cell_area_out)
 
 ccccccc axe Ls ... Faudrait le reduire a axe temporel seulement...