Changeset 1524 for trunk/LMDZ.MARS/libf/phymars

Timestamp:

Mar 29, 2016, 11:45:49 AM (9 years ago)

Author:

emillour

Message:

All GCMS:
More updates to enforce dynamics/physics separation:

get rid of references to "temps_mod" from physics packages;
make a "time_phylmdz_mod.F90" module to store that
information and fill it via "iniphysiq".

EM

Location:

trunk/LMDZ.MARS/libf/phymars

Files:

• callradite.F (modified) (1 diff)
• co2snow.F (modified) (1 diff)
• comcstfi_h.F90 (modified) (1 diff)
• conf_phys.F (modified) (1 diff)
• dyn1d/temps_mod.F90 (deleted)
• dyn1d/testphys1d.F (modified) (2 diffs)
• eofdump_mod.F90 (modified) (1 diff)
• inistats.F (modified) (1 diff)
• iniwrite.F (modified) (1 diff)
• lwi.F (modified) (1 diff)
• nirco2abs.F (modified) (1 diff)
• nlte_tcool.F (modified) (1 diff)
• phyredem.F90 (modified) (1 diff)
• phys_state_var_init_mod.F90 (moved) (moved from trunk/LMDZ.MARS/libf/phymars/phys_state_var_init.F) (4 diffs)
• physiq.F (modified) (1 diff)
• tabfi.F (modified) (2 diffs)
• time_phylmdz_mod.F90 (added)
• writediagfi.F (modified) (1 diff)
• writeg1d.F (modified) (1 diff)

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

@@ -10 +10 @@
      &            iaer_dust_submicron,iaer_h2o_ice
       use yomlw_h, only: gcp, nlaylte
-      USE comcstfi_h
+      use comcstfi_h, only: g,cpp
+      use time_phylmdz_mod, only: daysec
       IMPLICIT NONE
 c=======================================================================

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

@@ -4 +4 @@
       use surfdat_h, only: iceradius, dtemisice
       use comgeomfi_h, only: lati ! grid point latitudes (rad)
-      USE comcstfi_h
+      use time_phylmdz_mod, only: daysec
       IMPLICIT NONE
 

trunk/LMDZ.MARS/libf/phymars/comcstfi_h.F90

@@ -2 +2 @@
       IMPLICIT NONE
 
-      REAL pi
-      REAL rad
-      REAL g
-      REAL r
-      REAL cpp
-      REAL rcp
-      REAL dtphys
-      REAL daysec
-      REAL mugaz
-      REAL omeg
+      REAL pi ! something like 3.14159
+      REAL rad ! radius of the planet (m)
+      REAL g ! gravity (m/s2)
+      REAL r ! reduced gas constant (r=8.314511/(mugaz/1000.0))
+      REAL cpp ! Cp of the atmosphere
+      REAL rcp ! r/cpp
+      REAL mugaz ! molar mass of the atmosphere (g/mol)
+      REAL omeg ! planet rotation rate (rad/s)
 
       END MODULE comcstfi_h

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

@@ -40 +40 @@
       use control_mod, only: ecritphy
       use planete_h
-      USE comcstfi_h, only: daysec,dtphys
+      use time_phylmdz_mod, only: daysec,dtphys
       use dimradmars_mod, only: naerkind, name_iaer,
      &                      ini_scatterers,tauvis

trunk/LMDZ.MARS/libf/phymars/dyn1d/testphys1d.F

@@ -16 +16 @@
       use planete_h, only: year_day, periheli, aphelie, peri_day,
      &                     obliquit, emin_turb, lmixmin
-      use comcstfi_h, only: pi, rad, daysec, omeg, g, mugaz, rcp, r,
-     &                      cpp, dtphys
+      use comcstfi_h, only: pi, rad, omeg, g, mugaz, rcp, r, cpp
+      use time_phylmdz_mod, only: daysec, dtphys
       use dimradmars_mod, only: tauscaling,tauvis
       USE comvert_mod, ONLY: ap,bp,aps,bps,pa,preff,sig
       USE logic_mod, ONLY: hybrid
+      USE phys_state_var_init_mod, ONLY: phys_state_var_init
       IMPLICIT NONE
 
@@ -478 +479 @@
 !Mars possible matter with dtphys in input and include!!!
       call phys_state_var_init(1,llm,nq,
-     .          daysec,dtphys,rad,g,r,cpp)
+     .          day0,time,daysec,dtphys,rad,g,r,cpp)
       call ini_fillgeom(1,latitude,longitude,(/1.0/))
       call conf_phys(1,llm,nq)

trunk/LMDZ.MARS/libf/phymars/eofdump_mod.F90

@@ -79 +79 @@
 
       use comgeomfi_h, only: long, lati
-      use comcstfi_h
+      use comcstfi_h, only: pi
+      use time_phylmdz_mod, only: daysec, dtphys
       USE comvert_mod, ONLY: aps,bps
       implicit none

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

@@ -3 +3 @@
       use mod_phys_lmdz_para, only : is_master
       USE comvert_mod, ONLY: ap,bp,aps,bps,preff,pseudoalt,presnivs
-      USE comcstfi_h, ONLY: daysec,dtphys,pi
+      USE comcstfi_h, ONLY: pi
+      USE time_phylmdz_mod, ONLY: daysec,dtphys
       implicit none
 
-#include "dimensions.h"
-#include "paramet.h"
-#include "comgeom.h"
-#include "statto.h"
-#include "netcdf.inc"
+      include "dimensions.h"
+      include "paramet.h"
+      include "comgeom.h"
+      include "statto.h"
+      include "netcdf.inc"
 
       integer,intent(out) :: ierr

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

@@ -2 +2 @@
 
       use comsoil_h, only: mlayer, nsoilmx
