Changeset 2167 for trunk/LMDZ.MARS/libf

Timestamp:

Oct 9, 2019, 9:19:41 AM (5 years ago)

Author:

emillour

Message:

Mars GCM:
Big cleanup: remove obsolete compilation scripts (makgcm_*) and dynamical core
(since the one in LMDZ.COMMON should be used instead).
EM

Location:

trunk/LMDZ.MARS/libf

Files:

• dyn3d (deleted)
• dynlonlat_phylonlat (deleted)
• dynphy_lonlat/phymars/caldyn0.F (copied) (copied from trunk/LMDZ.MARS/libf/dyn3d/caldyn0.F)
• dynphy_lonlat/phymars/defrun_new.F (copied) (copied from trunk/LMDZ.MARS/libf/dyn3d/defrun_new.F)
• dynphy_lonlat/phymars/exner_hyb.F (deleted)
• dynphy_lonlat/phymars/newstart.F (modified) (3 diffs)
• dynphy_lonlat/phymars/start2archive.F (modified) (3 diffs)
• filtrez (deleted)
• grid (deleted)
• misc (deleted)
• phy_common (deleted)
• phymars/dyn1d/abort_gcm.F (modified) (1 diff)
• phymars/dyn1d/comconst_mod.F90 (modified) (1 diff)
• phymars/dyn1d/comgeom.h (modified) (1 diff)
• phymars/dyn1d/comvert_mod.F90 (modified) (1 diff)
• phymars/dyn1d/control_mod.F90 (modified) (1 diff)
• phymars/dyn1d/disvert.F (deleted)
• phymars/dyn1d/disvert_noterre.F (added)
• phymars/dyn1d/ener_mod.F90 (modified) (1 diff)
• phymars/dyn1d/infotrac.F90 (modified) (1 diff)
• phymars/dyn1d/logic_mod.F90 (modified) (1 diff)
• phymars/dyn1d/mod_const_mpi.F90 (modified) (1 diff)
• phymars/dyn1d/paramet.h (modified) (1 diff)
• phymars/dyn1d/serre_mod.F90 (modified) (1 diff)
• phymars/dyn1d/testphys1d.F (modified) (1 diff)

trunk/LMDZ.MARS/libf/dynphy_lonlat/phymars/newstart.F

@@ -47 +47 @@
       USE ener_mod, ONLY: etot0,ptot0,ztot0,stot0,ang0
       USE iniphysiq_mod, ONLY: iniphysiq
+      USE exner_hyb_m, ONLY: exner_hyb
 
       implicit none
@@ -129 +130 @@
       REAL :: xpn,xps,xppn(iim),xpps(iim)
       REAL :: p3d(iip1, jjp1, llm+1)
-      REAL :: beta(iip1,jjp1,llm)
 !      REAL dteta(ip1jmp1,llm)
 
@@ -1582 +1582 @@
 c-----------------------------------------------------------------------
 
-      CALL exner_hyb(ip1jmp1, ps, p3d, beta, pks, pk, pkf)
+      CALL exner_hyb(ip1jmp1, ps, p3d, pks, pk, pkf)
 ! Calcul de la temperature potentielle teta
 

trunk/LMDZ.MARS/libf/dynphy_lonlat/phymars/start2archive.F

@@ -32 +32 @@
       USE iniphysiq_mod, ONLY: iniphysiq
       USE phyetat0_mod, ONLY: phyetat0
+      USE exner_hyb_m, ONLY: exner_hyb
       implicit none
 
@@ -53 +54 @@
       REAL pk(ip1jmp1,llm)
       REAL pkf(ip1jmp1,llm)
-      REAL beta(iip1,jjp1,llm)
       REAL phis(ip1jmp1)                     ! geopotentiel au sol
       REAL masse(ip1jmp1,llm)                ! masse de l'atmosphere
@@ -206 +206 @@
 
       CALL pression(ip1jmp1, ap, bp, ps, p3d)
-      call exner_hyb(ip1jmp1, ps, p3d, beta, pks, pk, pkf)
+      call exner_hyb(ip1jmp1, ps, p3d, pks, pk, pkf)
 
 c=======================================================================

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

@@ -1 @@
-link ../../dyn3d/abort_gcm.F
+link ../../../../LMDZ.COMMON/libf/dyn3d/abort_gcm.F

trunk/LMDZ.MARS/libf/phymars/dyn1d/comconst_mod.F90

@@ -1 @@
-link ../../dyn3d/comconst_mod.F90
+link ../../../../LMDZ.COMMON/libf/dyn3d_common/comconst_mod.F90

trunk/LMDZ.MARS/libf/phymars/dyn1d/comgeom.h

@@ -1 @@
-link ../../dyn3d/comgeom.h
+link ../../../../LMDZ.COMMON/libf/dyn3d_common/comgeom.h

trunk/LMDZ.MARS/libf/phymars/dyn1d/comvert_mod.F90

@@ -1 @@
-link ../../dyn3d/comvert_mod.F90
+link ../../../../LMDZ.COMMON/libf/dyn3d_common/comvert_mod.F90

trunk/LMDZ.MARS/libf/phymars/dyn1d/control_mod.F90

@@ -1 @@
-link ../../dyn3d/control_mod.F90
+link ../../../../LMDZ.COMMON/libf/dyn3d_common/control_mod.F90

trunk/LMDZ.MARS/libf/phymars/dyn1d/ener_mod.F90

@@ -1 @@
-link ../../dyn3d/ener_mod.F90
+link ../../../../LMDZ.COMMON/libf/dyn3d_common/ener_mod.F90

trunk/LMDZ.MARS/libf/phymars/dyn1d/infotrac.F90

@@ -1 @@
-link ../../dyn3d/infotrac.F90
+link ../../../../LMDZ.COMMON/libf/dyn3d_common/infotrac.F90

trunk/LMDZ.MARS/libf/phymars/dyn1d/logic_mod.F90

@@ -1 @@
-link ../../dyn3d/logic_mod.F90
+link ../../../../LMDZ.COMMON/libf/dyn3d/logic_mod.F90

trunk/LMDZ.MARS/libf/phymars/dyn1d/mod_const_mpi.F90

@@ -1 @@
-link ../../dyn3d/mod_const_mpi.F90
+link ../../../../LMDZ.COMMON/libf/dyn3d/mod_const_mpi.F90

trunk/LMDZ.MARS/libf/phymars/dyn1d/paramet.h

@@ -1 @@
-link ../../dyn3d/paramet.h
+link ../../../../LMDZ.COMMON/libf/dyn3d_common/paramet.h

trunk/LMDZ.MARS/libf/phymars/dyn1d/serre_mod.F90

@@ -1 @@
-link ../../dyn3d/serre_mod.F90
+link ../../../../LMDZ.COMMON/libf/dyn3d_common/serre_mod.F90

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

@@ -625 +625 @@
       write(*,*) " hybrid = ", hybrid
 
-      CALL  disvert
+      CALL  disvert_noterre
       ! now that disvert has been called, initialize module vertical_layers_mod
       call init_vertical_layers(nlayer,preff,scaleheight,