Changeset 993 for trunk

Timestamp:

Jun 17, 2013, 10:16:15 AM (11 years ago)

Author:

emillour

Message:

Generic GCM:

• Some more cleanup in dynamics:
  • Moved "start2archive" (and auxilliary routines) to phystd
  • removed unused (obsolete) testharm.F , para_netcdf.h , readhead_NC.F , angtot.h from dyn3d
  • removed obsolete addit.F (and change corresponding lines in gcm)
  • remove unused "description.h" (and many places where it was "included")

EM

Location:

trunk/LMDZ.GENERIC/libf

Files:

• dyn3d/addit.F (deleted)
• dyn3d/angtot.h (deleted)
• dyn3d/clesph0.h (deleted)
• dyn3d/description.h (deleted)
• dyn3d/dynetat0.F (modified) (1 diff)
• dyn3d/dynredem.F (modified) (2 diffs)
• dyn3d/gcm.F (modified) (5 diffs)
• dyn3d/para_netcdf.h (deleted)
• dyn3d/readhead_NC.F (deleted)
• dyn3d/testharm.F (deleted)
• phystd/ini_archive.F (moved) (moved from trunk/LMDZ.GENERIC/libf/dyn3d/ini_archive.F) (1 diff)
• phystd/iniwrite.F (modified) (1 diff)
• phystd/iniwrite_specIR.F (modified) (1 diff)
• phystd/iniwrite_specVI.F (modified) (1 diff)
• phystd/lect_start_archive.F (modified) (1 diff)
• phystd/newstart.F (modified) (1 diff)
• phystd/physdem1.F (modified) (1 diff)
• phystd/start2archive.F (moved) (moved from trunk/LMDZ.GENERIC/libf/dyn3d/start2archive.F) (1 diff)
• phystd/write_archive.F (moved) (moved from trunk/LMDZ.GENERIC/libf/dyn3d/write_archive.F) (1 diff)
• phystd/writediagfi.F (modified) (1 diff)
• phystd/writediagspecIR.F (modified) (1 diff)
• phystd/writediagspecVI.F (modified) (1 diff)

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

@@ -28 +28 @@
 #include "ener.h"
 #include "netcdf.inc"
-#include "description.h"
 #include "serre.h"
 #include "logic.h"

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

@@ -15 +15 @@
 #include "logic.h"
 #include "netcdf.inc"
-#include "description.h"
 #include "serre.h"
 #include "advtrac.h"
@@ -961 +960 @@
 #include "dimensions.h"
 #include "paramet.h"
-#include "description.h"
 #include "netcdf.inc"
 #include "comvert.h"

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

@@ -44 +44 @@
 #include "ener.h"
 #include "netcdf.inc"
-#include "description.h"
 #include "serre.h"
 #include "tracstoke.h"
@@ -104 +103 @@
       EXTERNAL integrd,SCOPY
       EXTERNAL inigeom
-      EXTERNAL exner_hyb,addit
+      EXTERNAL exner_hyb
       EXTERNAL defrun_new, test_period
       REAL  SSUM
@@ -157 +156 @@
 
       modname = 'gcm'
-      descript = 'Run GCM LMDZ'
       lafin    = .FALSE.
 
@@ -465 +463 @@
          CALL dissip(vcov,ucov,teta,p,dvdis,dudis,dhdis)
 
-         CALL addit( ijp1llm,ucov ,dudis,ucov )
-         CALL addit( ijmllm ,vcov ,dvdis,vcov )
+         ucov(:,:)=ucov(:,:)+dudis(:,:)
+         vcov(:,:)=vcov(:,:)+dvdis(:,:)
 
 
@@ -478 +476 @@
          endif
 
-         CALL addit( ijp1llm,teta ,dhdis,teta )
+         teta(:,:)=teta(:,:)+dhdis(:,:)
 
 

trunk/LMDZ.GENERIC/libf/phystd/ini_archive.F

@@ -48 +48 @@
 #include "ener.h"
 #include "logic.h"
-#include "description.h"
 #include "serre.h"
 #include "control.h"

trunk/LMDZ.GENERIC/libf/phystd/iniwrite.F

@@ -31 +31 @@
 #include "logic.h"
 #include "netcdf.inc"
-#include "description.h"
 #include "serre.h"
 #include"dimphys.h"

trunk/LMDZ.GENERIC/libf/phystd/iniwrite_specIR.F

@@ -33 +33 @@
 #include "logic.h"
 #include "netcdf.inc"
-#include "description.h"
 #include "serre.h"
 #include"dimphys.h"

trunk/LMDZ.GENERIC/libf/phystd/iniwrite_specVI.F

@@ -33 +33 @@
 #include "logic.h"
 #include "netcdf.inc"
-#include "description.h"
 #include "serre.h"
 #include"dimphys.h"

trunk/LMDZ.GENERIC/libf/phystd/lect_start_archive.F

@@ -33 +33 @@
 #include "control.h"
 #include "logic.h"
-#include "description.h"
 #include "ener.h"
 #include "temps.h"

trunk/LMDZ.GENERIC/libf/phystd/newstart.F

@@ -33 +33 @@
 #include "control.h"
 #include "logic.h"
-#include "description.h"
 #include "ener.h"
 #include "temps.h"
 #include "comdissnew.h"
-#include "clesph0.h"
 #include "serre.h"
 #include "netcdf.inc"

trunk/LMDZ.GENERIC/libf/phystd/physdem1.F

@@ -74 +74 @@
 
 #include "serre.h"
-#include "clesph0.h"
 #include "fxyprim.h"
 #include "planete.h"

trunk/LMDZ.GENERIC/libf/phystd/start2archive.F

@@ -34 +34 @@
 #include "control.h"
 #include "ener.h"
-#include "description.h"
 
 #include "dimphys.h"

trunk/LMDZ.GENERIC/libf/phystd/write_archive.F

@@ -40 +40 @@
 #include "comvert.h"
 #include "comgeom.h"
-#include "description.h"
 #include "temps.h"
 #include "netcdf.inc"

trunk/LMDZ.GENERIC/libf/phystd/writediagfi.F

@@ -55 +55 @@
 #include "comvert.h"
 #include "comgeom.h"
-#include "description.h"
 #include "netcdf.inc"
 #include "temps.h"

trunk/LMDZ.GENERIC/libf/phystd/writediagspecIR.F

@@ -58 +58 @@
 #include "comvert.h"
 #include "comgeom.h"
-#include "description.h"
 #include "netcdf.inc"
 #include "temps.h"

trunk/LMDZ.GENERIC/libf/phystd/writediagspecVI.F

@@ -58 +58 @@
 #include "comvert.h"
 #include "comgeom.h"
-#include "description.h"
 #include "netcdf.inc"
 #include "temps.h"