-      USE comcstfi_h
+      USE comcstfi_h, only: g, mugaz, omeg, rad, rcp, pi 
       USE comvert_mod, ONLY: ap,bp,aps,bps,pseudoalt
       USE logic_mod, ONLY: fxyhypb,ysinus
       USE serre_mod, ONLY: clon,clat,grossismx,grossismy,dzoomx,dzoomy
-      USE temps_mod, ONLY: hour_ini
+      USE time_phylmdz_mod, ONLY: hour_ini, daysec, dtphys
       USE ener_mod, ONLY: etot0,ptot0,ztot0,stot0,ang0
       IMPLICIT NONE

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

@@ -6 +6 @@
       use dimradmars_mod, only: ndlo2, ndlon, nflev, nir
       use yomlw_h, only: gcp, nlaylte, xi
-      USE comcstfi_h
+      USE comcstfi_h, ONLY: g, cpp
+      USE time_phylmdz_mod, ONLY: dtphys
       implicit none
 

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

@@ -4 +4 @@
        use tracer_mod, only: igcm_co2, igcm_o
        use comgeomfi_h, only: sinlon, coslon, sinlat, coslat
-       USE comcstfi_h
+       USE comcstfi_h, ONLY: pi
+       USE time_phylmdz_mod, ONLY: daysec
        IMPLICIT NONE
 c=======================================================================

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

@@ -1357 +1357 @@
       function hrkday_convert                        
      @     ( mmean_nlte,cpmean_nlte )         
-      USE comcstfi_h
+      use time_phylmdz_mod, only: daysec
       use param_v4_h, only: n_avog
       implicit none                           

trunk/LMDZ.MARS/libf/phymars/phyredem.F90

@@ -22 +22 @@
                       put_var, put_field, length
   use mod_grid_phy_lmdz, only : klon_glo
-  use planete_h
-  use comcstfi_h
+  use planete_h, only: aphelie, emin_turb, lmixmin, obliquit, &
+                       peri_day, periheli, year_day
+  use comcstfi_h, only: g, mugaz, omeg, rad, rcp
+  use time_phylmdz_mod, only: daysec
 
   implicit none

trunk/LMDZ.MARS/libf/phymars/phys_state_var_init_mod.F90

@@ -1 @@
-      SUBROUTINE phys_state_var_init(ngrid,nlayer,nq
-     .               ,pdaysec,ptimestep,prad,pg,pr,pcpp)
+MODULE phys_state_var_init_mod
+
+CONTAINS
+
+      SUBROUTINE phys_state_var_init(ngrid,nlayer,nq, &
+                                     day_ini,hour_ini,pdaysec,ptimestep, &
+                                     prad,pg,pr,pcpp)
 
 !=======================================================================
@@ -38 +43 @@
       use conc_mod, only: ini_conc_mod
       use turb_mod, only: ini_turb_mod
-      use comcstfi_h, only: pi,rad,cpp,g,r,rcp,daysec,dtphys
+      use comcstfi_h, only: pi,rad,cpp,g,r,rcp
       use tracer_mod, only: nqmx
+      use time_phylmdz_mod, only: init_time
 
       IMPLICIT NONE
       
       INTEGER,INTENT(IN) :: ngrid,nlayer,nq
+      INTEGER,INTENT(IN) :: day_ini
+      REAL,INTENT(IN) :: hour_ini
       REAL,INTENT(IN) :: pdaysec,ptimestep,prad,pg,pr,pcpp
-      EXTERNAL SSUM
-      REAL SSUM
 
       ! set dimension in tracer_mod
@@ -58 +64 @@
       r=pr
       rcp=r/cpp
-      daysec=pdaysec
-      dtphys=ptimestep
+
+      ! Initialize some "temporal and calendar" related variables
+      call init_time(day_ini,hour_ini,pdaysec,ptimestep)
 
       ! allocate "slope_mod" arrays
@@ -89 +96 @@
 
       END SUBROUTINE phys_state_var_init
+
+END MODULE phys_state_var_init_mod

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

@@ -33 +33 @@
       use planete_h, only: aphelie, periheli, year_day, peri_day,
      &                     obliquit
-      USE comcstfi_h, only: r, cpp, mugaz, g, rcp, pi, rad, daysec
+      USE comcstfi_h, only: r, cpp, mugaz, g, rcp, pi, rad
+      use time_phylmdz_mod, only: daysec
       use param_v4_h, only: nreact,n_avog, 
      &                      fill_data_thermos, allocate_param_thermos

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

@@ -50 +50 @@
       use iostart, only: get_var
       use mod_phys_lmdz_para, only: is_parallel
-      use comcstfi_h
-      use planete_h
+      use comcstfi_h, only: g, mugaz, omeg, rad, rcp
+      use time_phylmdz_mod, only: daysec, dtphys
+      use planete_h, only: aphelie, emin_turb, lmixmin, obliquit,
+     &                     peri_day, periheli, year_day
       implicit none
  
@@ -541 +543 @@
       write(*,*) 
 
-      ENDIF                     !       of if (Lmodif == 1)
+      ENDIF ! of if (Lmodif == 1)
 
 c-----------------------------------------------------------------------

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

@@ -44 +44 @@
      &                               is_master, gather
       USE mod_grid_phy_lmdz, only : klon_glo, Grid1Dto2D_glo
-      USE temps_mod, ONLY: day_ini
+      USE time_phylmdz_mod, ONLY: day_ini
       implicit none
 

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

@@ -124 +124 @@
 
       SUBROUTINE endg1d(ngrid,nlayer,zlayer,ndt)
-      USE comcstfi_h
+      USE time_phylmdz_mod, ONLY: dtphys, daysec
       IMPLICIT NONE
 c.......................................................................