Changeset 4028 for dynamico_lmdz/aquaplanet/ICOSA_LMDZ

Timestamp:

Jul 31, 2017, 3:03:54 PM (8 years ago)

Author:

millour

Message:

Rearrange ICOSAGCM/Physics interface so that multiple different LMDZ physics packages may be used.
So far only interfaces with 'lmd' and 'dev' physics are handled.
Added a 'DEV_PHYSICS' directory with sample def and xml files to test correct integration with 'dev' physics.
EM

Location:

dynamico_lmdz/aquaplanet/ICOSA_LMDZ

Files:

• bld.cfg (modified) (2 diffs)
• clean (modified) (1 diff)
• compile (modified) (1 diff)
• make_icosa_lmdz (modified) (3 diffs)
• src/phydev (added)
• src/phydev/interface_icosa_lmdz.f90 (added)
• src/phylmd (added)
• src/phylmd/interface_icosa_lmdz.f90 (moved) (moved from dynamico_lmdz/aquaplanet/ICOSA_LMDZ/src/interface_icosa_lmdz.f90) (1 diff)

dynamico_lmdz/aquaplanet/ICOSA_LMDZ/bld.cfg

@@ -15 +15 @@
 dir::root            $PWD
 
-src::src        src
-search_src           false
+# Do not scan source tree subdirectories
+search_src           0
+
+# source code directories
+src::src             src
+src::phys            src/%PHYS
+
 bld::lib icosa_lmdz
 bld::target libicosa_lmdz.a icosa_lmdz.exe
@@ -32 +37 @@
 bld::pp              false
 
+# external dependencies to not track
 bld::excl_dep        use::netcdf
 bld::excl_dep        use::omp_lib

dynamico_lmdz/aquaplanet/ICOSA_LMDZ/clean

@@ -8 +8 @@
 rm -rf ./lib
 rm -rf ./bin
+rm -rf ./.cache
 
 

dynamico_lmdz/aquaplanet/ICOSA_LMDZ/compile

@@ -1 @@
-make_icosa_lmdz -debug -parallel mpi_omp -with_orchidee -arch X64_ADA -job 8 
+make_icosa_lmdz -debug -parallel mpi_omp -p lmd -with_orchidee -arch X64_ADA -arch_path ../ARCH -job 8 

dynamico_lmdz/aquaplanet/ICOSA_LMDZ/make_icosa_lmdz

@@ -29 +29 @@
       "-h") cat <<fin
 Usage :
-makegcm [options] -m arch exec
+makegcm [options] -m arch -p phys  exec
 [-h]                       : help
 [-prod / -dev / -debug]    : compilation en mode production (default) / developpement / debug .
 [-nodeps]                  : do not build dependencies (XIOS, IOIPSL, LMDZ5, ICOSAGCM)
  -arch nom_arch            : nom de l\'architecture cible
+ -p phys                   : physics package (e.g. std , venus , ...)
+[-p_opt "options"]         : additional options for physics package
 fin
           exit;;
 
+      "-p")
+          phys=$2 ; shift ; shift ;;
+      
+      "-p_opt")
+          phys_opt=$2 ; shift ; shift ;;
+          
       "-prod")
           compil_mode="prod" ; shift ;;
@@ -182 +190 @@
 echo "%LD_FLAGS $LD_FLAGS" >> config.fcm
 echo "%CPP_KEY $CPP_KEY" >> config.fcm
+echo "%PHYS phy$phys" >> config.fcm
 echo "%LIB $ICOSA_LIB">> config.fcm
 
@@ -208 +217 @@
         lmdz_veget="orchidee2.0 -cpp ORCHIDEE_NOZ0H"
     fi
-#    ./makelmdz_fcm gcm -$compil_mode -mem -parallel $parallel -nodyn -io xios -v $lmdz_veget -arch $arch -arch_path $arch_path -j $job $full_flag || exit 1
-    ./makelmdz_fcm gcm -$compil_mode -mem -parallel $parallel -libphy -io xios -v $lmdz_veget -arch $arch -arch_path $arch_path -j $job $full_flag || exit 1
+    ./makelmdz_fcm -p $phys $phys_opt -$compil_mode -mem -parallel $parallel -libphy -io xios -v $lmdz_veget -arch $arch -arch_path $arch_path -j $job $full_flag || exit 1
     cd -
 

dynamico_lmdz/aquaplanet/ICOSA_LMDZ/src/phylmd/interface_icosa_lmdz.f90

@@ -298 +298 @@
     aps(1:llm)=0.5*(ap(1:llm)+ap(2:llm+1))
     bps(1:llm)=0.5*(bp(1:llm)+bp(2:llm+1))
-    pseudoalt(:)=0
+    pseudoalt(:)=-scaleheight*log(presnivs(:)/preff)
     CALL init_vertical_layers(llm,preff,scaleheight,ap,bp,aps,bps,presnivs,pseudoalt)